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=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 409ACC2BA19 for ; Wed, 15 Apr 2020 13:18:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 15AE520575 for ; Wed, 15 Apr 2020 13:18:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586956717; bh=1lEjVxhZiFoWNUrfREis8BxN3QnlAH5bJf6GvtAppkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pUP06aFSOKqKPyURMgEo+YJ3ylUGDDIS82j27HjswhMZJLUVPp4lFvWUiZUo56fd3 K3jvysOko/6NGBC2iMa4y/lMJb/XV2QzNdarLa1WNFiBnf4NWCLuQPxTzqGEL7FcR0 3Qb0MPrFUR7JBXNoWSQvkugRFP1HjJuYeo1xPuW0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S370684AbgDONPe (ORCPT ); Wed, 15 Apr 2020 09:15:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:54800 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2897036AbgDOLfQ (ORCPT ); Wed, 15 Apr 2020 07:35:16 -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 C9AC420768; Wed, 15 Apr 2020 11:35:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586950516; bh=1lEjVxhZiFoWNUrfREis8BxN3QnlAH5bJf6GvtAppkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=krIP8K+RPft1qae/I4kuN6sfs+4KypAle6osEn9Wmiqxs+73l3AMGGlZ0sv5ExaQA 6ByR/yZDe8c+Dq+K2Zw/HRxXcxevByldoarnRrG6XqasIUWjBvtGSj8u3IXk+rzzkq faMAMBQlgpcra3ZW3zryVZAL+5dceswwkZCbZsGo= 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.6 026/129] xfs: fix use-after-free when aborting corrupt attr inactivation Date: Wed, 15 Apr 2020 07:33:01 -0400 Message-Id: <20200415113445.11881-26-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415113445.11881-1-sashal@kernel.org> References: <20200415113445.11881-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 bbfa6ba84dcd7..fe8f60b59ec4d 100644 --- a/fs/xfs/xfs_attr_inactive.c +++ b/fs/xfs/xfs_attr_inactive.c @@ -145,8 +145,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