Skip to contentSkip to conversation

env: mmc: Correct partition comparison in mmc_offset_try_partition

PATCH Superseded Hoyeonjiki Kim 3 participants 5 messages Nov 15, 2020 – Nov 17, 2020

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 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 v3 1/1 env: mmc: Correct partition comparison in mmc_offset_try_partition

Dear Hoyeonjiki,

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 8 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")

Nobody replied with reviewed-by tag.
Don't add reviewed-by tag yourself.

Best Regards,
Jaehoon Chung

Quoted 17 lines
---
 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;>  	}
 
 
#2 lore raw

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

Jaehoon Chung,

Quoted 19 lines · Jaehoon Chung

Dear Hoyeonjiki,

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 8 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")
Quoted 5 lines

Nobody replied with reviewed-by tag.
Don't add reviewed-by tag yourself.

Best Regards,
Jaehoon Chung

Seems I misunderstood how it works... Thanks for letting me know.
I will resend my patch with those reviewed-by tags.

Best Regards,
Hoyeonjiki Kim

Quoted 19 lines
Quoted 18 lines
---
 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;>         }
 
 
#3 lore raw

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

In reply to Hoyeonjiki Kim

Dear Hoyeonjiki Kim,

Quoted 9 lines · In message <[email protected]> you wrote:

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".

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

---

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
God made the integers; all else is the work of Man.       - Kronecker
#4 lore raw

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

Dear Wolfgang Denk,

Quoted 25 lines · Wolfgang Denk

Dear Hoyeonjiki Kim,

Quoted 9 lines · In message <[email protected]> you wrote:

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".

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

---

Best regards,

Quoted 7 lines

Wolfgang Denk

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
God made the integers; all else is the work of Man. - Kronecker

Thanks for all the reviews for this patch.
I'll bring the patch with it.

Best Regards,
Hoyeonjiki Kim