From a96534d94589e56387b6490fa80666f7b6b25622 Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Tue, 1 Nov 2022 17:07:24 +0800 Subject: [PATCH 1/4] fix: invalid read problem of tsdb path --- include/os/osDef.h | 2 +- source/dnode/vnode/src/tsdb/tsdbOpen.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/os/osDef.h b/include/os/osDef.h index 07cd197ad7..f5a79934bf 100644 --- a/include/os/osDef.h +++ b/include/os/osDef.h @@ -245,7 +245,7 @@ void syslog(int unused, const char *format, ...); #define TD_TIMEZONE_LEN 96 #ifdef WINDOWS -#define TD_PATH_MAX 260 +#define TD_PATH_MAX _MAX_PATH #elif defined(PATH_MAX) #define TD_PATH_MAX PATH_MAX #elif defined(_XOPEN_PATH_MAX) diff --git a/source/dnode/vnode/src/tsdb/tsdbOpen.c b/source/dnode/vnode/src/tsdb/tsdbOpen.c index bb20a9b012..c5ab751c17 100644 --- a/source/dnode/vnode/src/tsdb/tsdbOpen.c +++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c @@ -38,7 +38,14 @@ int tsdbOpen(SVnode *pVnode, STsdb **ppTsdb, const char *dir, STsdbKeepCfg *pKee int slen = 0; *ppTsdb = NULL; - slen = strlen(pVnode->path) + strlen(dir) + 2; + slen = TD_PATH_MAX; //strlen(pVnode->path) + strlen(dir) + 3; + + // if (slen > TD_PATH_MAX) { + // terrno = TSDB_CODE_OUT_OF_RANGE; + // tsdbError("vgId:%d, tsdb open failed since %s, path: %s%s%s", TD_VID(pVnode), terrstr(), pVnode->path, TD_DIRSEP, + // dir); + // return -1; + // } // create handle pTsdb = (STsdb *)taosMemoryCalloc(1, sizeof(*pTsdb) + slen); From cd12ed33a2ee595ddece72a4c0cf5c8f0c56ba1e Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Tue, 1 Nov 2022 17:09:56 +0800 Subject: [PATCH 2/4] enh: code optimization for tsdb path --- source/dnode/vnode/src/tsdb/tsdbOpen.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbOpen.c b/source/dnode/vnode/src/tsdb/tsdbOpen.c index c5ab751c17..ffeaea0ce9 100644 --- a/source/dnode/vnode/src/tsdb/tsdbOpen.c +++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c @@ -38,14 +38,14 @@ int tsdbOpen(SVnode *pVnode, STsdb **ppTsdb, const char *dir, STsdbKeepCfg *pKee int slen = 0; *ppTsdb = NULL; - slen = TD_PATH_MAX; //strlen(pVnode->path) + strlen(dir) + 3; + slen = strlen(pVnode->path) + strlen(dir) + 3; - // if (slen > TD_PATH_MAX) { - // terrno = TSDB_CODE_OUT_OF_RANGE; - // tsdbError("vgId:%d, tsdb open failed since %s, path: %s%s%s", TD_VID(pVnode), terrstr(), pVnode->path, TD_DIRSEP, - // dir); - // return -1; - // } + if (slen > TD_PATH_MAX) { + terrno = TSDB_CODE_OUT_OF_RANGE; + tsdbError("vgId:%d, tsdb open failed since %s, path: %s%s%s", TD_VID(pVnode), terrstr(), pVnode->path, TD_DIRSEP, + dir); + return -1; + } // create handle pTsdb = (STsdb *)taosMemoryCalloc(1, sizeof(*pTsdb) + slen); From 4ef8676aaf20c8a7ffbdec5f9bf930199171ace3 Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Wed, 2 Nov 2022 17:11:12 +0800 Subject: [PATCH 3/4] fix: invalid read of tsdb path --- include/os/osDef.h | 10 ---------- include/os/osFile.h | 10 ++++++++++ source/dnode/vnode/src/tsdb/tsdbOpen.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/os/osDef.h b/include/os/osDef.h index f5a79934bf..297d19e21a 100644 --- a/include/os/osDef.h +++ b/include/os/osDef.h @@ -244,16 +244,6 @@ void syslog(int unused, const char *format, ...); #define TD_CHARSET_LEN 64 #define TD_TIMEZONE_LEN 96 -#ifdef WINDOWS -#define TD_PATH_MAX _MAX_PATH -#elif defined(PATH_MAX) -#define TD_PATH_MAX PATH_MAX -#elif defined(_XOPEN_PATH_MAX) -#define TD_PATH_MAX _XOPEN_PATH_MAX -#else -#define TD_PATH_MAX _POSIX_PATH_MAX -#endif - #ifdef __cplusplus } #endif diff --git a/include/os/osFile.h b/include/os/osFile.h index 21e3d2e6cf..f6759d19a7 100644 --- a/include/os/osFile.h +++ b/include/os/osFile.h @@ -42,6 +42,16 @@ extern "C" { #define PATH_MAX 256 #endif +#ifdef WINDOWS +#define TD_PATH_MAX _MAX_PATH +#elif defined(PATH_MAX) +#define TD_PATH_MAX PATH_MAX +#elif defined(_XOPEN_PATH_MAX) +#define TD_PATH_MAX _XOPEN_PATH_MAX +#else +#define TD_PATH_MAX _POSIX_PATH_MAX +#endif + typedef struct TdFile *TdFilePtr; #define TD_FILE_CREATE 0x0001 diff --git a/source/dnode/vnode/src/tsdb/tsdbOpen.c b/source/dnode/vnode/src/tsdb/tsdbOpen.c index ffeaea0ce9..e109edca11 100644 --- a/source/dnode/vnode/src/tsdb/tsdbOpen.c +++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c @@ -38,7 +38,7 @@ int tsdbOpen(SVnode *pVnode, STsdb **ppTsdb, const char *dir, STsdbKeepCfg *pKee int slen = 0; *ppTsdb = NULL; - slen = strlen(pVnode->path) + strlen(dir) + 3; + slen = TD_PATH_MAX; if (slen > TD_PATH_MAX) { terrno = TSDB_CODE_OUT_OF_RANGE; From abc17227ab47fcfa522ceb1442bf873fde2edab0 Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Thu, 3 Nov 2022 19:45:14 +0800 Subject: [PATCH 4/4] enh: code optimization for PATH_MAX --- source/dnode/vnode/src/tsdb/tsdbOpen.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbOpen.c b/source/dnode/vnode/src/tsdb/tsdbOpen.c index e109edca11..bb20a9b012 100644 --- a/source/dnode/vnode/src/tsdb/tsdbOpen.c +++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c @@ -38,14 +38,7 @@ int tsdbOpen(SVnode *pVnode, STsdb **ppTsdb, const char *dir, STsdbKeepCfg *pKee int slen = 0; *ppTsdb = NULL; - slen = TD_PATH_MAX; - - if (slen > TD_PATH_MAX) { - terrno = TSDB_CODE_OUT_OF_RANGE; - tsdbError("vgId:%d, tsdb open failed since %s, path: %s%s%s", TD_VID(pVnode), terrstr(), pVnode->path, TD_DIRSEP, - dir); - return -1; - } + slen = strlen(pVnode->path) + strlen(dir) + 2; // create handle pTsdb = (STsdb *)taosMemoryCalloc(1, sizeof(*pTsdb) + slen);