Skip to contentSkip to conversation

cfgfile: avoid stack buffer underflow

PATCH Applied Stephen Hemminger 3 participants 3 messages Jul 2, 2020 – Jul 7, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cfgfile: avoid stack buffer underflow

If cfgfile is give a line with comment character at the start of the line, it will dereference outside of the buffer.

Detected with address sanitizer:

SUMMARY: AddressSanitizer: stack-buffer-underflow lib/librte_cfgfile/rte_cfgfile.c:194 in rte_cfgfile_load_with_params Shadow bytes around the buggy address:
0x200fff79f6a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x200fff79f6b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x200fff79f6c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x200fff79f6d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x200fff79f6e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
=>0x200fff79f6f0: 00 00 00 00 f1 f1 f1[f1]00 00 00 00 00 00 00 00
0x200fff79f700: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x200fff79f710: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x200fff79f720: 04 f2 f2 f2 f3 f3 f3 f3 00 00 00 00 00 00 00 00
0x200fff79f730: 00 00 00 00 00 00 00 00 00 00 f1 f1 f1 f1 00 f2
0x200fff79f740: f2 f2 f3 f3 f3 f3 00 00 00 00 00 00 00 00 00 00
Shadow byte legend (one shadow byte represents 8 application bytes):
Addressable: 00
Partially addressable: 01 02 03 04 05 06 07

  Heap left redzone:       fa
  Freed heap region:       fd
  Stack left redzone:      f1
  Stack mid redzone:       f2
  Stack right redzone:     f3
  Stack after return:      f5
  Stack use after scope:   f8
  Global redzone:          f9
  Global init order:       f6
  Poisoned by user:        f7
  Container overflow:      fc
  Array cookie:            ac
  Intra object redzone:    bb
  ASan internal:           fe
  Left alloca redzone:     ca
  Right alloca redzone:    cb

==2189==ABORTING

Fixes a6a47ac9c2c9 ("cfgfile: rework load function")
---
 lib/librte_cfgfile/rte_cfgfile.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
lib/librte_cfgfile/rte_cfgfile.c +2 -1
index 714717dd9007..160d78826e7c 100644
@@ -191,7 +191,8 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
 		}
 		/* skip parsing if comment character found */
 		pos = memchr(buffer, params->comment_character, len);
-		if (pos != NULL && (*(pos-1) != '\\')) {
+		if (pos != NULL &&
+		    (pos == buffer || *(pos-1) != '\\')) {
 			*pos = '\0';
 			len = pos -  buffer;
 		}
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 53 lines · Stephen Hemminger

If cfgfile is give a line with comment character at the start of the line, it will dereference outside of the buffer.

Detected with address sanitizer:

SUMMARY: AddressSanitizer: stack-buffer-underflow lib/librte_cfgfile/rte_cfgfile.c:194 in rte_cfgfile_load_with_params Shadow bytes around the buggy address:
0x200fff79f6a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x200fff79f6b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x200fff79f6c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x200fff79f6d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x200fff79f6e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
=>0x200fff79f6f0: 00 00 00 00 f1 f1 f1[f1]00 00 00 00 00 00 00 00
0x200fff79f700: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x200fff79f710: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x200fff79f720: 04 f2 f2 f2 f3 f3 f3 f3 00 00 00 00 00 00 00 00
0x200fff79f730: 00 00 00 00 00 00 00 00 00 00 f1 f1 f1 f1 00 f2
0x200fff79f740: f2 f2 f3 f3 f3 f3 00 00 00 00 00 00 00 00 00 00
Shadow byte legend (one shadow byte represents 8 application bytes):
Addressable: 00
Partially addressable: 01 02 03 04 05 06 07

  Heap left redzone:       fa
  Freed heap region:       fd
  Stack left redzone:      f1
  Stack mid redzone:       f2
  Stack right redzone:     f3
  Stack after return:      f5
  Stack use after scope:   f8
  Global redzone:          f9
  Global init order:       f6
  Poisoned by user:        f7
  Container overflow:      fc
  Array cookie:            ac
  Intra object redzone:    bb
  ASan internal:           fe
  Left alloca redzone:     ca
  Right alloca redzone:    cb

==2189==ABORTING

Fixes a6a47ac9c2c9 ("cfgfile: rework load function")
---
 lib/librte_cfgfile/rte_cfgfile.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
lib/librte_cfgfile/rte_cfgfile.c +0 -0
index 714717dd9007..160d78826e7c 100644

lib/librte_cfgfile/rte_cfgfile.c rte_cfgfile_load_with_params(const char *filename, int flags, · line 198

Quoted 9 lines
lib/librte_cfgfile/rte_cfgfile.c +2 -1
@@ -191,7 +191,8 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
 		}
 		/* skip parsing if comment character found */
 		pos = memchr(buffer, params->comment_character, len);
-		if (pos != NULL && (*(pos-1) != '\\')) {
+		if (pos != NULL &&
+		    (pos == buffer || *(pos-1) != '\\')) {
 			*pos = '\0';
 			len = pos -  buffer;
 		}

Good catch by the tool.

#2 lore raw

02/07/2020 11:20, Bruce Richardson:

Quoted 5 lines · Stephen Hemminger
Quoted 4 lines

If cfgfile is give a line with comment character at the start of the line, it will dereference outside of the buffer.

Detected with address sanitizer:

[...]

Quoted 4 lines

Good catch by the tool.

Applied, thanks