[PATCH] nvme: fix bio leak on mapping failure

[PATCH] nvme: fix bio leak on mapping failure

[Keith Busch]

From: Keith Busch <kbusch@kernel.org>

The local bio is always NULL, so we'd leak the bio if the integrity
mapping failed. Just get it directly from the request.

Fixes: d0d1d522316e91f ("blk-map: provide the bdev to bio if one exists")
Signed-off-by: Keith Busch <kbusch@kernel.org>
---
 drivers/nvme/host/ioctl.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c
index 39d6e69cbbe72..df2b7a66f6310 100644
--- a/drivers/nvme/host/ioctl.c
+++ b/drivers/nvme/host/ioctl.c
@@ -122,7 +122,6 @@ static int nvme_map_user_request(struct request *req, u64 ubuffer,
 	bool supports_metadata = bdev && blk_get_integrity(bdev->bd_disk);
 	struct nvme_ctrl *ctrl = nvme_req(req)->ctrl;
 	bool has_metadata = meta_buffer && meta_len;
-	struct bio *bio = NULL;
 	int ret;
 
 	if (has_metadata && !supports_metadata)
@@ -146,8 +145,8 @@ static int nvme_map_user_request(struct request *req, u64 ubuffer,
 	return ret;
 
 out_unmap:
-	if (bio)
-		blk_rq_unmap_user(bio);
+	if (req->bio)
+		blk_rq_unmap_user(req->bio);
 	return ret;
 }
 
-- 
2.52.0

Re: [PATCH] nvme: fix bio leak on mapping failure

[Christoph Hellwig]

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH] nvme: fix bio leak on mapping failure

[John Garry]

On 06/05/2026 14:19, Keith Busch wrote:
> From: Keith Busch<kbusch@kernel.org>
> 
> The local bio is always NULL, so we'd leak the bio if the integrity
> mapping failed. Just get it directly from the request.
> 
> Fixes: d0d1d522316e91f ("blk-map: provide the bdev to bio if one exists")
> Signed-off-by: Keith Busch<kbusch@kernel.org>
> ---

FWIW:

Reviewed-by: John Garry <john.g.garry@oracle.com>

Re: [PATCH] nvme: fix bio leak on mapping failure

[Sagi Grimberg]

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>