summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorPan Bian <bianpan2016@163.com>2021-01-19 15:33:11 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-04 13:37:42 +0300
commit1c7b7d476e6aedd2a72ee08e3e59a14cf120946f (patch)
tree11ed67688188e1e5c8c850e4e6043daa0b784474 /block
parenta9d9fd5bd24bc1409cb05e9ab79510edc49bb5ad (diff)
downloadlinux-1c7b7d476e6aedd2a72ee08e3e59a14cf120946f.tar.xz
bsg: free the request before return error code
[ Upstream commit 0f7b4bc6bb1e57c48ef14f1818df947c1612b206 ] Free the request rq before returning error code. Fixes: 972248e9111e ("scsi: bsg-lib: handle bidi requests without block layer help") Signed-off-by: Pan Bian <bianpan2016@163.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'block')
-rw-r--r--block/bsg.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/block/bsg.c b/block/bsg.c
index d7bae94b64d9..3d78e843a83f 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -157,8 +157,10 @@ static int bsg_sg_io(struct request_queue *q, fmode_t mode, void __user *uarg)
return PTR_ERR(rq);
ret = q->bsg_dev.ops->fill_hdr(rq, &hdr, mode);
- if (ret)
+ if (ret) {
+ blk_put_request(rq);
return ret;
+ }
rq->timeout = msecs_to_jiffies(hdr.timeout);
if (!rq->timeout)