Skip to content

Commit 2e6edc9

Browse files
committed
block: protect rw_page against device teardown
Fix use after free crashes like the following: general protection fault: 0000 [#1] SMP Call Trace: [<ffffffffa0050216>] ? pmem_do_bvec.isra.12+0xa6/0xf0 [nd_pmem] [<ffffffffa0050ba2>] pmem_rw_page+0x42/0x80 [nd_pmem] [<ffffffff8128fd90>] bdev_read_page+0x50/0x60 [<ffffffff812972f0>] do_mpage_readpage+0x510/0x770 [<ffffffff8128fd20>] ? I_BDEV+0x20/0x20 [<ffffffff811d86dc>] ? lru_cache_add+0x1c/0x50 [<ffffffff81297657>] mpage_readpages+0x107/0x170 [<ffffffff8128fd20>] ? I_BDEV+0x20/0x20 [<ffffffff8128fd20>] ? I_BDEV+0x20/0x20 [<ffffffff8129058d>] blkdev_readpages+0x1d/0x20 [<ffffffff811d615f>] __do_page_cache_readahead+0x28f/0x310 [<ffffffff811d6039>] ? __do_page_cache_readahead+0x169/0x310 [<ffffffff811c5abd>] ? pagecache_get_page+0x2d/0x1d0 [<ffffffff811c76f6>] filemap_fault+0x396/0x530 [<ffffffff811f816e>] __do_fault+0x4e/0xf0 [<ffffffff811fce7d>] handle_mm_fault+0x11bd/0x1b50 Cc: <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Alexander Viro <[email protected]> Reported-by: kbuild test robot <[email protected]> Acked-by: Matthew Wilcox <[email protected]> [willy: symmetry fixups] Signed-off-by: Dan Williams <[email protected]>
1 parent 0df9d41 commit 2e6edc9

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

block/blk.h

-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ void blk_dequeue_request(struct request *rq);
7272
void __blk_queue_free_tags(struct request_queue *q);
7373
bool __blk_end_bidi_request(struct request *rq, int error,
7474
unsigned int nr_bytes, unsigned int bidi_bytes);
75-
int blk_queue_enter(struct request_queue *q, gfp_t gfp);
76-
void blk_queue_exit(struct request_queue *q);
7775
void blk_freeze_queue(struct request_queue *q);
7876

7977
static inline void blk_queue_enter_live(struct request_queue *q)

fs/block_dev.c

+16-2
Original file line numberDiff line numberDiff line change
@@ -390,9 +390,17 @@ int bdev_read_page(struct block_device *bdev, sector_t sector,
390390
struct page *page)
391391
{
392392
const struct block_device_operations *ops = bdev->bd_disk->fops;
393+
int result = -EOPNOTSUPP;
394+
393395
if (!ops->rw_page || bdev_get_integrity(bdev))
394-
return -EOPNOTSUPP;
395-
return ops->rw_page(bdev, sector + get_start_sect(bdev), page, READ);
396+
return result;
397+
398+
result = blk_queue_enter(bdev->bd_queue, GFP_KERNEL);
399+
if (result)
400+
return result;
401+
result = ops->rw_page(bdev, sector + get_start_sect(bdev), page, READ);
402+
blk_queue_exit(bdev->bd_queue);
403+
return result;
396404
}
397405
EXPORT_SYMBOL_GPL(bdev_read_page);
398406

@@ -421,14 +429,20 @@ int bdev_write_page(struct block_device *bdev, sector_t sector,
421429
int result;
422430
int rw = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC : WRITE;
423431
const struct block_device_operations *ops = bdev->bd_disk->fops;
432+
424433
if (!ops->rw_page || bdev_get_integrity(bdev))
425434
return -EOPNOTSUPP;
435+
result = blk_queue_enter(bdev->bd_queue, GFP_KERNEL);
436+
if (result)
437+
return result;
438+
426439
set_page_writeback(page);
427440
result = ops->rw_page(bdev, sector + get_start_sect(bdev), page, rw);
428441
if (result)
429442
end_page_writeback(page);
430443
else
431444
unlock_page(page);
445+
blk_queue_exit(bdev->bd_queue);
432446
return result;
433447
}
434448
EXPORT_SYMBOL_GPL(bdev_write_page);

include/linux/blkdev.h

+2
Original file line numberDiff line numberDiff line change
@@ -794,6 +794,8 @@ extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t,
794794
extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t,
795795
struct scsi_ioctl_command __user *);
796796

797+
extern int blk_queue_enter(struct request_queue *q, gfp_t gfp);
798+
extern void blk_queue_exit(struct request_queue *q);
797799
extern void blk_start_queue(struct request_queue *q);
798800
extern void blk_stop_queue(struct request_queue *q);
799801
extern void blk_sync_queue(struct request_queue *q);

0 commit comments

Comments
 (0)