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=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 7715DC4741F for ; Tue, 29 Sep 2020 12:48:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1D8B920C09 for ; Tue, 29 Sep 2020 12:48:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601383705; bh=7Xh9F1ci2528vKTY1xThQGNGytWsAB3Od7yBhA/c6bY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zww7Jz/H80jgG0MjpIBnl++u+x7r56B1BsIrbzm3fXyGkFKFdrORkGmXmMjaDS5pF ckg/27gLOXqV1fRtNCuRsLGEC76MjpS96fOBFuShl1S3LCkkQmDToriQC0mO8idu0j XZDV0DRyXcEukv54IYinQ0jMSDK+d6TPZODZO/NQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728407AbgI2LDW (ORCPT ); Tue, 29 Sep 2020 07:03:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:39022 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728404AbgI2LDW (ORCPT ); Tue, 29 Sep 2020 07:03:22 -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 E807421D41; Tue, 29 Sep 2020 11:03:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601377401; bh=7Xh9F1ci2528vKTY1xThQGNGytWsAB3Od7yBhA/c6bY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s3zx0YItvkSndtu1kUzLZs//oDctpTTJUPb681Hb31qQ4YJmabUddOyRAnnpUOYrm Ud7XqGIMG2b91MD5511ReOh3+49U9QX8IHvSCz/DMBxVuNvcWFN3i16dBCUjtUSaL8 Wc+n8G2xES9Jcf/BnbWJNXlu6mY16IBPi8K2FX84= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joe Perches , Dan Carpenter , Julia Lawall , Thomas Gleixner , Kees Cook , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 4.4 22/85] kernel/sys.c: avoid copying possible padding bytes in copy_to_user Date: Tue, 29 Sep 2020 12:59:49 +0200 Message-Id: <20200929105929.335177908@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105928.198942536@linuxfoundation.org> References: <20200929105928.198942536@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: Joe Perches [ Upstream commit 5e1aada08cd19ea652b2d32a250501d09b02ff2e ] Initialization is not guaranteed to zero padding bytes so use an explicit memset instead to avoid leaking any kernel content in any possible padding bytes. Link: http://lkml.kernel.org/r/dfa331c00881d61c8ee51577a082d8bebd61805c.camel@perches.com Signed-off-by: Joe Perches Cc: Dan Carpenter Cc: Julia Lawall Cc: Thomas Gleixner Cc: Kees Cook Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- kernel/sys.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/sys.c b/kernel/sys.c index 1855f1bf113e4..e98664039cb23 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1183,11 +1183,13 @@ SYSCALL_DEFINE1(uname, struct old_utsname __user *, name) SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name) { - struct oldold_utsname tmp = {}; + struct oldold_utsname tmp; if (!name) return -EFAULT; + memset(&tmp, 0, sizeof(tmp)); + down_read(&uts_sem); memcpy(&tmp.sysname, &utsname()->sysname, __OLD_UTS_LEN); memcpy(&tmp.nodename, &utsname()->nodename, __OLD_UTS_LEN); -- 2.25.1