vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Avoid straying into first partition when embedding-area sectors are in use (LP: #730225).

Browse source
This commit is contained in:
Colin Watson 2011-03-14 21:41:24 +00:00
parent 80e9f2bce8
commit 5de124b354
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
grub-core/partmap/msdos.c
View file

@ -275,7 +275,7 @@ pc_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
{ {
int i, j; int i, j;
char *embed_signature_check; char *embed_signature_check;
unsigned int orig_nsectors, extra_sectors = 0; unsigned int orig_nsectors;
orig_nsectors = *nsectors; orig_nsectors = *nsectors;
*nsectors = end - 1; *nsectors = end - 1;
@ -307,7 +307,7 @@ pc_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
"future. Please ask its authors not to store data " "future. Please ask its authors not to store data "
"in the boot track", "in the boot track",
(*sectors)[i], embed_signatures[j].name); (*sectors)[i], embed_signatures[j].name);
extra_sectors++; (*nsectors)--;
/* Avoid this sector. */ /* Avoid this sector. */
for (j = i; j < *nsectors; j++) for (j = i; j < *nsectors; j++)
@ -315,7 +315,7 @@ pc_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
} }
grub_free (embed_signature_check); grub_free (embed_signature_check);
if (end + extra_sectors < orig_nsectors + 1) if (*nsectors < orig_nsectors)
return grub_error (GRUB_ERR_OUT_OF_RANGE, return grub_error (GRUB_ERR_OUT_OF_RANGE,
"Other software is using the embedding area, and " "Other software is using the embedding area, and "
"there is not enough room for core.img. Such " "there is not enough room for core.img. Such "