[PATCH] Fix a potential NULL dereference in md/raid1

[PATCH] Fix a potential NULL dereference in md/raid1

[NeilBrown]

patch for 2.6.17 stable series.
Thanks,
NeilBrown
### Comments for Changeset

At the point where this 'atomic_add' is, rdev could be NULL,
as seen by the fact that we test for this in the very next 
statement.
Further is it is really the wrong place of the add.
We could add to the count of corrected errors 
once the are sure it was corrected, not before
trying to correct it.

Signed-off-by: Neil Brown <neilb@suse.de>

### Diffstat output
 ./drivers/md/raid1.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff .prev/drivers/md/raid1.c ./drivers/md/raid1.c
--- .prev/drivers/md/raid1.c	2006-08-21 09:59:05.000000000 +1000
+++ ./drivers/md/raid1.c	2006-08-21 09:59:05.000000000 +1000
@@ -1486,7 +1486,6 @@ static void raid1d(mddev_t *mddev)
 							d = conf->raid_disks;
 						d--;
 						rdev = conf->mirrors[d].rdev;
-						atomic_add(s, &rdev->corrected_errors);
 						if (rdev &&
 						    test_bit(In_sync, &rdev->flags)) {
 							if (sync_page_io(rdev->bdev,
@@ -1509,6 +1508,9 @@ static void raid1d(mddev_t *mddev)
 									 s<<9, conf->tmppage, READ) == 0)
 								/* Well, this device is dead */
 								md_error(mddev, rdev);
+							else
+								atomic_add(s, &rdev->corrected_errors);
+
 						}
 					}
 				} else {

Re: [stable] [PATCH] Fix a potential NULL dereference in md/raid1

[Greg KH]

On Mon, Aug 21, 2006 at 10:05:26AM +1000, NeilBrown wrote:
> patch for 2.6.17 stable series.
> Thanks,
> NeilBrown
> ### Comments for Changeset
> 
> At the point where this 'atomic_add' is, rdev could be NULL,
> as seen by the fact that we test for this in the very next 
> statement.
> Further is it is really the wrong place of the add.
> We could add to the count of corrected errors 
> once the are sure it was corrected, not before
> trying to correct it.
> 
> Signed-off-by: Neil Brown <neilb@suse.de>

Queued for -stable, thanks.

greg k-h