diff --git a/grub2-btrfs-fix-incorrect-address-reference.patch b/grub2-btrfs-fix-incorrect-address-reference.patch new file mode 100644 index 0000000..716d87c --- /dev/null +++ b/grub2-btrfs-fix-incorrect-address-reference.patch @@ -0,0 +1,13 @@ +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); diff --git a/grub2-vbe-blacklist-preferred-1440x900x32.patch b/grub2-vbe-blacklist-preferred-1440x900x32.patch new file mode 100644 index 0000000..56294de --- /dev/null +++ b/grub2-vbe-blacklist-preferred-1440x900x32.patch @@ -0,0 +1,20 @@ +Index: grub-2.02~beta2/grub-core/video/i386/pc/vbe.c +=================================================================== +--- grub-2.02~beta2.orig/grub-core/video/i386/pc/vbe.c ++++ grub-2.02~beta2/grub-core/video/i386/pc/vbe.c +@@ -1053,6 +1053,15 @@ grub_video_vbe_setup (unsigned int width + || vbe_mode_info.y_resolution > height) + /* Resolution exceeds that of preferred mode. */ + continue; ++ ++ /* Blacklist 1440x900x32 from preferred mode handling until a ++ better solution is available. This mode causes problems on ++ many Thinkpads. ++ */ ++ if (vbe_mode_info.x_resolution == 1440 && ++ vbe_mode_info.y_resolution == 900 && ++ vbe_mode_info.bits_per_pixel == 32) ++ continue; + } + else + { diff --git a/grub2.changes b/grub2.changes index 0e4d91a..beb7f59 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Aug 14 06:35:58 UTC 2014 - mchang@suse.com + +- grub2-btrfs-fix-incorrect-address-reference.patch + * Fix incorrect address reference in GRUB_BTRFS_EXTENT_REGULAR + range check (bnc#869748) + +------------------------------------------------------------------- +Wed Aug 13 02:56:22 UTC 2014 - mchang@suse.com + +- grub2-vbe-blacklist-preferred-1440x900x32.patch + * Blacklist preferred resolution 1440x900x32 which is broken on + many Thinkpads (bnc#888727) + ------------------------------------------------------------------- Tue Aug 12 12:56:29 UTC 2014 - schwab@suse.de diff --git a/grub2.spec b/grub2.spec index ecd9124..2f7fd27 100644 --- a/grub2.spec +++ b/grub2.spec @@ -148,6 +148,8 @@ Patch37: grub2-use-Unifont-for-starfield-theme-terminal.patch Patch38: grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch Patch39: grub2-use-rpmsort-for-version-sorting.patch Patch40: aarch64-reloc.patch +Patch41: grub2-vbe-blacklist-preferred-1440x900x32.patch +Patch42: grub2-btrfs-fix-incorrect-address-reference.patch # Btrfs snapshot booting related patches Patch101: 0002-btrfs-add-ability-to-boot-from-subvolumes.patch Patch102: 0003-cmdline-add-envvar-loader_cmdline_append.patch @@ -347,6 +349,8 @@ mv po/grub.pot po/%{name}.pot %patch38 -p1 %patch39 -p1 %patch40 -p1 +%patch41 -p1 +%patch42 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1