| Message ID | 20241212100116.3797439-1-joe@pf.is.s.u-tokyo.ac.jp |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] rtc: bd70528: disable wakeup in the error path of .probe() | expand |
Sorry, the commit message does not match the actual code change here. I just sent a V3 patch, so please take a look at it and disregard this version. On 12/12/24 19:01, Joe Hattori wrote: > Current code leaves the device's wakeup enabled in the error path of > .probe(), which results in a memory leak. Call device_init_wakeup() as > the last step in the .probe() to avoid this leak. > > This bug was found by an experimental static analysis tool that I am > developing. > > Fixes: 32a4a4ebf768 ("rtc: bd70528: Initial support for ROHM bd70528 RTC") > Signed-off-by: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp> > --- > Changes in V2: > - Call device_init_wakeup() as the last step of the .probe() for > simplicity. > --- > drivers/rtc/rtc-bd70528.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/rtc/rtc-bd70528.c b/drivers/rtc/rtc-bd70528.c > index 954ac4ef53e8..d5cc4993f918 100644 > --- a/drivers/rtc/rtc-bd70528.c > +++ b/drivers/rtc/rtc-bd70528.c > @@ -312,9 +312,6 @@ static int bd70528_probe(struct platform_device *pdev) > } > } > > - device_set_wakeup_capable(&pdev->dev, true); > - device_wakeup_enable(&pdev->dev); > - > rtc = devm_rtc_allocate_device(&pdev->dev); > if (IS_ERR(rtc)) { > dev_err(&pdev->dev, "RTC device creation failed\n"); > @@ -331,7 +328,12 @@ static int bd70528_probe(struct platform_device *pdev) > if (ret) > return ret; > > - return devm_rtc_register_device(rtc); > + ret = devm_rtc_register_device(rtc); > + if (ret) > + return ret; > + > + device_init_wakeup(&pdev->dev, true); > + return 0; > } > > static const struct platform_device_id bd718x7_rtc_id[] = {
diff --git a/drivers/rtc/rtc-bd70528.c b/drivers/rtc/rtc-bd70528.c index 954ac4ef53e8..d5cc4993f918 100644 --- a/drivers/rtc/rtc-bd70528.c +++ b/drivers/rtc/rtc-bd70528.c @@ -312,9 +312,6 @@ static int bd70528_probe(struct platform_device *pdev) } } - device_set_wakeup_capable(&pdev->dev, true); - device_wakeup_enable(&pdev->dev); - rtc = devm_rtc_allocate_device(&pdev->dev); if (IS_ERR(rtc)) { dev_err(&pdev->dev, "RTC device creation failed\n"); @@ -331,7 +328,12 @@ static int bd70528_probe(struct platform_device *pdev) if (ret) return ret; - return devm_rtc_register_device(rtc); + ret = devm_rtc_register_device(rtc); + if (ret) + return ret; + + device_init_wakeup(&pdev->dev, true); + return 0; } static const struct platform_device_id bd718x7_rtc_id[] = {
Current code leaves the device's wakeup enabled in the error path of .probe(), which results in a memory leak. Call device_init_wakeup() as the last step in the .probe() to avoid this leak. This bug was found by an experimental static analysis tool that I am developing. Fixes: 32a4a4ebf768 ("rtc: bd70528: Initial support for ROHM bd70528 RTC") Signed-off-by: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp> --- Changes in V2: - Call device_init_wakeup() as the last step of the .probe() for simplicity. --- drivers/rtc/rtc-bd70528.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)