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=-16.1 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,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 89B33C43464 for ; Fri, 18 Sep 2020 02:34:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4730222208 for ; Fri, 18 Sep 2020 02:34:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600396440; bh=UMADY/onW6UpxBDJgJFpd53DCmN5biqNx9tSn5B50o0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=E0mwtS3WAy7hajUEY8h9twbk6SE6VU/9t0FVcUnAkALVN6U5WF9qKJSB0/4xnecMY npI8bkLWzIr5YHebL3DDRfDHqwJTdQ3Cpbj1gP80n3qGwRhCmfKVAUSER2HtmEu5WJ 4bLQGGIt4fi+PEB/67VhZm9+K1vlOIkVwrUa7oXc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730003AbgIRCd6 (ORCPT ); Thu, 17 Sep 2020 22:33:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:40966 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728967AbgIRCNi (ORCPT ); Thu, 17 Sep 2020 22:13:38 -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 99C42208E4; Fri, 18 Sep 2020 02:13:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600395218; bh=UMADY/onW6UpxBDJgJFpd53DCmN5biqNx9tSn5B50o0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cn7FmID4YSEBY4voa7ST7B3060Vl4rfKz97KB8TyyBJYRss2kPh3oAwXTXHagbp3i iru45VgT1PDc86lfBFfvkEzrXgdwgDCTcDN4JSNCnKYTdpfIxu4KB9VpOHn31BUOHt 6PlZMTqmmdJyxPSLchDO8ghvZJv278cxWa7nskWE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Darrick J. Wong" , Dave Chinner , Sasha Levin , xfs@oss.sgi.com Subject: [PATCH AUTOSEL 4.14 065/127] xfs: don't ever return a stale pointer from __xfs_dir3_free_read Date: Thu, 17 Sep 2020 22:11:18 -0400 Message-Id: <20200918021220.2066485-65-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918021220.2066485-1-sashal@kernel.org> References: <20200918021220.2066485-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Darrick J. Wong" [ Upstream commit 1cb5deb5bc095c070c09a4540c45f9c9ba24be43 ] If we decide that a directory free block is corrupt, we must take care not to leak a buffer pointer to the caller. After xfs_trans_brelse returns, the buffer can be freed or reused, which means that we have to set *bpp back to NULL. Callers are supposed to notice the nonzero return value and not use the buffer pointer, but we should code more defensively, even if all current callers handle this situation correctly. Fixes: de14c5f541e7 ("xfs: verify free block header fields") Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner Signed-off-by: Sasha Levin --- fs/xfs/libxfs/xfs_dir2_node.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index 682e2bf370c72..ee4ebc2dd7492 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.c @@ -212,6 +212,7 @@ __xfs_dir3_free_read( xfs_buf_ioerror(*bpp, -EFSCORRUPTED); xfs_verifier_error(*bpp); xfs_trans_brelse(tp, *bpp); + *bpp = NULL; return -EFSCORRUPTED; } -- 2.25.1