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

fix a big linux problem.

Browse source
This commit is contained in:
okuji 2000-07-14 07:48:13 +00:00
parent 72ca6286fb
commit e01f0b9514
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2000-07-14 Khimenko Victor <grub@khim.sch57.msk.ru>
* stage2/boot.c (load_image): When getting the text length of a
Linux kernel, use unsigned long instead of unsigned short.
2000-07-13 OKUJI Yoshinori <okuji@gnu.org> 2000-07-13 OKUJI Yoshinori <okuji@gnu.org>
* lib/device.c: Include errno.h. Reported by Thierry DELHAISE * lib/device.c: Include errno.h. Reported by Thierry DELHAISE

1
THANKS
View file

@ -26,6 +26,7 @@ Johannes Kroeger <hanne@squirrel.owl.de>
John Tobey <spam@john-edwin-tobey.org> John Tobey <spam@john-edwin-tobey.org>
Josip Rodin <joy@cibalia.gkvk.hr> Josip Rodin <joy@cibalia.gkvk.hr>
Kalle Olavi Niemitalo <tosi@ees2.oulu.fi> Kalle Olavi Niemitalo <tosi@ees2.oulu.fi>
Khimenko Victor <grub@khim.sch57.msk.ru>
Klaus Reichl <klaus.reichl@alcatel.at> Klaus Reichl <klaus.reichl@alcatel.at>
Kunihiro Ishiguro <kunihiro@zebra.org> Kunihiro Ishiguro <kunihiro@zebra.org>
Mark Lundeberg <aa026@pgfn.bc.ca> Mark Lundeberg <aa026@pgfn.bc.ca>

4
stage2/boot.c
View file

@ -2,7 +2,7 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 1996 Erich Boleyn <erich@uruk.org> * Copyright (C) 1996 Erich Boleyn <erich@uruk.org>
* Copyright (C) 1999 Free Software Foundation, Inc. * Copyright (C) 1999, 2000 Free Software Foundation, Inc.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -207,7 +207,7 @@ load_image (char *kernel, char *arg, kernel_t suggested_type,
(buffer + LINUX_SETUP_LEN_OFFSET))) << 9)) (buffer + LINUX_SETUP_LEN_OFFSET))) << 9))
<= LINUX_SETUP_MAXLEN) <= LINUX_SETUP_MAXLEN)
&& ((text_len && ((text_len
= (((long) *((unsigned short *) = (((long) *((unsigned long *)
(buffer + LINUX_KERNEL_LEN_OFFSET))) << 4)), (buffer + LINUX_KERNEL_LEN_OFFSET))) << 4)),
(data_len + text_len + SECTOR_SIZE) <= ((filemax + 15) & 0xFFFFFFF0))) (data_len + text_len + SECTOR_SIZE) <= ((filemax + 15) & 0xFFFFFFF0)))
{ {