summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorFuqian Huang <huangfq.daxian@gmail.com>2019-09-27 20:15:44 +0800
committerGeert Uytterhoeven <geert@linux-m68k.org>2019-10-21 09:08:15 +0200
commit7cf78b6b12fd5550545e4b73b35dca18bd46b44c (patch)
treeb2e36206ad1542a39589063985acb88582382365 /arch/m68k
parent51b67a6e6592db3b2aa06e870c6546bac095b22b (diff)
downloadlinux-7cf78b6b12fd5550545e4b73b35dca18bd46b44c.tar.bz2
m68k: q40: Fix info-leak in rtc_ioctl
When the option is RTC_PLL_GET, pll will be copied to userland via copy_to_user. pll is initialized using mach_get_rtc_pll indirect call and mach_get_rtc_pll is only assigned with function q40_get_rtc_pll in arch/m68k/q40/config.c. In function q40_get_rtc_pll, the field pll_ctrl is not initialized. This will leak uninitialized stack content to userland. Fix this by zeroing the uninitialized field. Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com> Link: https://lore.kernel.org/r/20190927121544.7650-1-huangfq.daxian@gmail.com Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/q40/config.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index e63eb5f06999..f31890078197 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -264,6 +264,7 @@ static int q40_get_rtc_pll(struct rtc_pll_info *pll)
{
int tmp = Q40_RTC_CTRL;
+ pll->pll_ctrl = 0;
pll->pll_value = tmp & Q40_RTC_PLL_MASK;
if (tmp & Q40_RTC_PLL_SIGN)
pll->pll_value = -pll->pll_value;