Skip to content

Commit 0a42ca4

Browse files
error27axboe
authored andcommitted
scsi: bsg: fix buffer overflow in scsi_bsg_uring_cmd()
The bounds checking in scsi_bsg_uring_cmd() does not work because cmd->request_len is a u32 and scmd->cmd_len is a u16. We check that scmd->cmd_len is valid but if the cmd->request_len is more than USHRT_MAX it would still lead to a buffer overflow when we do the copy_from_user(). Fixes: 7b6d325 ("scsi: bsg: add io_uring passthrough handler") Signed-off-by: Dan Carpenter <error27@gmail.com> Link: https://patch.msgid.link/adjNnMYK7A7KMNkA@stanley.mountain Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 539fb77 commit 0a42ca4

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/scsi/scsi_bsg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ static int scsi_bsg_uring_cmd(struct request_queue *q, struct io_uring_cmd *iouc
137137
return PTR_ERR(req);
138138

139139
scmd = blk_mq_rq_to_pdu(req);
140-
scmd->cmd_len = cmd->request_len;
141-
if (scmd->cmd_len > sizeof(scmd->cmnd)) {
140+
if (cmd->request_len > sizeof(scmd->cmnd)) {
142141
ret = -EINVAL;
143142
goto out_free_req;
144143
}
144+
scmd->cmd_len = cmd->request_len;
145145
scmd->allowed = SG_DEFAULT_RETRIES;
146146

147147
if (copy_from_user(scmd->cmnd, uptr64(cmd->request), cmd->request_len)) {

0 commit comments

Comments
 (0)