From: Dan Carpenter Date: Fri, 9 Apr 2021 11:08:17 +0000 (+0300) Subject: HSI: core: fix resource leaks in hsi_add_client_from_dt() X-Git-Tag: v5.10.79~4818 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d5149a487f2dcb2a048db7a1f68cbc1adf1ba45e;p=platform%2Fkernel%2Flinux-rpi.git HSI: core: fix resource leaks in hsi_add_client_from_dt() [ Upstream commit 5c08b0f75575648032f309a6f58294453423ed93 ] If some of the allocations fail between the dev_set_name() and the device_register() then the name will not be freed. Fix this by moving dev_set_name() directly in front of the call to device_register(). Fixes: a2aa24734d9d ("HSI: Add common DT binding for HSI client devices") Signed-off-by: Dan Carpenter Reviewed-by: Jason Gunthorpe Signed-off-by: Sebastian Reichel Signed-off-by: Sasha Levin --- diff --git a/drivers/hsi/hsi_core.c b/drivers/hsi/hsi_core.c index 47f0208..a5f92e2 100644 --- a/drivers/hsi/hsi_core.c +++ b/drivers/hsi/hsi_core.c @@ -210,8 +210,6 @@ static void hsi_add_client_from_dt(struct hsi_port *port, if (err) goto err; - dev_set_name(&cl->device, "%s", name); - err = hsi_of_property_parse_mode(client, "hsi-mode", &mode); if (err) { err = hsi_of_property_parse_mode(client, "hsi-rx-mode", @@ -293,6 +291,7 @@ static void hsi_add_client_from_dt(struct hsi_port *port, cl->device.release = hsi_client_release; cl->device.of_node = client; + dev_set_name(&cl->device, "%s", name); if (device_register(&cl->device) < 0) { pr_err("hsi: failed to register client: %s\n", name); put_device(&cl->device);