summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-10-11 13:50:12 +1100
committerNeilBrown <neilb@suse.de>2012-10-11 13:50:12 +1100
commitb97390aec4756373168ad2976e1f117b610513ea (patch)
treebf800dcf15dd08774d2da161d6317294727d8e2c
parent143c4d0573caebe0ae017097614349697e2280eb (diff)
downloadlinux-3.10-b97390aec4756373168ad2976e1f117b610513ea.tar.gz
linux-3.10-b97390aec4756373168ad2976e1f117b610513ea.tar.bz2
linux-3.10-b97390aec4756373168ad2976e1f117b610513ea.zip
md/raid5: protect debug message against NULL derefernce.
The pr_debug in add_stripe_bio could race with something changing *bip, so it is best to hold the lock until after the pr_debug. Reported-by: "Jianpeng Ma" <majianpeng@gmail.com> Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--drivers/md/raid5.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 36c0a158730..d11012604e2 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -2436,11 +2436,11 @@ static int add_stripe_bio(struct stripe_head *sh, struct bio *bi, int dd_idx, in
if (sector >= sh->dev[dd_idx].sector + STRIPE_SECTORS)
set_bit(R5_OVERWRITE, &sh->dev[dd_idx].flags);
}
- spin_unlock_irq(&sh->stripe_lock);
pr_debug("added bi b#%llu to stripe s#%llu, disk %d.\n",
(unsigned long long)(*bip)->bi_sector,
(unsigned long long)sh->sector, dd_idx);
+ spin_unlock_irq(&sh->stripe_lock);
if (conf->mddev->bitmap && firstwrite) {
bitmap_startwrite(conf->mddev->bitmap, sh->sector,