* grub-core/commands/loadenv.c (check_blocklists): Fix overlap check.

Bug: http://savannah.gnu.org/bugs/?42134
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1311247
Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=1f6af2a9f8b02a71f213b4717d8e62c8a6b14fc5
Last-Update: 2015-01-23

Patch-Name: check_blocklists_overlap_fix.patch

diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
index 6af8112074563c6532c7116ea249d905ba3b680a..acd93d123ed361e5bd7ae449f5166d5659104823 100644 (file)
--- a/grub-core/commands/loadenv.c
+++ b/grub-core/commands/loadenv.c
@@ -263,7 +263,7 @@ check_blocklists (grub_envblk_t envblk, struct blocklist *blocklists,
       for (q = p->next; q; q = q->next)
         {
          grub_disk_addr_t s1, s2;
-         grub_disk_addr_t e1, e2, t;
+         grub_disk_addr_t e1, e2;
 
          s1 = p->sector;
          e1 = s1 + ((p->length + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
@@ -271,16 +271,7 @@ check_blocklists (grub_envblk_t envblk, struct blocklist *blocklists,
          s2 = q->sector;
          e2 = s2 + ((q->length + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
 
-         if (s2 > s1)
-           {
-             t = s2;
-             s2 = s1;
-             s1 = t;
-             t = e2;
-             e2 = e1;
-             e1 = t;
-           }
-          if (e1 > s2)
+         if (s1 < e2 && s2 < e1)
             {
               /* This might be actually valid, but it is unbelievable that
                  any filesystem makes such a silly allocation.  */