Thread (3 messages) 3 messages, 3 authors, 2021-02-24

Re: [PATCH] nvme/hwmon: Return error code when registration fails

From: Hannes Reinecke <hare@suse.de>
Date: 2021-02-12 13:09:56
Also in: lkml

On 2/12/21 10:30 AM, Daniel Wagner wrote:
quoted hunk ↗ jump to hunk
The hwmon pointer wont be NULL if the registration fails. Though the
exit code path will assign it to ctrl->hwmon_device. Later
nvme_hwmon_exit() will try to free the invalid pointer. Avoid this by
returning the error code from hwmon_device_register_with_info().

Fixes: ec420cdcfab4 ("nvme/hwmon: rework to avoid devm allocation")
Cc: Hannes Reinecke <hare@suse.de>
Signed-off-by: Daniel Wagner <redacted>
---

This patch is against linux-block/for-next.

  drivers/nvme/host/hwmon.c | 1 +
  1 file changed, 1 insertion(+)
diff --git a/drivers/nvme/host/hwmon.c b/drivers/nvme/host/hwmon.c
index 8f9e96986780..0a586d712920 100644
--- a/drivers/nvme/host/hwmon.c
+++ b/drivers/nvme/host/hwmon.c
@@ -248,6 +248,7 @@ int nvme_hwmon_init(struct nvme_ctrl *ctrl)
  	if (IS_ERR(hwmon)) {
  		dev_warn(dev, "Failed to instantiate hwmon device\n");
  		kfree(data);
+		return PTR_ERR(hwmon);
  	}
  	ctrl->hwmon_device = hwmon;
  	return 0;
Reviewed-by: Hannes Reinecke <hare@suse.de>

Cheers,

Hannes
-- 
Dr. Hannes Reinecke                Kernel Storage Architect
hare@suse.de                              +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer

_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help