ieee1275 : Add a check for invalid partition number
PATCH v4 1/1 ieee1275 : Add a check for invalid partition number
Add a check for invalid partition number. grub_strtoul() may fail in several scenarios like invalid input, overflow, etc. Lack of proper check may lead to unexpected failures in the code further.
--- grub-core/kern/ieee1275/openfw.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
grub-core/kern/ieee1275/openfw.c +15 -2
@@ -512,7 +512,20 @@ grub_ieee1275_encode_devname (const char *path) }if (partition && partition[0 ]) { -unsigned int partno =grub_strtoul (partition,0 ,0 ); +unsigned long partno; +char *endptr; + + partno =grub_strtoul (partition, &endptr,0 ); + grub_errno =GRUB_ERR_NONE ; +if (*endptr !='\0' || partno >65535 || + (partno ==0 && !grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_0_BASED_PARTITIONS ))) + { +grub_free (partition); +grub_free (device); +grub_free (encoding); +grub_error (GRUB_ERR_BAD_ARGUMENT ,N_ ("invalid partition number" )); +return NULL ; + } *optr++ =',' ;
@@ -520,7 +533,7 @@ grub_ieee1275_encode_devname (const char *path)/* GRUB partition 1 is OF partition 0. */ partno++; -grub_snprintf (optr,sizeof ("XXXXXXXXXXXX" ),"%d" , partno); +grub_snprintf (optr,sizeof ("XXXXXXXXXXXX" ),"%zu" , partno); }else *optr ='\0' ;
Signature · 7 lines
2.50.1 (Apple Git-155) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
Quoted 5 lines · Avnish Chouhan
Add a check for invalid partition number.
grub_strtoul()may fail in several scenarios like invalid input, overflow, etc. Lack of proper check may lead to unexpected failures in the code further.Signed-off-by Avnish Chouhan <[email protected]>
Quoted 31 lines
--- grub-core/kern/ieee1275/openfw.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)grub-core/kern/ieee1275/openfw.c +14
-1@@ -512,7 +512,20 @@ grub_ieee1275_encode_devname (const char *path) }if (partition && partition[0 ]) { -unsigned int partno =grub_strtoul (partition,0 ,0 ); +unsigned long partno; +char *endptr; + + partno =grub_strtoul (partition, &endptr,0 ); + grub_errno =GRUB_ERR_NONE ; +if (*endptr !='\0' || partno >65535 || + (partno ==0 && !grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_0_BASED_PARTITIONS ))) + { +grub_free (partition); +grub_free (device); +grub_free (encoding); +grub_error (GRUB_ERR_BAD_ARGUMENT ,N_ ("invalid partition number" )); +return NULL ; + } *optr++ =',' ;
grub-core/kern/ieee1275/openfw.c grub_ieee1275_encode_devname (const char *path) · line 536
Quoted 5 lines
grub-core/kern/ieee1275/openfw.c +1
-1@@ -520,7 +533,7 @@ grub_ieee1275_encode_devname (const char *path)/* GRUB partition 1 is OF partition 0. */ partno++; -grub_snprintf (optr,sizeof ("XXXXXXXXXXXX" ),"%d" , partno); +grub_snprintf (optr,sizeof ("XXXXXXXXXXXX" ),"%zu" , partno);
Huh! I have just realized that I misread the code and made wrong suggestion. Of course "%zu" should be "%lu". I will fix this for you. Sorry for the noise...
Daniel
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel