* md: raid10: fix use-after-free of bio
@ 2007-07-27 14:46 Maik Hampel
2007-07-29 6:55 ` Andrew Morton
0 siblings, 1 reply; 4+ messages in thread
From: Maik Hampel @ 2007-07-27 14:46 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org
In case of read errors raid10d tries to print a nice error message,
unfortunately using data from an already put bio.
Signed-off-by: Maik Hampel <m.hampel@gmx.de>
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index f730a14..ea1b3e3 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1557,7 +1557,6 @@ static void raid10d(mddev_t *mddev)
bio = r10_bio->devs[r10_bio->read_slot].bio;
r10_bio->devs[r10_bio->read_slot].bio =
mddev->ro ? IO_BLOCKED : NULL;
- bio_put(bio);
mirror = read_balance(conf, r10_bio);
if (mirror == -1) {
printk(KERN_ALERT "raid10: %s: unrecoverable I/O"
@@ -1567,6 +1566,7 @@ static void raid10d(mddev_t *mddev)
raid_end_bio_io(r10_bio);
} else {
const int do_sync = bio_sync(r10_bio->master_bio);
+ bio_put(bio);
rdev = conf->mirrors[mirror].rdev;
if (printk_ratelimit())
printk(KERN_ERR "raid10: %s: redirecting sector %llu to"
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: md: raid10: fix use-after-free of bio
2007-07-27 14:46 md: raid10: fix use-after-free of bio Maik Hampel
@ 2007-07-29 6:55 ` Andrew Morton
2007-07-30 8:11 ` Maik Hampel
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2007-07-29 6:55 UTC (permalink / raw)
To: Maik Hampel
Cc: Neil Brown, linux-kernel@vger.kernel.org,
linux-raid@vger.kernel.org
On Fri, 27 Jul 2007 16:46:23 +0200 Maik Hampel <m.hampel@gmx.de> wrote:
> In case of read errors raid10d tries to print a nice error message,
> unfortunately using data from an already put bio.
>
> Signed-off-by: Maik Hampel <m.hampel@gmx.de>
>
> diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
> index f730a14..ea1b3e3 100644
> --- a/drivers/md/raid10.c
> +++ b/drivers/md/raid10.c
> @@ -1557,7 +1557,6 @@ static void raid10d(mddev_t *mddev)
> bio = r10_bio->devs[r10_bio->read_slot].bio;
> r10_bio->devs[r10_bio->read_slot].bio =
> mddev->ro ? IO_BLOCKED : NULL;
> - bio_put(bio);
> mirror = read_balance(conf, r10_bio);
> if (mirror == -1) {
> printk(KERN_ALERT "raid10: %s: unrecoverable I/O"
> @@ -1567,6 +1566,7 @@ static void raid10d(mddev_t *mddev)
> raid_end_bio_io(r10_bio);
> } else {
> const int do_sync = bio_sync(r10_bio->master_bio);
> + bio_put(bio);
> rdev = conf->mirrors[mirror].rdev;
> if (printk_ratelimit())
> printk(KERN_ERR "raid10: %s: redirecting sector %llu to"
>
>
Surely we just leaked that bio if (mirror == -1)?
better:
--- a/drivers/md/raid10.c~md-raid10-fix-use-after-free-of-bio
+++ a/drivers/md/raid10.c
@@ -1534,7 +1534,6 @@ static void raid10d(mddev_t *mddev)
bio = r10_bio->devs[r10_bio->read_slot].bio;
r10_bio->devs[r10_bio->read_slot].bio =
mddev->ro ? IO_BLOCKED : NULL;
- bio_put(bio);
mirror = read_balance(conf, r10_bio);
if (mirror == -1) {
printk(KERN_ALERT "raid10: %s: unrecoverable I/O"
@@ -1542,8 +1541,10 @@ static void raid10d(mddev_t *mddev)
bdevname(bio->bi_bdev,b),
(unsigned long long)r10_bio->sector);
raid_end_bio_io(r10_bio);
+ bio_put(bio);
} else {
const int do_sync = bio_sync(r10_bio->master_bio);
+ bio_put(bio);
rdev = conf->mirrors[mirror].rdev;
if (printk_ratelimit())
printk(KERN_ERR "raid10: %s: redirecting sector %llu to"
_
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: md: raid10: fix use-after-free of bio
2007-07-29 6:55 ` Andrew Morton
@ 2007-07-30 8:11 ` Maik Hampel
2007-07-30 8:44 ` Neil Brown
0 siblings, 1 reply; 4+ messages in thread
From: Maik Hampel @ 2007-07-30 8:11 UTC (permalink / raw)
To: Andrew Morton
Cc: Neil Brown, linux-kernel@vger.kernel.org,
linux-raid@vger.kernel.org
Am Samstag, den 28.07.2007, 23:55 -0700 schrieb Andrew Morton:
> On Fri, 27 Jul 2007 16:46:23 +0200 Maik Hampel <m.hampel@gmx.de> wrote:
>
> > In case of read errors raid10d tries to print a nice error message,
> > unfortunately using data from an already put bio.
> >
> > Signed-off-by: Maik Hampel <m.hampel@gmx.de>
> >
> > diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
> > index f730a14..ea1b3e3 100644
> > --- a/drivers/md/raid10.c
> > +++ b/drivers/md/raid10.c
> > @@ -1557,7 +1557,6 @@ static void raid10d(mddev_t *mddev)
> > bio = r10_bio->devs[r10_bio->read_slot].bio;
> > r10_bio->devs[r10_bio->read_slot].bio =
> > mddev->ro ? IO_BLOCKED : NULL;
> > - bio_put(bio);
> > mirror = read_balance(conf, r10_bio);
> > if (mirror == -1) {
> > printk(KERN_ALERT "raid10: %s: unrecoverable I/O"
> > @@ -1567,6 +1566,7 @@ static void raid10d(mddev_t *mddev)
> > raid_end_bio_io(r10_bio);
> > } else {
> > const int do_sync = bio_sync(r10_bio->master_bio);
> > + bio_put(bio);
> > rdev = conf->mirrors[mirror].rdev;
> > if (printk_ratelimit())
> > printk(KERN_ERR "raid10: %s: redirecting sector %llu to"
> >
> >
>
> Surely we just leaked that bio if (mirror == -1)?
>
> better:
>
> --- a/drivers/md/raid10.c~md-raid10-fix-use-after-free-of-bio
> +++ a/drivers/md/raid10.c
> @@ -1534,7 +1534,6 @@ static void raid10d(mddev_t *mddev)
> bio = r10_bio->devs[r10_bio->read_slot].bio;
> r10_bio->devs[r10_bio->read_slot].bio =
> mddev->ro ? IO_BLOCKED : NULL;
> - bio_put(bio);
> mirror = read_balance(conf, r10_bio);
> if (mirror == -1) {
> printk(KERN_ALERT "raid10: %s: unrecoverable I/O"
> @@ -1542,8 +1541,10 @@ static void raid10d(mddev_t *mddev)
> bdevname(bio->bi_bdev,b),
> (unsigned long long)r10_bio->sector);
> raid_end_bio_io(r10_bio);
> + bio_put(bio);
raid_end_bio_io() calls put_all_bios(), which does a bio_put() to
corresponding r10_bio->devs[i]. So this looks like redundant code for
me.
> } else {
> const int do_sync = bio_sync(r10_bio->master_bio);
> + bio_put(bio);
> rdev = conf->mirrors[mirror].rdev;
> if (printk_ratelimit())
> printk(KERN_ERR "raid10: %s: redirecting sector %llu to"
Regards,
Maik Hampel
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: md: raid10: fix use-after-free of bio
2007-07-30 8:11 ` Maik Hampel
@ 2007-07-30 8:44 ` Neil Brown
0 siblings, 0 replies; 4+ messages in thread
From: Neil Brown @ 2007-07-30 8:44 UTC (permalink / raw)
To: Maik Hampel
Cc: Andrew Morton, linux-kernel@vger.kernel.org,
linux-raid@vger.kernel.org
On Monday July 30, m.hampel@gmx.de wrote:
> >
> > Surely we just leaked that bio if (mirror == -1)?
> >
> > better:
> >
> > --- a/drivers/md/raid10.c~md-raid10-fix-use-after-free-of-bio
> > +++ a/drivers/md/raid10.c
> > @@ -1534,7 +1534,6 @@ static void raid10d(mddev_t *mddev)
> > bio = r10_bio->devs[r10_bio->read_slot].bio;
> > r10_bio->devs[r10_bio->read_slot].bio =
> > mddev->ro ? IO_BLOCKED : NULL;
> > - bio_put(bio);
> > mirror = read_balance(conf, r10_bio);
> > if (mirror == -1) {
> > printk(KERN_ALERT "raid10: %s: unrecoverable I/O"
> > @@ -1542,8 +1541,10 @@ static void raid10d(mddev_t *mddev)
> > bdevname(bio->bi_bdev,b),
> > (unsigned long long)r10_bio->sector);
> > raid_end_bio_io(r10_bio);
> > + bio_put(bio);
> raid_end_bio_io() calls put_all_bios(), which does a bio_put() to
> corresponding r10_bio->devs[i]. So this looks like redundant code for
> me.
Yes, but note above that this bio for this slot has been set to
'NULL', so put_all_bios won't find anything to call bio_put on.
Thanks,
NeilBrown
> > } else {
> > const int do_sync = bio_sync(r10_bio->master_bio);
> > + bio_put(bio);
> > rdev = conf->mirrors[mirror].rdev;
> > if (printk_ratelimit())
> > printk(KERN_ERR "raid10: %s: redirecting sector %llu to"
>
> Regards,
> Maik Hampel
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-07-30 8:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-27 14:46 md: raid10: fix use-after-free of bio Maik Hampel
2007-07-29 6:55 ` Andrew Morton
2007-07-30 8:11 ` Maik Hampel
2007-07-30 8:44 ` Neil Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).