Merge pull request #29185 from taosdata/enh/TD-32406-main

enh: memory safe function

Author: hzcheng

include/libs/crypt/crypt.h

@@ -26,7 +26,7 @@ typedef struct SCryptOpts {
   char*   source;
   char*   result;
   int32_t unitLen;
-  char    key[17];
+  char    key[ENCRYPT_KEY_LEN + 1];
 } SCryptOpts;
 
 int32_t CBC_Decrypt(SCryptOpts* opts);

source/dnode/mgmt/mgmt_vnode/src/vmHandle.c

@@ -211,7 +211,7 @@ static void vmGenerateVnodeCfg(SCreateVnodeReq *pCreate, SVnodeCfg *pCfg) {
 #if defined(TD_ENTERPRISE)
   pCfg->tdbEncryptAlgorithm = pCreate->encryptAlgorithm;
   if (pCfg->tdbEncryptAlgorithm == DND_CA_SM4) {
-    tstrncpy(pCfg->tdbEncryptKey, tsEncryptKey, ENCRYPT_KEY_LEN);
+    tstrncpy(pCfg->tdbEncryptKey, tsEncryptKey, ENCRYPT_KEY_LEN + 1);
   }
 #else
   pCfg->tdbEncryptAlgorithm = 0;

source/dnode/vnode/inc/vnode.h

@@ -327,7 +327,7 @@ struct SVnodeCfg {
   int16_t     hashSuffix;
   int32_t     tsdbPageSize;
   int32_t     tdbEncryptAlgorithm;
-  char        tdbEncryptKey[ENCRYPT_KEY_LEN];
+  char        tdbEncryptKey[ENCRYPT_KEY_LEN + 1];
   int32_t     s3ChunkSize;
   int32_t     s3KeepLocal;
   int8_t      s3Compact;

source/dnode/vnode/src/tsdb/tsdbReaderWriter.c

@@ -104,7 +104,7 @@ int32_t tsdbOpenFile(const char *path, STsdb *pTsdb, int32_t flag, STsdbFD **ppF
   }
 
   pFD->path = (char *)&pFD[1];
-  tstrncpy(pFD->path, path, strlen(path) + 1);
+  memcpy(pFD->path, path, strlen(path) + 1);
   pFD->szPage = szPage;
   pFD->flag = flag;
   pFD->szPage = szPage;

source/dnode/vnode/src/vnd/vnodeAsync.c

@@ -330,7 +330,7 @@ static int32_t vnodeAsyncInit(SVAsync **async, const char *label) {
     return terrno;
   }
 
-  tstrncpy((char *)((*async) + 1), label, strlen(label) + 1);
+  memcpy((char *)((*async) + 1), label, strlen(label) + 1);
   (*async)->label = (const char *)((*async) + 1);
 
   (void)taosThreadMutexInit(&(*async)->mutex, NULL);

source/dnode/vnode/src/vnd/vnodeCfg.c

@@ -303,7 +303,7 @@ int vnodeDecodeConfig(const SJson *pJson, void *pObj) {
     if (tsEncryptKey[0] == 0) {
       return terrno = TSDB_CODE_DNODE_INVALID_ENCRYPTKEY;
     } else {
-      tstrncpy(pCfg->tdbEncryptKey, tsEncryptKey, ENCRYPT_KEY_LEN);
+      tstrncpy(pCfg->tdbEncryptKey, tsEncryptKey, ENCRYPT_KEY_LEN + 1);
     }
   }
 #endif

source/dnode/vnode/src/vnd/vnodeOpen.c

@@ -417,7 +417,7 @@ SVnode *vnodeOpen(const char *path, int32_t diskPrimary, STfs *pTfs, SMsgCb msgC
   }
 
   pVnode->path = (char *)&pVnode[1];
-  tstrncpy(pVnode->path, path, strlen(path) + 1);
+  memcpy(pVnode->path, path, strlen(path) + 1);
   pVnode->config = info.config;
   pVnode->state.committed = info.state.committed;
   pVnode->state.commitTerm = info.state.commitTerm;