tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: host: fix double-free of struct nvme_id_ns in ns_update_nuse()

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2060097

[ Upstream commit 8d0d2447394b13fb22a069f0330f9c49b7fff9d3 ]

When nvme_identify_ns() fails, it frees the pointer to the struct
nvme_id_ns before it returns. However, ns_update_nuse() calls kfree()
for the pointer even when nvme_identify_ns() fails. This results in
KASAN double-free, which was observed with blktests nvme/045 with
proposed patches [1] on the kernel v6.8-rc7. Fix the double-free by
skipping kfree() when nvme_identify_ns() fails.

Link: https://lore.kernel.org/linux-block/20240304161303.19681-1-dwagner@suse.de/ [1]
Fixes: a1a825ab6a ("nvme: add csi, ms and nuse to sysfs")
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 534f9dc7fe495b3f9cc84363898ac50c5a25fccb)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
This commit is contained in:
Shin'ichiro Kawasaki
2024-03-06 15:03:03 +09:00
committed by Roxana Nicolescu
parent 9732bc115f
commit edf210cb8a
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/nvme/host/sysfs.c
+2 -5
View File
@@ -221,14 +221,11 @@ static int ns_update_nuse(struct nvme_ns *ns)
ret = nvme_identify_ns(ns->ctrl, ns->head->ns_id, &id);
if (ret)
goto out_free_id;
return ret;
ns->head->nuse = le64_to_cpu(id->nuse);
out_free_id:
kfree(id);
return ret;
return 0;
}
static ssize_t nuse_show(struct device *dev, struct device_attribute *attr,