diff options
author | Jun'ichi Nomura <j-nomura@ce.jp.nec.com> | 2012-03-02 10:38:33 +0100 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-03-02 10:38:33 +0100 |
commit | fe316bf2d5847bc5dd975668671a7b1067603bc7 (patch) | |
tree | 617f6a89b96a8c074d0a2fc1ef4ffc259fb4ed2f /include/linux/genhd.h | |
parent | 621032ad6eaabf2fe771c4fa0d8f58e1fcfcdba6 (diff) | |
download | linux-stable-fe316bf2d5847bc5dd975668671a7b1067603bc7.tar.gz linux-stable-fe316bf2d5847bc5dd975668671a7b1067603bc7.tar.bz2 linux-stable-fe316bf2d5847bc5dd975668671a7b1067603bc7.zip |
block: Fix NULL pointer dereference in sd_revalidate_disk
Since 2.6.39 (1196f8b), when a driver returns -ENOMEDIUM for open(),
__blkdev_get() calls rescan_partitions() to remove
in-kernel partition structures and raise KOBJ_CHANGE uevent.
However it ends up calling driver's revalidate_disk without open
and could cause oops.
In the case of SCSI:
process A process B
----------------------------------------------
sys_open
__blkdev_get
sd_open
returns -ENOMEDIUM
scsi_remove_device
<scsi_device torn down>
rescan_partitions
sd_revalidate_disk
<oops>
Oopses are reported here:
http://marc.info/?l=linux-scsi&m=132388619710052
This patch separates the partition invalidation from rescan_partitions()
and use it for -ENOMEDIUM case.
Reported-by: Huajun Li <huajun.li.lee@gmail.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Acked-by: Tejun Heo <tj@kernel.org>
Cc: stable@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/genhd.h')
-rw-r--r-- | include/linux/genhd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index fe23ee768589..e61d3192448e 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -596,6 +596,7 @@ extern char *disk_name (struct gendisk *hd, int partno, char *buf); extern int disk_expand_part_tbl(struct gendisk *disk, int target); extern int rescan_partitions(struct gendisk *disk, struct block_device *bdev); +extern int invalidate_partitions(struct gendisk *disk, struct block_device *bdev); extern struct hd_struct * __must_check add_partition(struct gendisk *disk, int partno, sector_t start, sector_t len, int flags, |