* [PATCH] watchdog: mena21_wdt: Fix possible NULL pointer dereference
@ 2015-06-02 10:25 Johannes Thumshirn
2015-06-02 13:44 ` Guenter Roeck
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Thumshirn @ 2015-06-02 10:25 UTC (permalink / raw)
To: Wim Van Sebroeck
Cc: Guenter Roeck, linux-watchdog, linux-kernel, Johannes Thumshirn
In a21_wdt_remove() we do a watchdog_unregister_device() on struct
a21_wdt_drv->wdt but never assign it.
Also move the dev_set_drvdata() call in front of the watchdog_register_device()
call, so it doesn't look like an error.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/watchdog/mena21_wdt.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c
index 96dbba9..d193a5e 100644
--- a/drivers/watchdog/mena21_wdt.c
+++ b/drivers/watchdog/mena21_wdt.c
@@ -208,14 +208,15 @@ static int a21_wdt_probe(struct platform_device *pdev)
else if (reset == 7)
a21_wdt.bootstatus |= WDIOF_EXTERN2;
+ drv->wdt = a21_wdt;
+ dev_set_drvdata(&pdev->dev, drv);
+
ret = watchdog_register_device(&a21_wdt);
if (ret) {
dev_err(&pdev->dev, "Cannot register watchdog device\n");
goto err_register_wd;
}
- dev_set_drvdata(&pdev->dev, drv);
-
dev_info(&pdev->dev, "MEN A21 watchdog timer driver enabled\n");
return 0;
--
2.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] watchdog: mena21_wdt: Fix possible NULL pointer dereference
2015-06-02 10:25 [PATCH] watchdog: mena21_wdt: Fix possible NULL pointer dereference Johannes Thumshirn
@ 2015-06-02 13:44 ` Guenter Roeck
2015-06-22 7:49 ` Johannes Thumshirn
0 siblings, 1 reply; 3+ messages in thread
From: Guenter Roeck @ 2015-06-02 13:44 UTC (permalink / raw)
To: Johannes Thumshirn, Wim Van Sebroeck; +Cc: linux-watchdog, linux-kernel
On 06/02/2015 03:25 AM, Johannes Thumshirn wrote:
> In a21_wdt_remove() we do a watchdog_unregister_device() on struct
> a21_wdt_drv->wdt but never assign it.
>
> Also move the dev_set_drvdata() call in front of the watchdog_register_device()
> call, so it doesn't look like an error.
>
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Good catch.
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Guenter
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] watchdog: mena21_wdt: Fix possible NULL pointer dereference
2015-06-02 13:44 ` Guenter Roeck
@ 2015-06-22 7:49 ` Johannes Thumshirn
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Thumshirn @ 2015-06-22 7:49 UTC (permalink / raw)
To: Wim Van Sebroeck
Cc: linux-watchdog, linux-kernel, Guenter Roeck, Johannes Thumshirn
On Tue, Jun 02, 2015 at 06:44:48AM -0700, Guenter Roeck wrote:
> On 06/02/2015 03:25 AM, Johannes Thumshirn wrote:
> >In a21_wdt_remove() we do a watchdog_unregister_device() on struct
> >a21_wdt_drv->wdt but never assign it.
> >
> >Also move the dev_set_drvdata() call in front of the watchdog_register_device()
> >call, so it doesn't look like an error.
> >
> >Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
>
> Good catch.
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>
> Guenter
>
Hi Wim,
Any objections to this one? Do you intent to take it for 4.2?
Thanks,
Johannes
--
Johannes Thumshirn Storage
jthumshirn@suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-22 7:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-02 10:25 [PATCH] watchdog: mena21_wdt: Fix possible NULL pointer dereference Johannes Thumshirn
2015-06-02 13:44 ` Guenter Roeck
2015-06-22 7:49 ` Johannes Thumshirn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).