Skip to contentSkip to conversation

env: mmc: Correct partition comparison in mmc_offset_try_partition

PATCH New Hoyeonjiki Kim 2 participants 4 messages Nov 12, 2020 – Nov 13, 2020

lore
Share & tools
lore
#0 lore raw

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

The function mmc_offset_try_partition searches MMC partition to save the environment data by name. 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..505f7aa2b8 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 (!strcmp((const char *)info.name, str))
 			break;
 	}
 
Signature · 1 line
2.25.1
#1 lore raw

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

Mis-submitted the patch without versioning... :(
I'll re-submit my patch again.

Sorry for interrupting you.

Best Regards,
Hoyeonjiki Kim

Quoted 32 lines · Hoyeonjiki Kim

The function mmc_offset_try_partition searches MMC partition to save the environment data by name. 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 -2
index 4e67180b23..505f7aa2b8 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 (!strcmp((const char *)info.name, str))
                        break;
        }
 
--

2.25.1

#2 lore raw

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

In reply to Hoyeonjiki Kim

Dear Hoyeonjiki Kim,

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

The function mmc_offset_try_partition searches MMC partition to save the environment data by name. 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 +0 -0
index 4e67180b23..505f7aa2b8 100644

env/mmc.c static inline int mmc_offset_try_partition(const char *str, int copy, s64 *val) · line 45

Quoted 5 lines
env/mmc.c +1 -1
@@ -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 (!strcmp((const char *)info.name, str))

This looks dangerous to me. If the used length sizeof(str) is not correct, that should be fixed, but switching to strcmp() means we may run into problems if the buffer is not NUL terminated. Do we have a guarantee here thai it always ist?? The fact that strncmp() has been used before suggests otyherwise.

Please double-check.

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
Computers are not intelligent. They only think they are.
#3 lore raw

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

Quoted 40 lines · Wolfgang Denk

Dear Hoyeonjiki Kim,

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

The function mmc_offset_try_partition searches MMC partition to save the environment data by name. 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 +0 -0
index 4e67180b23..505f7aa2b8 100644

env/mmc.c static inline int mmc_offset_try_partition(const char *str, int copy, s64 *val) · line 45

Quoted 5 lines
env/mmc.c +1 -1
@@ -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 (!strcmp((const char *)info.name, str))

This looks dangerous to me. If the used length sizeof(str) is not correct, that should be fixed, but switching to strcmp() means we may run into problems if the buffer is not NUL terminated. Do we have a guarantee here thai it always ist?? The fact that strncmp() has been used before suggests otyherwise.

Please double-check.

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 Computers are not intelligent. They only think they are.

Dear Wolfgang Denk,

I left my reply on the thread for patch v2.
Please refer to that.

We can keep discussing it on that thread from now on. Again, sorry for the confusion.

Best Regards,
Hoyeonjiki Kim