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.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 84A73C2BB84 for ; Mon, 7 Sep 2020 16:46:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 481DF208C7 for ; Mon, 7 Sep 2020 16:46:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599497217; bh=OHnXjEPxGErMLYM4E4G7ZywRBihIxSmMG+srvaJ4CtI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vFmkbzu64T0zi+1dKHNRYczSEbiQsq0XsqT4WtVRjImhiHrxyeTzINLTPdZZfmr60 sECpDem9Vd8Mq49hTAOUnXWKq0IHNquksA4E8nVAd+AGKqTGosXLSFwjpoz9IvYRxf T1vqVBhaySubXg6UssFWYGE8acShetXMyVGUbUEA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728165AbgIGQpa (ORCPT ); Mon, 7 Sep 2020 12:45:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:49486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730838AbgIGQfg (ORCPT ); Mon, 7 Sep 2020 12:35:36 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0434321D80; Mon, 7 Sep 2020 16:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599496535; bh=OHnXjEPxGErMLYM4E4G7ZywRBihIxSmMG+srvaJ4CtI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ihy3t5i2ZEpRzjwlKRkP09bu1tj4ZaaP7qlv04Rl3Rz4FjVfKTeAGPB9D/GUShObP SSscDp5+PZ99a3mXwFbAkfZutIHnBNKIOd0icEruNrAdfCjjn2Y7md/QgACjbtBH4G C+HUueEDUayl0ZS0Q/JoIPEnKhZt4EnQ8N70pAu8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Darrick J. Wong" , Eric Sandeen , Dave Chinner , Christoph Hellwig , Sasha Levin , linux-xfs@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 08/13] xfs: initialize the shortform attr header padding entry Date: Mon, 7 Sep 2020 12:35:19 -0400 Message-Id: <20200907163524.1281734-8-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200907163524.1281734-1-sashal@kernel.org> References: <20200907163524.1281734-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: "Darrick J. Wong" [ Upstream commit 125eac243806e021f33a1fdea3687eccbb9f7636 ] Don't leak kernel memory contents into the shortform attr fork. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen Reviewed-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Sasha Levin --- fs/xfs/libxfs/xfs_attr_leaf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index 70da4113c2baf..7b9dd76403bfd 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -520,8 +520,8 @@ xfs_attr_shortform_create(xfs_da_args_t *args) ASSERT(ifp->if_flags & XFS_IFINLINE); } xfs_idata_realloc(dp, sizeof(*hdr), XFS_ATTR_FORK); - hdr = (xfs_attr_sf_hdr_t *)ifp->if_u1.if_data; - hdr->count = 0; + hdr = (struct xfs_attr_sf_hdr *)ifp->if_u1.if_data; + memset(hdr, 0, sizeof(*hdr)); hdr->totsize = cpu_to_be16(sizeof(*hdr)); xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_ADATA); } -- 2.25.1