Commit 6706664d authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Alexandre Belloni

rtc: class: fix double free in rtc_register_device() error path

Commit 59cca865 ("drivers/rtc/class.c: fix device_register() error
handling") correctly noted that naked kfree() should not be used after
failed device_register() call, however, while it added the needed
put_device() it forgot to remove the original kfree() causing double-free.

Cc: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent dfe6c04a
...@@ -234,8 +234,9 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev, ...@@ -234,8 +234,9 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
err = device_register(&rtc->dev); err = device_register(&rtc->dev);
if (err) { if (err) {
/* This will free both memory and the ID */
put_device(&rtc->dev); put_device(&rtc->dev);
goto exit_kfree; goto exit;
} }
rtc_dev_add_device(rtc); rtc_dev_add_device(rtc);
...@@ -247,9 +248,6 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev, ...@@ -247,9 +248,6 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
return rtc; return rtc;
exit_kfree:
kfree(rtc);
exit_ida: exit_ida:
ida_simple_remove(&rtc_ida, id); ida_simple_remove(&rtc_ida, id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment