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=-12.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 364B5C2F3A0 for ; Mon, 21 Jan 2019 14:18:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 076C620861 for ; Mon, 21 Jan 2019 14:18:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548080339; bh=xW458HcEI/Zl/3TwaQYve/Wx1f82B97w7IjRfZDtDQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=doLCiaJzg9smMookXYq2bMZWLpoNYYTbDwCaAgGDg4vRLXztDQBP7wXv7EuhXouXR ZDFpLlOZEAhU17EapcPVu/u5L6+/wZQU0gfppYE/giHNbJKn8ysPRqf8LDn25nfxrC MnNjyI/JQyjOau1KqSvLryOc3U/fN/CoCDvQOCrY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730140AbfAUNtN (ORCPT ); Mon, 21 Jan 2019 08:49:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:59630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729576AbfAUNtN (ORCPT ); Mon, 21 Jan 2019 08:49:13 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 0629D2087F; Mon, 21 Jan 2019 13:49:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548078552; bh=xW458HcEI/Zl/3TwaQYve/Wx1f82B97w7IjRfZDtDQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HDw/p8owY6rRyhhdSVunmJifU2HffAJVhAGwWEs0N+4dvqLjxrrUI9VZSWI2g7jkg hYcHBypg2f6LgykkrPTpjJH92rMihQ7ub5/XGDJOP4jQJluTOr3XsjMaBa2aBjfQH+ GbeQyjUtWHpJJWckYaLnaL4+1eTBv/0hkJMgflmI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vlad Tsyrklevich , Kees Cook , security@kernel.org, Bartlomiej Zolnierkiewicz Subject: [PATCH 4.20 072/111] omap2fb: Fix stack memory disclosure Date: Mon, 21 Jan 2019 14:43:06 +0100 Message-Id: <20190121122504.399319161@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121122455.819406896@linuxfoundation.org> References: <20190121122455.819406896@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vlad Tsyrklevich commit a01421e4484327fe44f8e126793ed5a48a221e24 upstream. Using [1] for static analysis I found that the OMAPFB_QUERY_PLANE, OMAPFB_GET_COLOR_KEY, OMAPFB_GET_DISPLAY_INFO, and OMAPFB_GET_VRAM_INFO cases could all leak uninitialized stack memory--either due to uninitialized padding or 'reserved' fields. Fix them by clearing the shared union used to store copied out data. [1] https://github.com/vlad902/kernel-uninitialized-memory-checker Signed-off-by: Vlad Tsyrklevich Reviewed-by: Kees Cook Fixes: b39a982ddecf ("OMAP: DSS2: omapfb driver") Cc: security@kernel.org [b.zolnierkie: prefix patch subject with "omap2fb: "] Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c +++ b/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c @@ -609,6 +609,8 @@ int omapfb_ioctl(struct fb_info *fbi, un int r = 0; + memset(&p, 0, sizeof(p)); + switch (cmd) { case OMAPFB_SYNC_GFX: DBG("ioctl SYNC_GFX\n");