summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Saout <christophe@saout.de>2006-12-02 03:27:56 +0100
committerChris Wright <chrisw@sous-sol.org>2006-12-16 16:20:46 -0800
commit43e5eb5c8cd3194f747c0a82b9939bfc48f352c5 (patch)
treee52cc7005877efc1e4afd090d8f09c78e3f97fc1
parent8a4ab56748c87f71e6090e741150bd3f7b8995e1 (diff)
[PATCH] 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@saout.de> Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-rw-r--r--drivers/md/dm-crypt.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 6022ed12a795..31e498fd8778 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -717,13 +717,15 @@ static int crypt_endio(struct bio *bio, unsigned int done, int error)
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;
}