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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 07BB8C43331 for ; Tue, 24 Mar 2020 13:23:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1D30208CA for ; Tue, 24 Mar 2020 13:23:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585056225; bh=pTH9yEph1oAl7vro76MHXW5rx/KAtcTCCURejAD29Tw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MkBv2S76J0XlIdMiIVGTsQekro72Va3FU7EXhw+ClDkYsiiMdxDFKkipKNb3cu2Gl P3RqMMvI36JiuEfIcEv+ctvAu+Ya3H9U7jPagBr4rj99w8Dr5TuTE2gOK7ISjo+rlD egLuKsswdnulMatxHPjykrrUpEK3k/WNC+5BGgHM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728962AbgCXNXp (ORCPT ); Tue, 24 Mar 2020 09:23:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:46810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729050AbgCXNXj (ORCPT ); Tue, 24 Mar 2020 09:23:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 DBCFE208CA; Tue, 24 Mar 2020 13:23:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585056219; bh=pTH9yEph1oAl7vro76MHXW5rx/KAtcTCCURejAD29Tw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m6iOYc5JKdaRtfBzYA6eNaACrRwONSmAQd3m1YZ9D9bag//xCdghjQ2JNFJsB3Use 594j3S3Sl7D/fCzH25bsJt0J3iAWz0MfNpqgAJg2/a01R4FcjBLkZLhqNDeGe9gxiK rczA3Q2d/ZrJ/J3k//utFglBfD6jl5hAl10NQGCE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+8da9175e28eadcb203ce@syzkaller.appspotmail.com, Eric Biggers , Jiri Slaby Subject: [PATCH 5.5 060/119] tty: fix compat TIOCGSERIAL leaking uninitialized memory Date: Tue, 24 Mar 2020 14:10:45 +0100 Message-Id: <20200324130814.194659425@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200324130808.041360967@linuxfoundation.org> References: <20200324130808.041360967@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Eric Biggers commit 17329563a97df3ba474eca5037c1336e46e14ff8 upstream. Commit 77654350306a ("take compat TIOC[SG]SERIAL treatment into tty_compat_ioctl()") changed the compat version of TIOCGSERIAL to start copying a whole 'serial_struct32' to userspace rather than individual fields, but failed to initialize all padding and fields -- namely the hole after the 'iomem_reg_shift' field, and the 'reserved' field. Fix this by initializing the struct to zero. [v2: use sizeof, and convert the adjacent line for consistency.] Reported-by: syzbot+8da9175e28eadcb203ce@syzkaller.appspotmail.com Fixes: 77654350306a ("take compat TIOC[SG]SERIAL treatment into tty_compat_ioctl()") Cc: # v4.20+ Signed-off-by: Eric Biggers Acked-by: Jiri Slaby Link: https://lore.kernel.org/r/20200224182044.234553-2-ebiggers@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/tty/tty_io.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2734,7 +2734,9 @@ static int compat_tty_tiocgserial(struct struct serial_struct32 v32; struct serial_struct v; int err; - memset(&v, 0, sizeof(struct serial_struct)); + + memset(&v, 0, sizeof(v)); + memset(&v32, 0, sizeof(v32)); if (!tty->ops->set_serial) return -ENOTTY;