Commit 5b8562f0 authored by Eric Biggers's avatar Eric Biggers Committed by Jens Axboe
Browse files

blk-mq: return actual keyslot error in blk_insert_cloned_request() 



To avoid hiding information, pass on the error code from
blk_crypto_rq_get_keyslot() instead of always using BLK_STS_IOERR.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230315183907.53675-2-ebiggers@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 435c0e99

block/blk-mq.c

+3 −2
Original line number Diff line number Diff line
@@ -3049,8 +3049,9 @@ blk_status_t blk_insert_cloned_request(struct request *rq) 
	if (q->disk && should_fail_request(q->disk->part0, blk_rq_bytes(rq)))

		return BLK_STS_IOERR;



	if (blk_crypto_rq_get_keyslot(rq))

		return BLK_STS_IOERR;

	ret = blk_crypto_rq_get_keyslot(rq);

	if (ret != BLK_STS_OK)

		return ret;



	blk_account_io_start(rq);