diff options
| author | Wen Yang <wenyang@linux.alibaba.com> | 2019-11-25 23:54:09 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-17 20:35:52 +0100 |
| commit | 372098d54b33a0431d35be06074efae0a35ce744 (patch) | |
| tree | 03e88da9cc76545c4ffaaefee9dbd493bdee34ff | |
| parent | f7654ebe928d46bd540e0305dbdcc57752de424c (diff) | |
| download | linux-stable-372098d54b33a0431d35be06074efae0a35ce744.tar.gz linux-stable-372098d54b33a0431d35be06074efae0a35ce744.tar.bz2 linux-stable-372098d54b33a0431d35be06074efae0a35ce744.zip | |
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: Wen Yang <wenyang@linux.alibaba.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/firmware/arm_scmi/bus.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c index 92f843eaf1e0..7a30952b463d 100644 --- a/drivers/firmware/arm_scmi/bus.c +++ b/drivers/firmware/arm_scmi/bus.c @@ -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; } |