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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,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 5092BC38A29 for ; Wed, 15 Apr 2020 11:42:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2607A21655 for ; Wed, 15 Apr 2020 11:42:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586950978; bh=GsyKNma1DJuNZ9EnsM2L3f5UdpZOBpe52VGFy1KVTS0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vbRT29McwLMRFM0CR9MSoips2/H9xDJ/8o+Bq3SFWubEHFUQ9wM3AveyNGeGifajN XgHG3O06iS/s0bDg43zgWB011KzWPgD3iOonJcRDiuX3+iB2j/6o4F0xLTYyAQDM9t Z6Ds5hzQJzW9QqRZi2jfOe1eDOIRxtbdp8ysjmf8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408931AbgDOLmy (ORCPT ); Wed, 15 Apr 2020 07:42:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:34298 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408917AbgDOLmt (ORCPT ); Wed, 15 Apr 2020 07:42:49 -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 5832520768; Wed, 15 Apr 2020 11:42:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586950969; bh=GsyKNma1DJuNZ9EnsM2L3f5UdpZOBpe52VGFy1KVTS0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KhIgLj7Io77GzlwykMOYabC8uE2GcB06wCDeTRGhg9YIypTwQMTQDyCuuCne5Sq+P 03KJS7r0133xGWqAMcgJbtBMEVqG9w1aY3KFtT6vQKz5YnHo+Qon7xbCe9WgHAcAH8 NS35hRNCNeggtwllhtWTpZM/mU8vgyu+A/VTjjg8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Darrick J. Wong" , Dave Chinner , Christoph Hellwig , Sasha Levin , linux-xfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.5 018/106] xfs: fix use-after-free when aborting corrupt attr inactivation Date: Wed, 15 Apr 2020 07:40:58 -0400 Message-Id: <20200415114226.13103-18-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415114226.13103-1-sashal@kernel.org> References: <20200415114226.13103-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 496b9bcd62b0b3a160be61e3265a086f97adcbd3 ] Log the corrupt buffer before we release the buffer. Fixes: a5155b870d687 ("xfs: always log corruption errors") Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Sasha Levin --- fs/xfs/xfs_attr_inactive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/xfs_attr_inactive.c b/fs/xfs/xfs_attr_inactive.c index 5ff49523d8ea1..c135bd5b2e61a 100644 --- a/fs/xfs/xfs_attr_inactive.c +++ b/fs/xfs/xfs_attr_inactive.c @@ -208,8 +208,8 @@ xfs_attr3_node_inactive( * Since this code is recursive (gasp!) we must protect ourselves. */ if (level > XFS_DA_NODE_MAXDEPTH) { - xfs_trans_brelse(*trans, bp); /* no locks for later trans */ xfs_buf_corruption_error(bp); + xfs_trans_brelse(*trans, bp); /* no locks for later trans */ return -EFSCORRUPTED; } -- 2.20.1