Commit 5b839fb7 authored Apr 09, 2021 by Dan Carpenter Committed by Greg Kroah-Hartman May 22, 2021

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: a2aa2473 ("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>

parent 84e3ffb5

drivers/hsi/hsi_core.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -223,8 +223,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",
		@@ -306,6 +304,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);