Skip to contentSkip to conversation

env: mmc: Correct partition comparison in mmc_offset_try_partition

PATCH New Hoyeonjiki Kim 2 participants 2 messages Nov 17, 2020 – Nov 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 env: mmc: Correct partition comparison in mmc_offset_try_partition

The function mmc_offset_try_partition searches the MMC partition for locating environment data, by comparing the partition names with config "u-boot,mmc-env-parition". However, it only compares the first word-size bytes (size of 'const char *'), which may make the function to find unintended partition.

Correct the function not to partially compare the partition name with config "u-boot,mmc-env-partition".

Fixes c9e87ba66540 ("env: Save environment at the end of an MMC partition")
---
 env/mmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
env/mmc.c +1 -1
index 4e67180b23..ee376c3e0c 100644
@@ -42,7 +42,7 @@ static inline int mmc_offset_try_partition(const char *str, int copy, s64 *val)
 		if (ret < 0)
 			return ret;
 
-		if (!strncmp((const char *)info.name, str, sizeof(str)))
+		if (!strncmp((const char *)info.name, str, sizeof(info.name)))
 			break;
 	}
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH v5 1/1 env: mmc: Correct partition comparison in mmc_offset_try_partition

Quoted 6 lines · Hoyeonjiki Kim

The function mmc_offset_try_partition searches the MMC partition for locating environment data, by comparing the partition names with config "u-boot,mmc-env-parition". However, it only compares the first word-size bytes (size of 'const char *'), which may make the function to find unintended partition.

Quoted 6 lines

Correct the function not to partially compare the partition name with config "u-boot,mmc-env-partition".

Fixes c9e87ba66540 ("env: Save environment at the end of an MMC partition")

Applied to u-boot/master, 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/20201119/bd9de27e/attachment-0001.sig>