tst_kconfig: Avoid reporting buffer overflow when parsing /proc/cmdline
PATCH v2 1/1 tst_kconfig: Avoid reporting buffer overflow when parsing /proc/cmdline
When the test is run with a kernel booting with many parameters, the buffer size is often not large enough to store the complete command line. This results in a buffer overflow and the test complains with the following message:
tst_kconfig.c:609: TWARN: Buffer overflowed while parsing /proc/cmdline
Note:
Petr point out that these configs, which are generated by toolchain will be longer than 128 chars someday, but I don't think that is the reason we need raise our parsed buffer, since tst_kcmdline_parse() was just add for popular parameter (which always pass by user and short). So far I don't see any LTP test parse a longer parameters.
--- include/tst_kconfig.h | 2 +- lib/tst_kconfig.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
include/tst_kconfig.h +1 -1
@@ -87,7 +87,7 @@ int tst_kconfig_check(const char *const kconfigs[]);*/ struct tst_kcmdline_var {const char *key; -char value[128 ]; +char value[256 ];bool found; };
lib/tst_kconfig.c +2 -2
@@ -569,7 +569,7 @@ char tst_kconfig_get(const char *confname)void tst_kcmdline_parse (struct tst_kcmdline_var params[],size_t params_len) { -char buf[128 ], line[512 ]; +char buf[256 ], line[512 ];size_t b_pos =0 ,l_pos =0 , i;int var_id =-1 ;
@@ -606,7 +606,7 @@ void tst_kcmdline_parse(struct tst_kcmdline_var params[], size_t params_len)break ;default :if (b_pos +1 >=sizeof (buf)) { -tst_res (TWARN ,"Buffer overflowed while parsing /proc/cmdline" ); +tst_res (TINFO ,"Buffer overflowed while parsing /proc/cmdline" );while (line[l_pos] !='\0' && line[l_pos] !=' ' && line[l_pos] !='\n' ) l_pos++;
Signature · 5 lines
2.45.2 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Li Wang <[email protected]> wrote:
When the test is run with a kernel booting with many parameters, the
Quoted 40 lines
buffer size is often not large enough to store the complete command line. This results in a buffer overflow and the test complains with the following message:
tst_kconfig.c:609: TWARN: Buffer overflowed while parsing
/proc/cmdlineNote:
Petr point out that these configs, which are generated by toolchain will be longer than 128 chars someday, but I don't think that is the reason we need raise our parsed buffer, since
tst_kcmdline_parse()was just add for popular parameter (which always pass by user and short). So far I don't see any LTP test parse a longer parameters.Fixes 180834982 ("kconfig: add funtion to parse /proc/cmdline")Signed-off-by Li Wang <[email protected]>Cc Petr Vorel <[email protected]>--- include/tst_kconfig.h | 2 +- lib/tst_kconfig.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)include/tst_kconfig.h +1
-1@@ -87,7 +87,7 @@ int tst_kconfig_check(const char *const kconfigs[]);*/ struct tst_kcmdline_var {const char *key; -char value[128 ]; +char value[256 ];bool found; };lib/tst_kconfig.c +0
-0
lib/tst_kconfig.c char tst_kconfig_get(const char *confname) · line 574
Quoted 7 lines
lib/tst_kconfig.c +1
-1@@ -569,7 +569,7 @@ char tst_kconfig_get(const char *confname)void tst_kcmdline_parse (struct tst_kcmdline_var params[],size_t params_len) { -char buf[128 ], line[512 ]; +char buf[256 ], line[512 ];
Petr, if you are still worried, feel free to enlarge them to char 'buf[512], line[2048];' during merge :).
BTW, I don't want to allocate the size dynamically to make the code more complicated.
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp
Petr Vorel
Reviewed-byQuoted 51 lines
Li Wang <[email protected]> wrote:
When the test is run with a kernel booting with many parameters, the
Quoted 40 lines
buffer size is often not large enough to store the complete command line. This results in a buffer overflow and the test complains with the following message:
tst_kconfig.c:609: TWARN: Buffer overflowed while parsing
/proc/cmdlineNote:
Petr point out that these configs, which are generated by toolchain will be longer than 128 chars someday, but I don't think that is the reason we need raise our parsed buffer, since
tst_kcmdline_parse()was just add for popular parameter (which always pass by user and short). So far I don't see any LTP test parse a longer parameters.Fixes 180834982 ("kconfig: add funtion to parse /proc/cmdline")Signed-off-by Li Wang <[email protected]>Cc Petr Vorel <[email protected]>--- include/tst_kconfig.h | 2 +- lib/tst_kconfig.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)include/tst_kconfig.h +1
-1@@ -87,7 +87,7 @@ int tst_kconfig_check(const char *const kconfigs[]);*/ struct tst_kcmdline_var {const char *key; -char value[128 ]; +char value[256 ];bool found; };lib/tst_kconfig.c +0
-0lib/tst_kconfig.c char tst_kconfig_get(const char *confname) · line 573
Quoted 6 lines
lib/tst_kconfig.c +1
-1@@ -569,7 +569,7 @@ char tst_kconfig_get(const char *confname)void tst_kcmdline_parse (struct tst_kcmdline_var params[],size_t params_len) { -char buf[128 ], line[512 ]; +char buf[256 ], line[512 ];
Quoted 2 lines
Petr, if you are still worried, feel free to enlarge them to char 'buf[512], line[2048];' during merge :).
Li, I'm ok with 256 :).
- tst_res(TWARN, "Buffer overflowed while parsing /proc/cmdline");
+ tst_res(TINFO, "Buffer overflowed while parsing /proc/cmdline");
But I wonder if we should keep TWARN. Or at least add
+ tst_res(TINFO, "WARNING: Buffer overflowed while parsing /proc/cmdline");
BTW I also see Cyril's comment about adding TINFO | TWARN (or TINFO_WARN), where he does not like neither of these two and even suggest to actually remove TWARN.
https://lore.kernel.org/ltp/ZldFa-3CXXbVKmVW@yuki/
Quoted 2 lines
BTW, I don't want to allocate the size dynamically to make the code more complicated.
Fully agree.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 54 lines · Petr Vorel
Quoted 8 lines
Li Wang <[email protected]> wrote:
When the test is run with a kernel booting with many parameters, the
Quoted 5 lines
buffer size is often not large enough to store the complete command line. This results in a buffer overflow and the test complains with the following message:
tst_kconfig.c:609: TWARN: Buffer overflowed while parsing
/proc/cmdlineQuoted 3 lines
Quoted 3 lines
Note:
Petr point out that these configs, which are generated by toolchain
will
Quoted 2 lines
Quoted 2 lines
be longer than 128 chars someday, but I don't think that is the reason we need raise our parsed buffer, since
tst_kcmdline_parse()was justadd
Quoted 35 lines
Quoted 35 lines
for popular parameter (which always pass by user and short). So far I don't see any LTP test parse a longer parameters.
Fixes 180834982 ("kconfig: add funtion to parse /proc/cmdline")Signed-off-by Li Wang <[email protected]>Cc Petr Vorel <[email protected]>--- include/tst_kconfig.h | 2 +- lib/tst_kconfig.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)include/tst_kconfig.h +1
-1@@ -87,7 +87,7 @@ int tst_kconfig_check(const char *const kconfigs[]);*/ struct tst_kcmdline_var {const char *key; -char value[128 ]; +char value[256 ];bool found; };lib/tst_kconfig.c +1
-1@@ -569,7 +569,7 @@ char tst_kconfig_get(const char *confname)void tst_kcmdline_parse (struct tst_kcmdline_var params[],size_t params_len) { -char buf[128 ], line[512 ]; +char buf[256 ], line[512 ];
Quoted 6 lines
Quoted 2 lines
Petr, if you are still worried, feel free to enlarge them to char 'buf[512], line[2048];' during merge :).
Li, I'm ok with 256 :).
Reviewed-by Petr Vorel <[email protected]>
Thanks.
Quoted 11 lines
- tst_res(TWARN, "Buffer overflowed while
parsing/proc/cmdline");
+ tst_res(TINFO, "Buffer overflowed while
parsing/proc/cmdline");But I wonder if we should keep TWARN. Or at least add
+ tst_res(TINFO, "WARNING: Buffer overflowed
while parsing/proc/cmdline");
+1, I'd merge like this if Cyril has no more comments.
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi All,
Quoted 30 lines · Li Wang
Quoted 13 lines
Quoted 11 lines
lib/tst_kconfig.c +0
-0Quoted 10 lines
index
e16ca1400..8eb1b803f100644lib/tst_kconfig.c +1
-1@@ -569,7 +569,7 @@ char tst_kconfig_get(const char *confname)void tst_kcmdline_parse (struct tst_kcmdline_var params[],size_t params_len) { -char buf[128 ], line[512 ]; +char buf[256 ], line[512 ];Quoted 6 lines
Quoted 2 lines
Petr, if you are still worried, feel free to enlarge them to char 'buf[512], line[2048];' during merge :).
Li, I'm ok with 256 :).
Reviewed-by Petr Vorel <[email protected]>Thanks.
Quoted 6 lines
- tst_res(TWARN, "Buffer overflowed while
parsing/proc/cmdline");
+ tst_res(TINFO, "Buffer overflowed while
parsing/proc/cmdline");
Quoted 7 lines
Quoted 4 lines
But I wonder if we should keep TWARN. Or at least add
+ tst_res(TINFO, "WARNING: Buffer
overflowed while parsing/proc/cmdline");+1, I'd merge like this if Cyril has no more comments.
I dared to merge this patch to avoid annoying our engineers with this little WARNING issue.
Thanks!
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Li,
...
Quoted 3 lines
I dared to merge this patch to avoid annoying our engineers with this little WARNING issue.
Thanks!
Sure, thanks for proceeding (no worth of blocking).
I'll add macros to my TODO list, working on it sometimes during July.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Petr, All,
Quoted 2 lines
I'll add macros to my TODO list, working on it sometimes during July.
The tricky part may be for TFAIL (TBROK) to distinguish from TERRNO or TTERRNO in one macro.
tst_res(TFAIL, " ") tst_res(TFAIL | TTERRNO, " ") tst_res(TFAIL | TERRNO, " ");
I haven't got a better idea unless we allow creating more macros like:
TST_RES_TFAIL()
TST_RES_TFAIL_TTERRNO()
TST_RES_TFAIL_TERRNO()
But TBH, this looks a bit messy and not good for memories.
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 13 lines
Hi Petr, All,
Quoted 1 line
I'll add macros to my TODO list, working on it sometimes during July.
The tricky part may be for TFAIL (TBROK) to distinguish from TERRNO or TTERRNO in one macro.
tst_res(TFAIL, " ") tst_res(TFAIL | TTERRNO, " ") tst_res(TFAIL | TERRNO, " ");
Quoted 7 lines
I haven't got a better idea unless we allow creating more macros like:
TST_RES_TFAIL()
TST_RES_TFAIL_TTERRNO()
TST_RES_TFAIL_TERRNO()But TBH, this looks a bit messy and not good for memories.
Yeah :(. And I don't see any good name either.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp