From dad6f49c3643ece722a784a676434c88f3f1e19d Mon Sep 17 00:00:00 2001 From: "Ahmed S. Darwish" Date: Wed, 9 Feb 2011 13:13:04 +0200 Subject: kexec-tools: Don't duplicate the bzImage header area Don't wholeheartedly copy the 32-Kbytes bzImage header area to the stack, just use a constant pointer instead. Signed-off-by: Ahmed S. Darwish Signed-off-by: Simon Horman --- kexec/arch/i386/kexec-bzImage.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kexec/arch/i386/kexec-bzImage.c b/kexec/arch/i386/kexec-bzImage.c index 83d3a69e..29e91654 100644 --- a/kexec/arch/i386/kexec-bzImage.c +++ b/kexec/arch/i386/kexec-bzImage.c @@ -43,32 +43,32 @@ static const int probe_debug = 0; int bzImage_probe(const char *buf, off_t len) { - struct x86_linux_header header; + const struct x86_linux_header *header; if ((uintmax_t)len < (uintmax_t)sizeof(header)) { return -1; } - memcpy(&header, buf, sizeof(header)); - if (memcmp(header.header_magic, "HdrS", 4) != 0) { + header = (const struct x86_linux_header *)buf; + if (memcmp(header->header_magic, "HdrS", 4) != 0) { if (probe_debug) { fprintf(stderr, "Not a bzImage\n"); } return -1; } - if (header.boot_sector_magic != 0xAA55) { + if (header->boot_sector_magic != 0xAA55) { if (probe_debug) { fprintf(stderr, "No x86 boot sector present\n"); } /* No x86 boot sector present */ return -1; } - if (header.protocol_version < 0x0200) { + if (header->protocol_version < 0x0200) { if (probe_debug) { fprintf(stderr, "Must be at least protocol version 2.00\n"); } /* Must be at least protocol version 2.00 */ return -1; } - if ((header.loadflags & 1) == 0) { + if ((header->loadflags & 1) == 0) { if (probe_debug) { fprintf(stderr, "zImage not a bzImage\n"); } -- cgit 1.2.3-korg