diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-12-21 08:05:38 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-12-26 09:27:14 -0700 |
| commit | 1c042f8d4bc342b7985b1de3d76836f1a1083b65 (patch) | |
| tree | 7f6457a48af3a16093d9752f18d0fd4ded6d4c14 /block | |
| parent | 8aabc11c8f4e0a57661a07f985ddc8a626ef9148 (diff) | |
| download | linux-stable-1c042f8d4bc342b7985b1de3d76836f1a1083b65.tar.gz linux-stable-1c042f8d4bc342b7985b1de3d76836f1a1083b65.tar.bz2 linux-stable-1c042f8d4bc342b7985b1de3d76836f1a1083b65.zip | |
block: reject invalid operation in submit_bio_noacct
submit_bio_noacct allows completely invalid operations, or operations
that are not supported in the bio path. Extent the existing switch
statement to rejcect all invalid types.
Move the code point for REQ_OP_ZONE_APPEND so that it's not right in the
middle of the zone management operations and the switch statement can
follow the numerical order of the operations.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20231221070538.1112446-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index fdf25b8d6e78..9520ccab3050 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -764,6 +764,15 @@ void submit_bio_noacct(struct bio *bio) bio_clear_polled(bio); switch (bio_op(bio)) { + case REQ_OP_READ: + case REQ_OP_WRITE: + break; + case REQ_OP_FLUSH: + /* + * REQ_OP_FLUSH can't be submitted through bios, it is only + * synthetized in struct request by the flush state machine. + */ + goto not_supported; case REQ_OP_DISCARD: if (!bdev_max_discard_sectors(bdev)) goto not_supported; @@ -777,6 +786,10 @@ void submit_bio_noacct(struct bio *bio) if (status != BLK_STS_OK) goto end_io; break; + case REQ_OP_WRITE_ZEROES: + if (!q->limits.max_write_zeroes_sectors) + goto not_supported; + break; case REQ_OP_ZONE_RESET: case REQ_OP_ZONE_OPEN: case REQ_OP_ZONE_CLOSE: @@ -788,12 +801,15 @@ void submit_bio_noacct(struct bio *bio) if (!bdev_is_zoned(bio->bi_bdev) || !blk_queue_zone_resetall(q)) goto not_supported; break; - case REQ_OP_WRITE_ZEROES: - if (!q->limits.max_write_zeroes_sectors) - goto not_supported; - break; + case REQ_OP_DRV_IN: + case REQ_OP_DRV_OUT: + /* + * Driver private operations are only used with passthrough + * requests. + */ + fallthrough; default: - break; + goto not_supported; } if (blk_throtl_bio(bio)) |