Skip to content

nvme: sanitize call to strerror() #3078

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

Merged
igaw merged 2 commits into from
Feb 10, 2026
Merged

nvme: sanitize call to strerror() #3078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2aae5ce
tree: fix mem leak in list-subsys verbose option
martin-gpy Jan 26, 2026
6039466
nvme: sanitize call to strerror()
martin-gpy Jan 26, 2026
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
10 changes: 5 additions & 5 deletions libnvme/src/nvme/tree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ int nvme_scan_topology(struct nvme_global_ctx *ctx, nvme_scan_filter_t f, void *
ctrls.num = nvme_scan_ctrls(&ctrls.ents);
if (ctrls.num < 0) {
nvme_msg(ctx, LOG_DEBUG, "failed to scan ctrls: %s\n",
strerror(ctrls.num));
strerror(-ctrls.num));
return ctrls.num;
}

Expand All @@ -307,7 +307,7 @@ int nvme_scan_topology(struct nvme_global_ctx *ctx, nvme_scan_filter_t f, void *
subsys.num = nvme_scan_subsystems(&subsys.ents);
if (subsys.num < 0) {
nvme_msg(ctx, LOG_DEBUG, "failed to scan subsystems: %s\n",
strerror(subsys.num));
strerror(-subsys.num));
return subsys.num;
}

Expand All @@ -316,7 +316,7 @@ int nvme_scan_topology(struct nvme_global_ctx *ctx, nvme_scan_filter_t f, void *
if (ret < 0) {
nvme_msg(ctx, LOG_DEBUG,
"failed to scan subsystem %s: %s\n",
subsys.ents[i]->d_name, strerror(ret));
subsys.ents[i]->d_name, strerror(-ret));
}
}

Expand Down Expand Up @@ -840,7 +840,7 @@ static int nvme_subsystem_scan_namespaces(struct nvme_global_ctx *ctx, nvme_subs
if (namespaces.num < 0) {
nvme_msg(ctx, LOG_DEBUG,
"failed to scan namespaces for subsys %s: %s\n",
s->subsysnqn, strerror(namespaces.num));
s->subsysnqn, strerror(-namespaces.num));
return namespaces.num;
}

Expand All @@ -850,7 +850,7 @@ static int nvme_subsystem_scan_namespaces(struct nvme_global_ctx *ctx, nvme_subs
if (ret < 0)
nvme_msg(ctx, LOG_DEBUG,
"failed to scan namespace %s: %s\n",
namespaces.ents[i]->d_name, strerror(ret));
namespaces.ents[i]->d_name, strerror(-ret));
}

return 0;
Expand Down
52 changes: 26 additions & 26 deletions nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,7 +1711,7 @@

err = nvme_identify_ctrl(hdl, ctrl);
if (err < 0) {
nvme_show_error("identify controller: %s", nvme_strerror(err));
nvme_show_error("identify controller: %s", nvme_strerror(-err));
return err;
} else if (err) {
nvme_show_error("could not identify controller");
Expand Down Expand Up @@ -2907,7 +2907,7 @@
static void ns_mgmt_show_status(struct nvme_transport_handle *hdl, int err, char *cmd, __u32 nsid)
{
if (err < 0) {
nvme_show_error("%s: %s", cmd, nvme_strerror(err));
nvme_show_error("%s: %s", cmd, nvme_strerror(-err));
return;
}

Expand Down Expand Up @@ -2965,7 +2965,7 @@
if (!cfg.namespace_id) {
err = nvme_get_nsid(hdl, &cfg.namespace_id);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));

Check failure on line 2968 in nvme.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 85 exceeds 80 columns
return err;
}
}
Expand Down Expand Up @@ -3536,7 +3536,7 @@
}
err = nvme_scan_topology(ctx, NULL, NULL);
if (err < 0) {
nvme_show_error("Failed to scan topology: %s", nvme_strerror(err));
nvme_show_error("Failed to scan topology: %s", nvme_strerror(-err));

Check failure on line 3539 in nvme.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 84 exceeds 80 columns
return err;
}

Expand Down Expand Up @@ -3851,7 +3851,7 @@
if (!cfg.namespace_id) {
err = nvme_get_nsid(hdl, &cfg.namespace_id);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));

Check failure on line 3854 in nvme.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 85 exceeds 80 columns
return err;
}
}
Expand Down Expand Up @@ -3932,7 +3932,7 @@
if (!cfg.namespace_id) {
err = nvme_get_nsid(hdl, &cfg.namespace_id);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));

Check failure on line 3935 in nvme.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 85 exceeds 80 columns
return err;
}
}
Expand Down Expand Up @@ -4314,7 +4314,7 @@

err = nvme_get_nsid(hdl, &nsid);
if (err < 0) {
nvme_show_error("get namespace ID: %s", nvme_strerror(err));
nvme_show_error("get namespace ID: %s", nvme_strerror(-err));
return -errno;
}

Expand Down Expand Up @@ -4940,7 +4940,7 @@
err = nvme_get_nsid(hdl, &cfg.namespace_id);
if (err < 0) {
if (errno != ENOTTY) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));

Check failure on line 4943 in nvme.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 93 exceeds 80 columns
return err;
}
cfg.namespace_id = NVME_NSID_ALL;
Expand Down Expand Up @@ -5354,7 +5354,7 @@
if (errno == ENOTTY)
nvme_show_error("Subsystem-reset: NVM Subsystem Reset not supported.");
else
nvme_show_error("Subsystem-reset: %s", nvme_strerror(err));
nvme_show_error("Subsystem-reset: %s", nvme_strerror(-err));

Check failure on line 5357 in nvme.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 84 exceeds 80 columns
} else if (argconfig_parse_seen(opts, "verbose"))
printf("resetting subsystem through %s\n", nvme_transport_handle_get_name(hdl));

Expand All @@ -5377,7 +5377,7 @@

err = nvme_ctrl_reset(hdl);
if (err < 0)
nvme_show_error("Reset: %s", nvme_strerror(err));
nvme_show_error("Reset: %s", nvme_strerror(-err));
else if (argconfig_parse_seen(opts, "verbose"))
printf("resetting controller %s\n", nvme_transport_handle_get_name(hdl));

Expand Down Expand Up @@ -5407,7 +5407,7 @@

err = nvme_ns_rescan(hdl);
if (err < 0)
nvme_show_error("Namespace Rescan: %s\n", nvme_strerror(err));
nvme_show_error("Namespace Rescan: %s\n", nvme_strerror(-err));
else if (argconfig_parse_seen(opts, "verbose"))
printf("rescanning namespaces through %s\n", nvme_transport_handle_get_name(hdl));

Expand Down Expand Up @@ -6572,7 +6572,7 @@
} else if (!cfg.namespace_id) {
err = nvme_get_nsid(hdl, &cfg.namespace_id);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));

Check failure on line 6575 in nvme.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 85 exceeds 80 columns
return -errno;
}
}
Expand Down Expand Up @@ -6780,7 +6780,7 @@
err = nvme_get_nsid(hdl, &cfg.nsid);
if (err < 0) {
if (errno != ENOTTY) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));

Check failure on line 6783 in nvme.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 93 exceeds 80 columns
return -errno;
}
cfg.nsid = NVME_NSID_ALL;
Expand Down Expand Up @@ -7142,7 +7142,7 @@
if (!cfg.namespace_id) {
err = nvme_get_nsid(hdl, &cfg.namespace_id);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));

Check failure on line 7145 in nvme.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 85 exceeds 80 columns
return err;
}
}
Expand Down Expand Up @@ -7415,7 +7415,7 @@
if (!cfg.nsid) {
err = nvme_get_nsid(hdl, &cfg.nsid);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));
return err;
}
}
Expand Down Expand Up @@ -7535,7 +7535,7 @@
if (!cfg.namespace_id) {
err = nvme_get_nsid(hdl, &cfg.namespace_id);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));
return err;
}
}
Expand Down Expand Up @@ -7735,7 +7735,7 @@
if (!cfg.nsid) {
err = nvme_get_nsid(hdl, &cfg.nsid);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));
return err;
}
}
Expand Down Expand Up @@ -7815,7 +7815,7 @@
if (!cfg.namespace_id) {
err = nvme_get_nsid(hdl, &cfg.namespace_id);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));
return err;
}
}
Expand Down Expand Up @@ -7887,7 +7887,7 @@
if (!cfg.namespace_id) {
err = nvme_get_nsid(hdl, &cfg.namespace_id);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));
return err;
}
}
Expand Down Expand Up @@ -7963,7 +7963,7 @@
if (!cfg.namespace_id) {
err = nvme_get_nsid(hdl, &cfg.namespace_id);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));
return err;
}
}
Expand Down Expand Up @@ -8046,7 +8046,7 @@
if (!cfg.nsid) {
err = nvme_get_nsid(hdl, &cfg.nsid);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));
return err;
}
}
Expand Down Expand Up @@ -8121,7 +8121,7 @@
if (!cfg.nsid) {
err = nvme_get_nsid(hdl, &cfg.nsid);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));
return err;
}
}
Expand Down Expand Up @@ -8308,7 +8308,7 @@
if (!cfg.nsid) {
err = nvme_get_nsid(hdl, &cfg.nsid);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));
return err;
}
}
Expand Down Expand Up @@ -8605,7 +8605,7 @@
if (!cfg.nsid) {
err = nvme_get_nsid(hdl, &cfg.nsid);
if (err < 0) {
nvme_show_error("get-namespace-id: %s", nvme_strerror(err));
nvme_show_error("get-namespace-id: %s", nvme_strerror(-err));
return err;
}
}
Expand Down Expand Up @@ -10126,7 +10126,7 @@
err = nvme_scan_tls_keys(ctx, cfg.keyring, __scan_tls_key, fd);
if (err < 0) {
nvme_show_error("Export of TLS keys failed with '%s'",
nvme_strerror(err));
nvme_strerror(-err));
return err;
}

Expand Down Expand Up @@ -10233,7 +10233,7 @@

err = nvme_scan_topology(ctx, filter, (void *)devname);
if (err < 0) {
nvme_show_error("Failed to scan topology: %s", nvme_strerror(err));
nvme_show_error("Failed to scan topology: %s", nvme_strerror(-err));
return err;
}

Expand Down
Loading