Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 372098d5 authored by Wen Yang's avatar Wen Yang Committed by Greg Kroah-Hartman
Browse files

firmware: arm_scmi: Avoid double free in error flow 



[ Upstream commit 8305e90a894f82c278c17e51a28459deee78b263 ]

If device_register() fails, both put_device() and kfree() are called,
ending with a double free of the scmi_dev.

Calling kfree() is needed only when a failure happens between the
allocation of the scmi_dev and its registration, so move it to there
and remove it from the error flow.

Fixes: 46edb8d1322c ("firmware: arm_scmi: provide the mandatory device release callback")
Signed-off-by: default avatarWen Yang <wenyang@linux.alibaba.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f7654ebe

drivers/firmware/arm_scmi/bus.c

+4 −4
Original line number Diff line number Diff line
@@ -135,8 +135,10 @@ scmi_device_create(struct device_node *np, struct device *parent, int protocol) 
		return NULL;



	id = ida_simple_get(&scmi_bus_id, 1, 0, GFP_KERNEL);

	if (id < 0)

		goto free_mem;

	if (id < 0) {

		kfree(scmi_dev);

		return NULL;

	}



	scmi_dev->id = id;

	scmi_dev->protocol_id = protocol;
@@ -154,8 +156,6 @@ scmi_device_create(struct device_node *np, struct device *parent, int protocol) 
put_dev:

	put_device(&scmi_dev->dev);

	ida_simple_remove(&scmi_bus_id, id);

free_mem:

	kfree(scmi_dev);

	return NULL;

}