[kernel] r17640 - dists/lenny-security/linux-2.6/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Fri Jun 10 01:41:07 2011
New Revision: 17640

Log:
backport to 2.6.26

Modified:
   dists/lenny-security/linux-2.6/debian/patches/bugfix/all/efi-corrupted-GUID-partition-tables-can-cause-kernel-oops.patch

Modified: dists/lenny-security/linux-2.6/debian/patches/bugfix/all/efi-corrupted-GUID-partition-tables-can-cause-kernel-oops.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/bugfix/all/efi-corrupted-GUID-partition-tables-can-cause-kernel-oops.patch	Thu Jun  9 14:44:56 2011	(r17639)
+++ dists/lenny-security/linux-2.6/debian/patches/bugfix/all/efi-corrupted-GUID-partition-tables-can-cause-kernel-oops.patch	Fri Jun 10 01:41:07 2011	(r17640)
@@ -31,6 +31,7 @@
     Cc: Dave Jones <davej at codemonkey.org.uk>
     Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
     Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+    [dannf: backported to Debian's 2.6.26]
 
 diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c
 index 19d6750..6296b40 100644
@@ -42,10 +43,10 @@
  
 +	/* Check the GUID Partition Table header size */
 +	if (le32_to_cpu((*gpt)->header_size) >
-+			bdev_logical_block_size(state->bdev)) {
++			bdev_hardsect_size(bdev)) {
 +		pr_debug("GUID Partition Table Header size is wrong: %u > %u\n",
 +			le32_to_cpu((*gpt)->header_size),
-+			bdev_logical_block_size(state->bdev));
++			bdev_hardsect_size(bdev));
 +		goto fail;
 +	}
 +