From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org, Tony Lindgren <tony@atomide.com>,
Yangtao Li <tiny.windzz@gmail.com>,
Olof Johansson <olof@lixom.net>
Subject: [PATCH 13/17] clocksource/drivers/timer-ti-dm: Fix uninitialized pointer access
Date: Thu, 16 Jan 2020 19:23:00 +0100 [thread overview]
Message-ID: <20200116182304.4926-13-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20200116182304.4926-1-daniel.lezcano@linaro.org>
From: Tony Lindgren <tony@atomide.com>
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 <tiny.windzz@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Olof Johansson <olof@lixom.net>
Acked-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200106203700.21009-1-tony@atomide.com
---
drivers/clocksource/timer-ti-dm.c | 8 ++++----
1 file 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))
--
2.17.1
next prev parent reply other threads:[~2020-01-16 18:24 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 18:21 [GIT PULL] timer drivers for 5.6 Daniel Lezcano
2020-01-16 18:22 ` [PATCH 01/17] clocksource/drivers/hyper-v: Suspend/resume Hyper-V clocksource for hibernation Daniel Lezcano
2020-01-16 18:22 ` [PATCH 02/17] clocksource: Fix Kconfig indentation Daniel Lezcano
2020-01-16 18:22 ` [PATCH 03/17] dt-bindings: timer: renesas, cmt: Document r8a774b1 CMT support Daniel Lezcano
2020-01-16 18:22 ` [PATCH 04/17] clocksource: Fix Kconfig miscues Daniel Lezcano
2020-01-16 18:22 ` [PATCH 05/17] clocksource/drivers/hyper-v: Reserve PAGE_SIZE space for tsc page Daniel Lezcano
2020-01-16 18:22 ` [PATCH 06/17] clocksource/drivers/timer-microchip-pit64b: Add Microchip PIT64B support Daniel Lezcano
2020-01-16 18:22 ` [PATCH 07/17] clocksource/drivers/cadence-ttc: Use ttc driver as platform driver Daniel Lezcano
2020-01-16 18:22 ` [PATCH 08/17] clocksource/drivers/bcm2835_timer: Fix memory leak of timer Daniel Lezcano
2020-01-16 18:22 ` [PATCH 09/17] clocksource/drivers/em_sti: Convert to devm_platform_ioremap_resource Daniel Lezcano
2020-01-16 18:22 ` [PATCH 10/17] clocksource/drivers/em_sti: Fix variable declaration in em_sti_probe Daniel Lezcano
2020-01-16 18:22 ` [PATCH 11/17] clocksource/drivers/timer-ti-dm: Convert to devm_platform_ioremap_resource Daniel Lezcano
2020-01-16 18:22 ` [PATCH 12/17] clocksource/drivers/timer-ti-dm: Switch to platform_get_irq Daniel Lezcano
2020-01-16 18:23 ` Daniel Lezcano [this message]
2020-01-16 18:23 ` [PATCH 14/17] clocksource/drivers/exynos_mct: Rename Exynos to lowercase Daniel Lezcano
2020-01-16 18:23 ` [PATCH 15/17] clocksource/drivers/timer-microchip-pit64b: Fix sparse warning Daniel Lezcano
2020-01-16 18:23 ` [PATCH 16/17] clocksource/drivers/hyper-v: Untangle stimers and timesync from clocksources Daniel Lezcano
2020-01-16 18:23 ` [PATCH 17/17] clocksource/drivers/hyper-v: Set TSC clocksource as default w/ InvariantTSC Daniel Lezcano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200116182304.4926-13-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
--cc=tglx@linutronix.de \
--cc=tiny.windzz@gmail.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).