d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GELIBoot may attempt to read past the end of the disk

Browse Source 
Usually there is some slack after the last partition due to 4k alignment
In the 10.3 EC2 images, there was not. EC2 seems to hang if you try to
read past the end of the disk in the loader, resulting in an unbootable
instance after upgrading to 11.0

PR:		213196
Reported by:	Peter Ankerstal <peter@pean.org>
Tested by:	cperciva
Reviewed by:	tsoome
MFC after:	3 days
Sponsored by:	ScaleEngine Inc.
Differential Revision:	https://reviews.freebsd.org/D8144
This commit is contained in:
Allan Jude 2016-10-04 16:33:03 +00:00
parent f7948591dc
commit 452bd5bf51
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/boot/geli/geliboot.c
View File

@ -77,17 +77,25 @@ geli_taste(int read_func(void *vdev, void *priv, off_t off, void *buf,
int error; int error;
off_t alignsector; off_t alignsector;
alignsector = (lastsector * DEV_BSIZE) & alignsector = rounddown2(lastsector * DEV_BSIZE, DEV_GELIBOOT_BSIZE);
~(off_t)(DEV_GELIBOOT_BSIZE - 1); if (alignsector + DEV_GELIBOOT_BSIZE > ((lastsector + 1) * DEV_BSIZE)) {
/* Don't read past the end of the disk */
alignsector = (lastsector * DEV_BSIZE) + DEV_BSIZE
- DEV_GELIBOOT_BSIZE;
}
error = read_func(NULL, dskp, alignsector, &buf, DEV_GELIBOOT_BSIZE); error = read_func(NULL, dskp, alignsector, &buf, DEV_GELIBOOT_BSIZE);
if (error != 0) { if (error != 0) {
return (error); return (error);
} }
/* Extract the last DEV_BSIZE bytes from the block. */ /* Extract the last 4k sector of the disk. */
error = eli_metadata_decode(buf + (DEV_GELIBOOT_BSIZE - DEV_BSIZE), error = eli_metadata_decode(buf, &md);
&md);
if (error != 0) { if (error != 0) {
return (error); /* Try the last 512 byte sector instead. */
error = eli_metadata_decode(buf +
(DEV_GELIBOOT_BSIZE - DEV_BSIZE), &md);
if (error != 0) {
return (error);
}
} }
if (!(md.md_flags & G_ELI_FLAG_GELIBOOT)) { if (!(md.md_flags & G_ELI_FLAG_GELIBOOT)) {