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

2005-10-15 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
* kern/file.c (grub_file_seek): Seeking to an offset equal to a
        file size must be permitted.

        * kern/i386/pc/startup.S (multiboot_trampoline): Fix a mistake
        between %ah and %al.
This commit is contained in:
okuji 2005-10-15 17:28:36 +00:00
parent 5c177389e2
commit 219ad4262c
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-10-15 Yoshinori K. Okuji <okuji@enbug.org>
* kern/file.c (grub_file_seek): Seeking to an offset equal to a
file size must be permitted.
* kern/i386/pc/startup.S (multiboot_trampoline): Fix a mistake
between %ah and %al.
2005-10-15 Yoshinori K. Okuji <okuji@enbug.org> 2005-10-15 Yoshinori K. Okuji <okuji@enbug.org>
* fs/xfs.c (grub_xfs_iterate_dir): Change the type of BLK to * fs/xfs.c (grub_xfs_iterate_dir): Change the type of BLK to

2
kern/file.c
View file

@ -146,7 +146,7 @@ grub_file_seek (grub_file_t file, grub_ssize_t offset)
{ {
grub_ssize_t old; grub_ssize_t old;
if (offset < 0 || offset >= file->size) if (offset < 0 || offset > file->size)
{ {
grub_error (GRUB_ERR_OUT_OF_RANGE, grub_error (GRUB_ERR_OUT_OF_RANGE,
"attempt to seek outside of the file"); "attempt to seek outside of the file");

4
kern/i386/pc/startup.S
View file

@ -149,12 +149,12 @@ multiboot_trampoline:
movl %edx, %eax movl %edx, %eax
shrl $8, %eax shrl $8, %eax
xorl %ebx, %ebx xorl %ebx, %ebx
cmpb $0xFF, %al cmpb $0xFF, %ah
je 1f je 1f
movb %ah, %bl movb %ah, %bl
movl %ebx, EXT_C(grub_install_dos_part) movl %ebx, EXT_C(grub_install_dos_part)
1: 1:
cmpb $0xFF, %ah cmpb $0xFF, %al
je 2f je 2f
movb %al, %bl movb %al, %bl
movl %ebx, EXT_C(grub_install_bsd_part) movl %ebx, EXT_C(grub_install_bsd_part)