Skip to contentSkip to conversation

lib: strto: Fix parsing MTD partition size

PATCH New Pali Rohár 2 participants 7 messages Apr 24, 2020 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib: strto: Fix parsing MTD partition size

Commit 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16 detection") broke parsing MTD partition sizes specified in decimal base.

E.g. "128k(bootloader)" is parsed by drivers/mtd/mtdpart.c as hexadecimal number (0x128 << 10) because character 'a' in substring "bootloader" caused parsing whole number as hexadecimal.

This patch stop doing hexadecimal base heuristic on first non-valid hexadecimal number, so "128k(bootloader)" is parsed as decimal number 128.

Fixes 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16...")
---
 lib/strto.c | 3 +++
 1 file changed, 3 insertions(+)
lib/strto.c +3 -0
index 1ac2b09c72..060b66b915 100644
@@ -30,6 +30,9 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
 
 			do {
 				var = tolower(s[i++]);
+				if (!(var >= '0' && var <= '9') &&
+				    !(var >= 'a' && var <= 'f'))
+					break;
 				if (var >= 'a' && var <= 'f') {
 					*base = 16;
 					break;
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 lib: strto: Fix parsing MTD partition size

Quoted 33 lines · On Friday 24 April 2020 20:21:33 Pali Roh?r wrote:

Commit 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16 detection") broke parsing MTD partition sizes specified in decimal base.

E.g. "128k(bootloader)" is parsed by drivers/mtd/mtdpart.c as hexadecimal number (0x128 << 10) because character 'a' in substring "bootloader" caused parsing whole number as hexadecimal.

This patch stop doing hexadecimal base heuristic on first non-valid hexadecimal number, so "128k(bootloader)" is parsed as decimal number 128.

Fixes 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16...")
---
 lib/strto.c | 3 +++
 1 file changed, 3 insertions(+)
lib/strto.c +3 -0
index 1ac2b09c72..060b66b915 100644
@@ -30,6 +30,9 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
 
 			do {
 				var = tolower(s[i++]);
+				if (!(var >= '0' && var <= '9') &&
+				    !(var >= 'a' && var <= 'f'))
+					break;
 				if (var >= 'a' && var <= 'f') {
 					*base = 16;
 					break;
Signature · 1 line
2.20.1

CC Tom, this problem was detected by my in-progress Travis Nokia N900 test which tries to boot kernel from the OneNAND. Build log is there:
https://travis-ci.org/github/u-boot/u-boot/jobs/679007310

#2 lore raw

PATCH 1/1 lib: strto: Fix parsing MTD partition size

Quoted 23 lines · Pali Roh?r
Quoted 22 lines · On Friday 24 April 2020 20:21:33 Pali Roh?r wrote:

Commit 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16 detection") broke parsing MTD partition sizes specified in decimal base.

E.g. "128k(bootloader)" is parsed by drivers/mtd/mtdpart.c as hexadecimal number (0x128 << 10) because character 'a' in substring "bootloader" caused parsing whole number as hexadecimal.

This patch stop doing hexadecimal base heuristic on first non-valid hexadecimal number, so "128k(bootloader)" is parsed as decimal number 128.

Fixes 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16...")
---
 lib/strto.c | 3 +++
 1 file changed, 3 insertions(+)
lib/strto.c +0 -0
index 1ac2b09c72..060b66b915 100644
@@ -30,6 +30,9 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
 
Quoted 15 lines
Quoted 11 lines
lib/strto.c +3 -0
 			do {
 				var = tolower(s[i++]);
+				if (!(var >= '0' && var <= '9') &&
+				    !(var >= 'a' && var <= 'f'))
+					break;
 				if (var >= 'a' && var <= 'f') {
 					*base = 16;
 					break;
Signature · 1 line
2.20.1

CC Tom, this problem was detected by my in-progress Travis Nokia N900 test which tries to boot kernel from the OneNAND. Build log is there:
https://travis-ci.org/github/u-boot/u-boot/jobs/679007310

This is the same as:
http://patchwork.ozlabs.org/project/uboot/patch/1a681dbefac4c353ad53d7f6cd1a75812036739a.1586333353.git.michal.simek at xilinx.com/ yes? Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200424/8606d572/attachment.sig>
#3 lore raw

PATCH 1/1 lib: strto: Fix parsing MTD partition size

Quoted 40 lines · On Friday 24 April 2020 15:12:42 Tom Rini wrote:
Quoted 23 lines · Pali Roh?r
Quoted 22 lines · On Friday 24 April 2020 20:21:33 Pali Roh?r wrote:

Commit 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16 detection") broke parsing MTD partition sizes specified in decimal base.

E.g. "128k(bootloader)" is parsed by drivers/mtd/mtdpart.c as hexadecimal number (0x128 << 10) because character 'a' in substring "bootloader" caused parsing whole number as hexadecimal.

This patch stop doing hexadecimal base heuristic on first non-valid hexadecimal number, so "128k(bootloader)" is parsed as decimal number 128.

Fixes 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16...")
---
 lib/strto.c | 3 +++
 1 file changed, 3 insertions(+)
lib/strto.c +0 -0
index 1ac2b09c72..060b66b915 100644
@@ -30,6 +30,9 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
 
Quoted 15 lines
Quoted 11 lines
lib/strto.c +3 -0
 			do {
 				var = tolower(s[i++]);
+				if (!(var >= '0' && var <= '9') &&
+				    !(var >= 'a' && var <= 'f'))
+					break;
 				if (var >= 'a' && var <= 'f') {
 					*base = 16;
 					break;
Signature · 1 line
2.20.1

CC Tom, this problem was detected by my in-progress Travis Nokia N900 test which tries to boot kernel from the OneNAND. Build log is there:
https://travis-ci.org/github/u-boot/u-boot/jobs/679007310

Quoted 3 lines

This is the same as:
http://patchwork.ozlabs.org/project/uboot/patch/1a681dbefac4c353ad53d7f6cd1a75812036739a.1586333353.git.michal.simek at xilinx.com/ yes? Thanks!

Yes, this is the same problem.

#4 lore raw

PATCH 1/1 lib: strto: Fix parsing MTD partition size

Quoted 41 lines · Pali Roh?r
Quoted 40 lines · On Friday 24 April 2020 15:12:42 Tom Rini wrote:
Quoted 38 lines · Pali Roh?r
Quoted 33 lines · On Friday 24 April 2020 20:21:33 Pali Roh?r wrote:

Commit 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16 detection") broke parsing MTD partition sizes specified in decimal base.

E.g. "128k(bootloader)" is parsed by drivers/mtd/mtdpart.c as hexadecimal number (0x128 << 10) because character 'a' in substring "bootloader" caused parsing whole number as hexadecimal.

This patch stop doing hexadecimal base heuristic on first non-valid hexadecimal number, so "128k(bootloader)" is parsed as decimal number 128.

Fixes 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16...")
---
 lib/strto.c | 3 +++
 1 file changed, 3 insertions(+)
lib/strto.c +3 -0
index 1ac2b09c72..060b66b915 100644
@@ -30,6 +30,9 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
 
 			do {
 				var = tolower(s[i++]);
+				if (!(var >= '0' && var <= '9') &&
+				    !(var >= 'a' && var <= 'f'))
+					break;
 				if (var >= 'a' && var <= 'f') {
 					*base = 16;
 					break;
Signature · 1 line
2.20.1

CC Tom, this problem was detected by my in-progress Travis Nokia N900 test which tries to boot kernel from the OneNAND. Build log is there:
https://travis-ci.org/github/u-boot/u-boot/jobs/679007310

Quoted 5 lines
Quoted 3 lines

This is the same as:
http://patchwork.ozlabs.org/project/uboot/patch/1a681dbefac4c353ad53d7f6cd1a75812036739a.1586333353.git.michal.simek at xilinx.com/ yes? Thanks!

Yes, this is the same problem.

Can you please test (and Tested-by) that one? Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200424/e537a697/attachment.sig>
#5 lore raw

PATCH 1/1 lib: strto: Fix parsing MTD partition size

Quoted 42 lines · On Friday 24 April 2020 15:28:01 Tom Rini wrote:
Quoted 41 lines · Pali Roh?r
Quoted 40 lines · On Friday 24 April 2020 15:12:42 Tom Rini wrote:
Quoted 38 lines · Pali Roh?r
Quoted 33 lines · On Friday 24 April 2020 20:21:33 Pali Roh?r wrote:

Commit 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16 detection") broke parsing MTD partition sizes specified in decimal base.

E.g. "128k(bootloader)" is parsed by drivers/mtd/mtdpart.c as hexadecimal number (0x128 << 10) because character 'a' in substring "bootloader" caused parsing whole number as hexadecimal.

This patch stop doing hexadecimal base heuristic on first non-valid hexadecimal number, so "128k(bootloader)" is parsed as decimal number 128.

Fixes 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16...")
---
 lib/strto.c | 3 +++
 1 file changed, 3 insertions(+)
lib/strto.c +3 -0
index 1ac2b09c72..060b66b915 100644
@@ -30,6 +30,9 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
 
 			do {
 				var = tolower(s[i++]);
+				if (!(var >= '0' && var <= '9') &&
+				    !(var >= 'a' && var <= 'f'))
+					break;
 				if (var >= 'a' && var <= 'f') {
 					*base = 16;
 					break;
Signature · 1 line
2.20.1

CC Tom, this problem was detected by my in-progress Travis Nokia N900 test which tries to boot kernel from the OneNAND. Build log is there:
https://travis-ci.org/github/u-boot/u-boot/jobs/679007310

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

This is the same as:
http://patchwork.ozlabs.org/project/uboot/patch/1a681dbefac4c353ad53d7f6cd1a75812036739a.1586333353.git.michal.simek at xilinx.com/ yes? Thanks!

Yes, this is the same problem.

Can you please test (and Tested-by) that one? Thanks!

It is basically same patch as mine... but ok I'm going to run that my automated Nokia N900 test locally with above patch.

#6 lore raw

PATCH 1/1 lib: strto: Fix parsing MTD partition size

Quoted 47 lines · On Friday 24 April 2020 21:33:42 Pali Roh?r wrote:
Quoted 46 lines · On Friday 24 April 2020 15:28:01 Tom Rini wrote:
Quoted 45 lines · Pali Roh?r
Quoted 43 lines · On Friday 24 April 2020 15:12:42 Tom Rini wrote:
Quoted 23 lines · Pali Roh?r
Quoted 22 lines · On Friday 24 April 2020 20:21:33 Pali Roh?r wrote:

Commit 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16 detection") broke parsing MTD partition sizes specified in decimal base.

E.g. "128k(bootloader)" is parsed by drivers/mtd/mtdpart.c as hexadecimal number (0x128 << 10) because character 'a' in substring "bootloader" caused parsing whole number as hexadecimal.

This patch stop doing hexadecimal base heuristic on first non-valid hexadecimal number, so "128k(bootloader)" is parsed as decimal number 128.

Fixes 0486497e2b5f ("lib: Improve _parse_integer_fixup_radix base 16...")
---
 lib/strto.c | 3 +++
 1 file changed, 3 insertions(+)
lib/strto.c +0 -0
index 1ac2b09c72..060b66b915 100644
@@ -30,6 +30,9 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
 
Quoted 15 lines
Quoted 11 lines
lib/strto.c +3 -0
 			do {
 				var = tolower(s[i++]);
+				if (!(var >= '0' && var <= '9') &&
+				    !(var >= 'a' && var <= 'f'))
+					break;
 				if (var >= 'a' && var <= 'f') {
 					*base = 16;
 					break;
Signature · 1 line
2.20.1

CC Tom, this problem was detected by my in-progress Travis Nokia N900 test which tries to boot kernel from the OneNAND. Build log is there:
https://travis-ci.org/github/u-boot/u-boot/jobs/679007310

This is the same as:
http://patchwork.ozlabs.org/project/uboot/patch/1a681dbefac4c353ad53d7f6cd1a75812036739a.1586333353.git.michal.simek at xilinx.com/ yes? Thanks!

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Yes, this is the same problem.

Can you please test (and Tested-by) that one? Thanks!

It is basically same patch as mine... but ok I'm going to run that my automated Nokia N900 test locally with above patch.

That patch is working fine, you can add my Tested-by: Pali Roh?r <[email protected]> for it