From: Fuqian Huang Date: Fri, 27 Sep 2019 12:15:44 +0000 (+0800) Subject: m68k: q40: Fix info-leak in rtc_ioctl X-Git-Tag: v4.14.200~147 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d66da05c7bd4942b6522a2c106df3c5e04e762d7;p=users%2Fdwmw2%2Flinux.git m68k: q40: Fix info-leak in rtc_ioctl [ Upstream commit 7cf78b6b12fd5550545e4b73b35dca18bd46b44c ] 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 Link: https://lore.kernel.org/r/20190927121544.7650-1-huangfq.daxian@gmail.com Signed-off-by: Geert Uytterhoeven Signed-off-by: Sasha Levin --- diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index 71c0867ecf20f..7fdf4e7799bcd 100644 --- a/arch/m68k/q40/config.c +++ b/arch/m68k/q40/config.c @@ -303,6 +303,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;