Skip to content

[nvme] fix: memory leak per inactive namespace in nvme_scan_device() #11920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
usualtreee wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −7
Open

[nvme] fix: memory leak per inactive namespace in nvme_scan_device() #11920

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions components/drivers/nvme/nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,13 +1072,7 @@ static rt_err_t nvme_scan_device(struct rt_nvme_controller *nvme,
/* NVME Namespace is start with "1" */
for (rt_uint32_t nsid = 1; nsid <= number_of_ns; ++nsid)
{
struct rt_nvme_device *ndev = rt_calloc(1, sizeof(*ndev));

if (!ndev)
{
err = -RT_ENOMEM;
goto _free_res;
}
struct rt_nvme_device *ndev;

rt_memset(id, 0, sizeof(*id));
if ((err = nvme_identify(nvme, nsid, 0, id)))
Expand All @@ -1091,6 +1085,13 @@ static rt_err_t nvme_scan_device(struct rt_nvme_controller *nvme,
continue;
}

ndev = rt_calloc(1, sizeof(*ndev));
if (!ndev)
{
err = -RT_ENOMEM;
goto _free_res;
}

ndev->ctrl = nvme;

rt_memcpy(&ndev->id, id, sizeof(ndev->id));
Expand All @@ -1108,6 +1109,7 @@ static rt_err_t nvme_scan_device(struct rt_nvme_controller *nvme,

if ((err = rt_hw_blk_disk_register(&ndev->parent)))
{
rt_free(ndev);
goto _free_res;
}

Expand Down
Loading