diff options
author | Christophe Saout <christophe@saout.de> | 2006-12-15 01:21:59 +0100 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2006-12-15 01:21:59 +0100 |
commit | a26b7719f9bde7e74385bfa6ca3ea89d365efd77 (patch) | |
tree | eb8afe6bf18c9c3307319b0fb0763399d6d9c976 /drivers/md | |
parent | bbb978312500b3534a1515ca168597754647d96e (diff) |
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: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/dm-crypt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index e7a650f9ca0..aa9b7728d30 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -730,13 +730,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; } |