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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 7DF1CC433E6 for ; Tue, 2 Mar 2021 14:10:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 474FE64F11 for ; Tue, 2 Mar 2021 14:10:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1572949AbhCBOGb (ORCPT ); Tue, 2 Mar 2021 09:06:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:46968 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244832AbhCBMVD (ORCPT ); Tue, 2 Mar 2021 07:21:03 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4DE4764FA0; Tue, 2 Mar 2021 11:58:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614686319; bh=gfbW/pFgyWDFp+CE0eYqxrV/GNT1+mGMVCqSvQdYcxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UZSU4PWBs5lSThahdfb0s6w+4oxWAT+8C4kPPu+wj8ietK30+eC5pU0mqJXpXr9n0 BN7lyu92H9J54hCjedWOI3g+4sg+Qut5EYYNS4WmbEqrLYgO1jT3wlzsi52nQBojnn iog2tNxJYU3hg78W946LxrUhasM+cMh8XXvJuGr/bWY8yFqIG2iFyCXbTmb8MOU937 yrw89xZ7kE5GdNTh36q8E9tnKdVYXEwLsP5XAEUsGAP79AHE0KG4NOKOwJ57dn7bQr FUe95+ZphgNWvU1snaPsOqJyU2czxXqcFVq/KzckwYZkGRMsVmxaFXqAVdWTtrm7XT 3RIZpNu3EOrNQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Steven J. Magnani" , Jan Kara , Sasha Levin Subject: [PATCH AUTOSEL 4.19 02/21] udf: fix silent AED tagLocation corruption Date: Tue, 2 Mar 2021 06:58:16 -0500 Message-Id: <20210302115835.63269-2-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302115835.63269-1-sashal@kernel.org> References: <20210302115835.63269-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: "Steven J. Magnani" [ Upstream commit 63c9e47a1642fc817654a1bc18a6ec4bbcc0f056 ] When extending a file, udf_do_extend_file() may enter following empty indirect extent. At the end of udf_do_extend_file() we revert prev_epos to point to the last written extent. However if we end up not adding any further extent in udf_do_extend_file(), the reverting points prev_epos into the header area of the AED and following updates of the extents (in udf_update_extents()) will corrupt the header. Make sure that we do not follow indirect extent if we are not going to add any more extents so that returning back to the last written extent works correctly. Link: https://lore.kernel.org/r/20210107234116.6190-2-magnani@ieee.org Signed-off-by: Steven J. Magnani Signed-off-by: Jan Kara Signed-off-by: Sasha Levin --- fs/udf/inode.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 3bf89a633836..f5500d2a3879 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -540,11 +540,14 @@ static int udf_do_extend_file(struct inode *inode, udf_write_aext(inode, last_pos, &last_ext->extLocation, last_ext->extLength, 1); + /* - * We've rewritten the last extent but there may be empty - * indirect extent after it - enter it. + * We've rewritten the last extent. If we are going to add + * more extents, we may need to enter possible following + * empty indirect extent. */ - udf_next_aext(inode, last_pos, &tmploc, &tmplen, 0); + if (new_block_bytes || prealloc_len) + udf_next_aext(inode, last_pos, &tmploc, &tmplen, 0); } /* Managed to do everything necessary? */ -- 2.30.1