Skip to content

Commit

Permalink
drivers: watchdog: rdc321x_wdt: Fix race condition bugs
Browse files Browse the repository at this point in the history
[ Upstream commit 4b2e7f9 ]

In rdc321x_wdt_probe(), rdc321x_wdt_device.queue is initialized
after misc_register(), hence if ioctl is called before its
initialization which can call rdc321x_wdt_start() function,
it will see an uninitialized value of rdc321x_wdt_device.queue,
hence initialize it before misc_register().
Also, rdc321x_wdt_device.default_ticks is accessed in reset()
function called from write callback, thus initialize it before
misc_register().

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Madhuparna Bhowmik <madhuparnabhowmik10@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20200807112902.28764-1-madhuparnabhowmik10@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Madhuparna Bhowmik authored and gregkh committed Nov 5, 2020
1 parent 229bdf0 commit d01b633
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/watchdog/rdc321x_wdt.c
Expand Up @@ -230,6 +230,8 @@ static int rdc321x_wdt_probe(struct platform_device *pdev)

rdc321x_wdt_device.sb_pdev = pdata->sb_pdev;
rdc321x_wdt_device.base_reg = r->start;
rdc321x_wdt_device.queue = 0;
rdc321x_wdt_device.default_ticks = ticks;

err = misc_register(&rdc321x_wdt_misc);
if (err < 0) {
Expand All @@ -244,14 +246,11 @@ static int rdc321x_wdt_probe(struct platform_device *pdev)
rdc321x_wdt_device.base_reg, RDC_WDT_RST);

init_completion(&rdc321x_wdt_device.stop);
rdc321x_wdt_device.queue = 0;

clear_bit(0, &rdc321x_wdt_device.inuse);

timer_setup(&rdc321x_wdt_device.timer, rdc321x_wdt_trigger, 0);

rdc321x_wdt_device.default_ticks = ticks;

dev_info(&pdev->dev, "watchdog init success\n");

return 0;
Expand Down

0 comments on commit d01b633

Please sign in to comment.