]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bsg: free the request before return error code
authorPan Bian <bianpan2016@163.com>
Tue, 19 Jan 2021 12:33:11 +0000 (04:33 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 09:26:22 +0000 (10:26 +0100)
[ 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>
block/bsg.c

index 833c44b3d458ea642f95f45f730fd7bb3f27f565..0d012efef5274de6a25ab9ba8f800bd2dad37756 100644 (file)
@@ -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)