diff options
| author | Adam Kwolek <adam.kwolek@intel.com> | 2011-12-09 14:26:11 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-12-09 14:26:11 +1100 |
| commit | 5d8c71f9e5fbdd95650be00294d238e27a363b5c (patch) | |
| tree | 51f7ae70b3a188f8376d7912493d346537fe516e /drivers | |
| parent | 9283d8c5af4cdcb809e655acdf4be368afec8b58 (diff) | |
| download | linux-stable-5d8c71f9e5fbdd95650be00294d238e27a363b5c.tar.gz linux-stable-5d8c71f9e5fbdd95650be00294d238e27a363b5c.tar.bz2 linux-stable-5d8c71f9e5fbdd95650be00294d238e27a363b5c.zip | |
md: raid5 crash during degradation
NULL pointer access causes crash in raid5 module.
Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index b0dec01028f4..31670f8d6b65 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -3070,7 +3070,7 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s) if (sh->sector + STRIPE_SECTORS <= rdev->recovery_offset) set_bit(R5_Insync, &dev->flags); } - if (test_bit(R5_WriteError, &dev->flags)) { + if (rdev && test_bit(R5_WriteError, &dev->flags)) { clear_bit(R5_Insync, &dev->flags); if (!test_bit(Faulty, &rdev->flags)) { s->handle_bad_blocks = 1; @@ -3078,7 +3078,7 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s) } else clear_bit(R5_WriteError, &dev->flags); } - if (test_bit(R5_MadeGood, &dev->flags)) { + if (rdev && test_bit(R5_MadeGood, &dev->flags)) { if (!test_bit(Faulty, &rdev->flags)) { s->handle_bad_blocks = 1; atomic_inc(&rdev->nr_pending); |