diff options
| author | Tony Lindgren <[email protected]> | 2020-01-06 20:37:00 +0000 |
|---|---|---|
| committer | Daniel Lezcano <[email protected]> | 2020-01-16 18:09:02 +0000 |
| commit | 4341067cfc20582195f47383cf059589b2641465 (patch) | |
| tree | 09f4afc9a6f6f48f389913c7b6a174bf7ea0231f /drivers/clocksource/timer-ti-dm.c | |
| parent | clocksource/drivers/timer-ti-dm: Switch to platform_get_irq (diff) | |
| download | kernel-4341067cfc20582195f47383cf059589b2641465.tar.gz kernel-4341067cfc20582195f47383cf059589b2641465.zip | |
clocksource/drivers/timer-ti-dm: Fix uninitialized pointer access
Clean-up commit 8c82723414d5 ("clocksource/drivers/timer-ti-dm: Switch to
platform_get_irq") caused a regression where we now try to access
uninitialized data for timer:
drivers/clocksource/timer-ti-dm.c: In function 'omap_dm_timer_probe':
drivers/clocksource/timer-ti-dm.c:798:13: warning: 'timer' may be used
uninitialized in this function [-Wmaybe-uninitialized]
On boot we now get:
Unable to handle kernel NULL pointer dereference at virtual address
00000004
...
(omap_dm_timer_probe) from [<c061ac7c>] (platform_drv_probe+0x48/0x98)
(platform_drv_probe) from [<c0618c04>] (really_probe+0x1dc/0x348)
(really_probe) from [<c0618ef4>] (driver_probe_device+0x5c/0x160)
Let's fix the issue by moving platform_get_irq to happen after timer has
been allocated.
Fixes: bc83caddf17b ("clocksource/drivers/timer-ti-dm: Switch to platform_get_irq")
Cc: Yangtao Li <[email protected]>
Signed-off-by: Tony Lindgren <[email protected]>
Acked-by: Olof Johansson <[email protected]>
Acked-by: Yangtao Li <[email protected]>
Signed-off-by: Daniel Lezcano <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Diffstat (limited to 'drivers/clocksource/timer-ti-dm.c')
| -rw-r--r-- | drivers/clocksource/timer-ti-dm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c index bd16efb2740b..269a994d6a99 100644 --- a/drivers/clocksource/timer-ti-dm.c +++ b/drivers/clocksource/timer-ti-dm.c @@ -795,14 +795,14 @@ static int omap_dm_timer_probe(struct platform_device *pdev) return -ENODEV; } - timer->irq = platform_get_irq(pdev, 0); - if (timer->irq < 0) - return timer->irq; - timer = devm_kzalloc(dev, sizeof(*timer), GFP_KERNEL); if (!timer) return -ENOMEM; + timer->irq = platform_get_irq(pdev, 0); + if (timer->irq < 0) + return timer->irq; + timer->fclk = ERR_PTR(-ENODEV); timer->io_base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(timer->io_base)) |