github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

HSI: core: fix resource leaks in hsi_add_client_from_dt()

Browse Source 
[ Upstream commit 5c08b0f755 ]

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: a2aa24734d ("HSI: Add common DT binding for HSI client devices")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dan Carpenter 2021-04-09 14:08:17 +03:00 committed by Greg Kroah-Hartman
parent 38c1f8ebb3
commit d5149a487f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/hsi/hsi_core.c
View File

@ -210,8 +210,6 @@ static void hsi_add_client_from_dt(struct hsi_port *port,
if (err) if (err)
goto err; goto err;
dev_set_name(&cl->device, "%s", name);
err = hsi_of_property_parse_mode(client, "hsi-mode", &mode); err = hsi_of_property_parse_mode(client, "hsi-mode", &mode);
if (err) { if (err) {
err = hsi_of_property_parse_mode(client, "hsi-rx-mode", 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.release = hsi_client_release;
cl->device.of_node = client; cl->device.of_node = client;
dev_set_name(&cl->device, "%s", name);
if (device_register(&cl->device) < 0) { if (device_register(&cl->device) < 0) {
pr_err("hsi: failed to register client: %s\n", name); pr_err("hsi: failed to register client: %s\n", name);
put_device(&cl->device); put_device(&cl->device);