[kernel] r7994 - in dists/sid/linux-2.6/debian: . patches/bugfix patches/series

[Dann Frazier]

Author: dannf
Date: Tue Dec 12 22:45:47 2006
New Revision: 7994

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/dm-crypt-fix-data-corruption-with-dm-crypt-over-raid5.patch
   dists/sid/linux-2.6/debian/patches/series/9
Modified:
   dists/sid/linux-2.6/debian/changelog
Log:
* Fix data corruption with dm-crypt over RAID5 (closes: #402812)

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Dec 12 22:45:47 2006
@@ -7,7 +7,10 @@
   [ Bastian Blank ]
   * Update vserver patch to 2.0.2.2-rc9.
 
- -- Bastian Blank <waldi at debian.org>  Tue, 12 Dec 2006 21:10:38 +0100
+  [ dann frazier ]
+  * Fix data corruption with dm-crypt over RAID5 (closes: #402812)
+
+ -- dann frazier <dannf at debian.org>  Tue, 12 Dec 2006 13:38:26 -0700
 
 linux-2.6 (2.6.18-8) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/dm-crypt-fix-data-corruption-with-dm-crypt-over-raid5.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/dm-crypt-fix-data-corruption-with-dm-crypt-over-raid5.patch	Tue Dec 12 22:45:47 2006
@@ -0,0 +1,37 @@
+From linux-kernel-owner+chrisw=40sous-sol.org-S1162719AbWLBC2Z at vger.kernel.org  Fri Dec  1 18:36:19 2006
+Date: 	Sat, 02 Dec 2006 03:27:56 +0100
+From: Christophe Saout <christophe at saout.de>
+To: dm-crypt at saout.de, Andrey <dm-crypt-revealed-address at lelik.org>, Andrew Morton <akpm at osdl.org>, agk at redhat.com, Neil Brown <neilb at suse.de>, Jens Axboe <jens.axboe at oracle.com>, Chris Wright <chrisw at sous-sol.org>, stable at kernel.org
+Subject: dm crypt: Fix data corruption with dm-crypt over RAID5
+
+Fix corruption issue with dm-crypt on top of software raid5. Cancelled
+readahead bio's that report no error, just have BIO_UPTODATE cleared
+were reported as successful reads to the higher layers (and leaving
+random content in the buffer cache). Already fixed in 2.6.19.
+
+Signed-off-by: Christophe Saout <christophe at saout.de>
+Signed-off-by: Chris Wright <chrisw at sous-sol.org>
+---
+ drivers/md/dm-crypt.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- linux-2.6.18.5.orig/drivers/md/dm-crypt.c
++++ linux-2.6.18.5/drivers/md/dm-crypt.c
+@@ -717,13 +717,15 @@ static int crypt_endio(struct bio *bio, 
+ 	if (bio->bi_size)
+ 		return 1;
+ 
++	if (!bio_flagged(bio, BIO_UPTODATE) && !error)
++		error = -EIO;
++
+ 	bio_put(bio);
+ 
+ 	/*
+ 	 * successful reads are decrypted by the worker thread
+ 	 */
+-	if ((bio_data_dir(bio) == READ)
+-	    && bio_flagged(bio, BIO_UPTODATE)) {
++	if (bio_data_dir(io->bio) == READ && !error) {
+ 		kcryptd_queue_io(io);
+ 		return 0;
+ 	}

Added: dists/sid/linux-2.6/debian/patches/series/9
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/series/9	Tue Dec 12 22:45:47 2006
@@ -0,0 +1 @@
++ bugfix/dm-crypt-fix-data-corruption-with-dm-crypt-over-raid5.patch