grub2/grub2-btrfs-fix-incorrect-address-reference.patch
Andrei Borzenkov 9b3ed0ba28 Accepting request 244649 from home:michael-chang:branches:Base:System
- grub2-btrfs-fix-incorrect-address-reference.patch
  * Fix incorrect address reference in GRUB_BTRFS_EXTENT_REGULAR
    range check (bnc#869748) 

- grub2-vbe-blacklist-preferred-1440x900x32.patch
  * Blacklist preferred resolution 1440x900x32 which is broken on 
    many Thinkpads (bnc#888727)

OBS-URL: https://build.opensuse.org/request/show/244649
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=104
2014-08-14 08:30:20 +00:00

14 lines
646 B
Diff

Index: grub-2.02~beta2/grub-core/fs/btrfs.c
===================================================================
--- grub-2.02~beta2.orig/grub-core/fs/btrfs.c
+++ grub-2.02~beta2/grub-core/fs/btrfs.c
@@ -1051,7 +1051,7 @@ grub_btrfs_extent_read (struct grub_btrf
data->extend = data->extstart + grub_le_to_cpu64 (data->extent->size);
if (data->extent->type == GRUB_BTRFS_EXTENT_REGULAR
- && (char *) &data->extent + elemsize
+ && (char *) data->extent + elemsize
>= (char *) &data->extent->filled + sizeof (data->extent->filled))
data->extend =
data->extstart + grub_le_to_cpu64 (data->extent->filled);