lib: Fix integer overflow in libiniparser.c
Subsystems (2)
PATCH 1/1 lib: Fix integer overflow in libiniparser.c
Report of the static analyzer:
Possible integer underflow: left operand is tainted.
An integer underflow may occur due to arithmetic operation (subtraction) between values
{ [-2147483648, 2147483647] } and '1', where the first value comes from the expression '(int)strlen(line)'
Corrections explained:
1. Added a check to handle empty strings before decrementing the length of the line (len = strlen(line) - 1) to prevent integer underflow.
2. Modified logic toskip empty lines immediately, reducing unnecessary processing.- Ensured safety by validating len >= 0 before accessing line[len] to avoid out-of-bounds access.
3. Improved robustness when handling multiline values by ensuring valid indices for len.- Added relevant comments to clarify changes and their purpose.
Triggers found by static analyzer Svace.
--- lib/libiniparser.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
lib/libiniparser.c +9 -3
@@ -522,9 +522,15 @@ dictionary * iniparser_load(const char * ininame)while (fgets (line+last,ASCIILINESZ -last, in)!=NULL ) { lineno++ ; - len = (int )strlen (line)-1 ; + len = (int )strlen (line); +if (len ==0 ){ +memset (line,0 ,ASCIILINESZ ); + last =0 ; +continue ; + } + len--;/* Safety check against buffer overflows */ -if (line[len]!='\n' ) { +if (len <0 || line[len]!='\n' ) { fprintf(stderr, "iniparser: input line too long in %s (%d)\n", ininame,
@@ -540,7 +546,7 @@ dictionary * iniparser_load(const char * ininame) len-- ; }/* Detect multi-line */ -if (line[len]=='\\' ) { +if (len >=0 && line[len]=='\\' ) {/* Multi-line value */ last=len ;continue ;
Signature · 6 lines
2.30.2 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Quoted 23 lines · Anton Moryakov
Report of the static analyzer:
Possible integer underflow: left operand is tainted.
An integer underflow may occur due to arithmetic operation (subtraction) between values
{ [-2147483648, 2147483647] } and '1', where the first value comes from the expression '(int)strlen(line)'Corrections explained:
1. Added a check to handle empty strings before decrementing the length of the line (len = strlen(line) - 1) to prevent integer underflow.
2. Modified logic toskip empty lines immediately, reducing unnecessary processing.- Ensured safety by validating len >= 0 before accessing line[len] to avoid out-of-bounds access.
3. Improved robustness when handling multiline values by ensuring valid indices for len.- Added relevant comments to clarify changes and their purpose.Triggers found by static analyzer Svace.
Signed-off-by Anton Moryakov <[email protected]>--- lib/libiniparser.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)lib/libiniparser.c +0
-0
lib/libiniparser.c dictionary * iniparser_load(const char * ininame) · line 525
Quoted 5 lines
lib/libiniparser.c +1
-1@@ -522,9 +522,15 @@ dictionary * iniparser_load(const char * ininame)while (fgets (line+last,ASCIILINESZ -last, in)!=NULL ) { lineno++ ; - len = (int )strlen (line)-1 ; + len = (int )strlen (line);
Hi, Anton.
The 'len' must be greater than 0 if fgets() returns not NULL, the 'line' contains at least one letter '\n'.
Quoted 13 lines
lib/libiniparser.c +7
-1+if (len ==0 ){ +memset (line,0 ,ASCIILINESZ ); + last =0 ; +continue ; + } + len--;/* Safety check against buffer overflows */ -if (line[len]!='\n' ) { +if (len <0 || line[len]!='\n' ) { fprintf(stderr, "iniparser: input line too long in %s (%d)\n", ininame,
lib/libiniparser.c dictionary * iniparser_load(const char * ininame) · line 547
Quoted 2 lines
lib/libiniparser.c +0
-0@@ -540,7 +546,7 @@ dictionary * iniparser_load(const char * ininame) len-- ; }
Here, 'len' could be less than zero. I'm fine with the modification here.
lib/libiniparser.c dictionary * iniparser_load(const char * ininame) · line 552
Quoted 7 lines
lib/libiniparser.c +1
-1/* Detect multi-line */ -if (line[len]=='\\' ) { +if (len >=0 && line[len]=='\\' ) {/* Multi-line value */ last=len ;continue ;
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/