firmware: arm_scmi: avoid double free in error flow
PATCH 1/1 firmware: arm_scmi: avoid double free in error flow
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.
--- drivers/firmware/arm_scmi/bus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/firmware/arm_scmi/bus.c +4 -4
@@ -135,8 +135,10 @@ struct scmi_device *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 @@ struct scmi_device * put_dev:put_device (&scmi_dev->dev);ida_simple_remove (&scmi_bus_id, id); -free_mem: -kfree (scmi_dev);return NULL ; }
Signature · 1 line
1.8.3.1
Quoted 3 lines · Wen Yang
If
device_register()fails, bothput_device()andkfree()are called, ending with a double free of thescmi_dev.
Correct.
Quoted 4 lines
Calling
kfree()is needed only when a failure happens between the allocation of thescmi_devand its registration, so move it to there and remove it from the error flow.
kstrdup_const can fail and in that case device is not yet registered, so we need to free. Since device_register() calls put_device() on failure too, I would just drop it as it's unnecessary, not sure why I have added it in the first place. Can you re-spin the patch dropping put_device and renaming put_dev label to something like free_const.
--
Regards,
Sudeep
Quoted 18 lines · Sudeep Holla
Quoted 3 lines · Wen Yang
If
device_register()fails, bothput_device()andkfree()are called, ending with a double free of thescmi_dev.Correct.
Quoted 4 lines
Calling
kfree()is needed only when a failure happens between the allocation of thescmi_devand its registration, so move it to there and remove it from the error flow.
kstrdup_constcan fail and in that case device is not yet registered, so we need to free. Sincedevice_register()callsput_device()on failure too, I would just drop it as it's unnecessary, not sure why I have added it in the first place. Can you re-spin the patch droppingput_deviceand renamingput_devlabel to something likefree_const.
Quoted 4 lines
--
Regards,
Sudeep
Hi Sudeep,
Thanks for your comments.
Let's check the code like this:
int device_register(struct device *dev)
{
device_initialize(dev); --> Initialize kobj-> kref to 1
return device_add(dev);
}int device_add(struct device *dev)
{
...
dev = get_device(dev); --> kobj-> kref increases by 1
...
done:
put_device(dev); --> kobj-> kref decreases by 1 and is now 1
return error;...
}
So we also need to call put_device (),
and the original patch should be fine.
Please kindly help to check again, thank you.
--
Regards,
Wen
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 15 lines · Wen Yang
Quoted 12 lines · Sudeep Holla
Quoted 3 lines · Wen Yang
If
device_register()fails, bothput_device()andkfree()are called, ending with a double free of thescmi_dev.Correct.
Quoted 4 lines
Calling
kfree()is needed only when a failure happens between the allocation of thescmi_devand its registration, so move it to there and remove it from the error flow.
Quoted 6 lines
Quoted 6 lines
kstrdup_constcan fail and in that case device is not yet registered, so we need to free. Sincedevice_register()callsput_device()on failure too, I would just drop it as it's unnecessary, not sure why I have added it in the first place. Can you re-spin the patch droppingput_deviceand renamingput_devlabel to something likefree_const.
Please ignore the above completely. I have made some changes locally and got completely confused when I looked at your patch and compared with the modified context locally.
Quoted 19 lines
Hi Sudeep,
Thanks for your comments.
Let's check the code like this:int
device_register(struct device *dev){ device_initialize(dev); --> Initialize kobj-> kref to 1 return device_add(dev); }int
device_add(struct device *dev)
{
...dev = get_device(dev); --> kobj-> kref increases by 1 ... done: put_device(dev); --> kobj-> kref decreases by 1 and is now 1 return error;
Quoted 7 lines
...
}So we also need to call
put_device(),
and the original patch should be fine.
Please kindly help to check again, thank you.
You are right, sorry for the confusion. I will apply your original patch. Thanks again for the patch.
--
Regards,
Sudeep