[kernel] r22220 - in dists/squeeze-security/linux-2.6/debian/patches: bugfix/all series

[Ben Hutchings]

Author: benh
Date: Sat Dec 20 20:12:57 2014
New Revision: 22220

Log:
Revert fix for CVE-2013-2147 which is included in 2.6.32.65

Also fix up the line numbers in the patch so it is applied/reverted
in the right place reliably.

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/cciss-fix-info-leak.patch
   dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze10

Modified: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/cciss-fix-info-leak.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/cciss-fix-info-leak.patch	Sat Dec 20 19:29:04 2014	(r22219)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/cciss-fix-info-leak.patch	Sat Dec 20 20:12:57 2014	(r22220)
@@ -18,7 +18,7 @@
 index d2d95ff..edfa251 100644
 --- a/drivers/block/cciss.c
 +++ b/drivers/block/cciss.c
-@@ -1189,6 +1189,7 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
+@@ -1011,6 +1011,7 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
  	int err;
  	u32 cp;
  

Modified: dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze10
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze10	Sat Dec 20 19:29:04 2014	(r22219)
+++ dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze10	Sat Dec 20 20:12:57 2014	(r22220)
@@ -23,6 +23,7 @@
 - bugfix/all/CVE-2014-4943.patch
 - bugfix/all/CVE-2014-4654+4655.patch  
 - bugfix/all/CVE-2014-4653.patch
+- bugfix/all/cciss-fix-info-leak.patch
 # End of patches to drop for 2.6.32.65
 
 # Add upstream patches