From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BABCC4727C for ; Tue, 29 Sep 2020 11:08:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C069122262 for ; Tue, 29 Sep 2020 11:08:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601377693; bh=EK4ExL+4XPc6rfQSetuscZT39buHQChcqefi/2nI/KE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=THcEDfLnAfOENzTv2oY5ksyLuRmwPJZ9W2LZvdpc15hYowaGvb72QPlCSU26UjOOX zftHnyExrcxSqSzBEXfEsrG/9RfOI1hql7jI2HkOGj3dnMJ3QQcencMCWMd0QXfEvh 1+wzvAad+9x1HQslidRUti4/UMsLv1HE3D72hJtI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728417AbgI2LIL (ORCPT ); Tue, 29 Sep 2020 07:08:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:45390 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728897AbgI2LHI (ORCPT ); Tue, 29 Sep 2020 07:07:08 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0C68A21D43; Tue, 29 Sep 2020 11:07:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601377627; bh=EK4ExL+4XPc6rfQSetuscZT39buHQChcqefi/2nI/KE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hpQguUsqjFC4Ben2uvN1qOI/uNfz2cuYylKpMOW1tH+OR2pTHxDa8Fe2+0goXKkea AYjBTAyryb+97Gula7f1pEPwG6+pEiMTKlH6tKISxwKgqBDP75wxnvN7v0X9Iyli0z F4m5UC3QfPzRqU1d17VoZ72z/k22I7lkwWqe640Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Fuqian Huang , Geert Uytterhoeven , Sasha Levin Subject: [PATCH 4.9 015/121] m68k: q40: Fix info-leak in rtc_ioctl Date: Tue, 29 Sep 2020 12:59:19 +0200 Message-Id: <20200929105930.940769554@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105930.172747117@linuxfoundation.org> References: <20200929105930.172747117@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Fuqian Huang [ 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 --- arch/m68k/q40/config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index ea89a24f46000..cc0f924bbdd2d 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; -- 2.25.1