Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-22 15:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

kern/partition: Add sanity check after grub_strtoul() call

Browse Source 
The current code incorrectly assumes that both the input and the values
returned by grub_strtoul() are always valid which can lead to potential
errors. This fix ensures proper validation to prevent any unintended issues.

Fixes: CID 473843

Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Lidong Chen authored and Daniel Kiper committed 2025-02-13 15:45:58 +01:00
1 parent 5b36a5210e
commit 8e6e87e792
1 file changed
+10 -2
Download Patch File Download Diff File Expand all files Collapse all files
grub-core/kern/partition.c
+10 -2
View File
@@ -125,14 +125,22 @@ grub_partition_probe (struct grub_disk *disk, const char *str)
for (ptr = str; *ptr;) for (ptr = str; *ptr;)
{ {
grub_partition_map_t partmap; grub_partition_map_t partmap;
int num; unsigned long num;
const char *partname, *partname_end; const char *partname, *partname_end;
partname = ptr; partname = ptr;
while (*ptr && grub_isalpha (*ptr)) while (*ptr && grub_isalpha (*ptr))
ptr++; ptr++;
partname_end = ptr; partname_end = ptr;
num = grub_strtoul (ptr, &ptr, 0) - 1;
num = grub_strtoul (ptr, &ptr, 0);
if (*ptr != '\0' || num == 0 || num > GRUB_INT_MAX)
{
grub_error (GRUB_ERR_BAD_NUMBER, N_("invalid partition number"));
return 0;
}
num -= 1;
curpart = 0; curpart = 0;
/* Use the first partition map type found. */ /* Use the first partition map type found. */