tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kern/ieee1275/openfw: Add a check for invalid partition number

Browse Source 
The 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 <avnish@linux.ibm.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Avnish Chouhan 2026-01-12 23:20:14 +05:30 committed by Daniel Kiper
parent f94eae0f8d
commit e37d021583
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
grub-core/kern/ieee1275/openfw.c
View File

@ -512,7 +512,20 @@ grub_ieee1275_encode_devname (const char *path)
} }
if (partition && partition[0]) if (partition && partition[0])
{ {
unsigned int partno = grub_strtoul (partition, 0, 0); unsigned long partno;
const 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++ = ','; *optr++ = ',';
@ -520,7 +533,7 @@ grub_ieee1275_encode_devname (const char *path)
/* GRUB partition 1 is OF partition 0. */ /* GRUB partition 1 is OF partition 0. */
partno++; partno++;
grub_snprintf (optr, sizeof ("XXXXXXXXXXXX"), "%d", partno); grub_snprintf (optr, sizeof ("XXXXXXXXXXXX"), "%lu", partno);
} }
else else
*optr = '\0'; *optr = '\0';