From f91ddd78e8dc3d34ab9d495431e8157b0cb50b7f Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Fri, 3 Oct 2008 21:08:49 +0400 Subject: [PATCH] --- yaml --- r: 113381 b: refs/heads/master c: 6cdcdb99cf7c2e1835fc5b471864d21161c3e679 h: refs/heads/master i: 113379: ede3109ce85b9a29cc602b9f2c47843d981ed04f v: v3 --- [refs] | 2 +- trunk/arch/x86/boot/edd.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b3ea646d3543..0c815a236279 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 464f04c9e9b3b1c4f5ffb89c51d8ba2a2034c846 +refs/heads/master: 6cdcdb99cf7c2e1835fc5b471864d21161c3e679 diff --git a/trunk/arch/x86/boot/edd.c b/trunk/arch/x86/boot/edd.c index bf4ae6ff518e..067e28cd3c5f 100644 --- a/trunk/arch/x86/boot/edd.c +++ b/trunk/arch/x86/boot/edd.c @@ -43,6 +43,7 @@ static u32 read_mbr_sig(u8 devno, struct edd_info *ei, u32 *mbrsig) char *mbrbuf_ptr, *mbrbuf_end; u32 buf_base, mbr_base; extern char _end[]; + u16 mbr_magic; sector_size = ei->params.bytes_per_sector; if (!sector_size) @@ -60,11 +61,15 @@ static u32 read_mbr_sig(u8 devno, struct edd_info *ei, u32 *mbrsig) if (mbrbuf_end > (char *)(size_t)boot_params.hdr.heap_end_ptr) return -1; + memset(mbrbuf_ptr, 0, sector_size); if (read_mbr(devno, mbrbuf_ptr)) return -1; *mbrsig = *(u32 *)&mbrbuf_ptr[EDD_MBR_SIG_OFFSET]; - return 0; + mbr_magic = *(u16 *)&mbrbuf_ptr[510]; + + /* check for valid MBR magic */ + return mbr_magic == 0xAA55 ? 0 : -1; } static int get_edd_info(u8 devno, struct edd_info *ei)