From nobody Tue Dec 16 20:11:34 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8878FC4167B for ; Thu, 30 Nov 2023 04:06:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344435AbjK3EGA (ORCPT ); Wed, 29 Nov 2023 23:06:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344424AbjK3EFy (ORCPT ); Wed, 29 Nov 2023 23:05:54 -0500 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9832110C6 for ; Wed, 29 Nov 2023 20:05:35 -0800 (PST) Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-5c6001ec920so460053a12.0 for ; Wed, 29 Nov 2023 20:05:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1701317135; x=1701921935; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HifOguLosmCp1hqOD7nW4Pzhg3FPPc3H1eWRpxejRrY=; b=ACwPBuMIkvHS0zI/LN+NB+3jM4e1sTKu4c2au+Vi5mF75iopDUbsItmrOA90zcllOG 5pV5rA9aEwGZSL9VqrupURkA9ixJK6o5z1dHaVzZgI2DoxYSnu3HJqa03pQSl5jAfzrV BiHCKg4+dD3vP1p2e/zaqIuUOJWGO+fMKQTA3K0eSB1E+E80/PbvooMmHuduAhd8PiMV 15lP2N77qsDXosPYD3WDTJQIUk8Fuxu1SpbtKIDmFiT5KHTFdJ6VYDiQstHTdSm372Bn P3E+OrQ/CLcjnUPNcvr4tIpvPSL5zhDXgVyLCe+LevjeLVbueRnZ07TAmIDLe245uAuF Ky0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701317135; x=1701921935; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HifOguLosmCp1hqOD7nW4Pzhg3FPPc3H1eWRpxejRrY=; b=RwgvZF2Ad0iDJUM2+D/vD0Q+7h6FrQ/OB+8n2QhPRJmFEq/jW6RGzLCtjghHYgGSYN DNlKziC8oXy1i8OpyiHk7zXhgWy2COAKjY8g2ww0HsbUxFwisCUAE7tU0432yFR7q9TI tH514TMOyfcOZKpc6ODDiklYCo4+dtjJLmR/nhAsBuN0N6u5xz7KWHzymWmHhBKZpAE+ WMOQYTx4aDjVnezlT46asH8o7Qfw7k0Hj36ez+rXNdv3i61grsa2NJop+Gz9FpUPgXQj 2W/gpAIkbDyMNnlHDYpGP07xaPMYQms2mcfTQBj71XK0aJPZa+I5uf8RAZYR4Dh+BpxA XB4w== X-Gm-Message-State: AOJu0YzCTKGd5PF4u43OosnXmmrN5yTiOBtAKBWj8AKXnnUSR4bEKVNJ 2tCDV92vhoQSdxAB0MP7yrkLeQ== X-Google-Smtp-Source: AGHT+IH9PSQT+1rspy2juwmb1zQ+1+xmcZ4tuw74DHRM5bQB/lfp8qpMQb3zzbKumW4BYP3Z9DzDug== X-Received: by 2002:a05:6a20:548e:b0:18c:8d0f:a794 with SMTP id i14-20020a056a20548e00b0018c8d0fa794mr14103759pzk.19.1701317134959; Wed, 29 Nov 2023 20:05:34 -0800 (PST) Received: from localhost.localdomain ([61.213.176.7]) by smtp.gmail.com with ESMTPSA id u6-20020a170903124600b001d01c970119sm174181plh.275.2023.11.29.20.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 20:05:34 -0800 (PST) From: Jiachen Zhang To: Chandan Babu R , "Darrick J. Wong" Cc: Dave Chinner , Allison Henderson , Zhang Tianci , Brian Foster , linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, xieyongji@bytedance.com, me@jcix.top, Jiachen Zhang , Christoph Hellwig Subject: [PATCH v3 1/3] xfs: ensure logflagsp is initialized in xfs_bmap_del_extent_real Date: Thu, 30 Nov 2023 12:05:14 +0800 Message-Id: <20231130040516.35677-2-zhangjiachen.jaycee@bytedance.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20231130040516.35677-1-zhangjiachen.jaycee@bytedance.com> References: <20231130040516.35677-1-zhangjiachen.jaycee@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In the case of returning -ENOSPC, ensure logflagsp is initialized by 0. Otherwise the caller __xfs_bunmapi will set uninitialized illegal tmp_logflags value into xfs log, which might cause unpredictable error in the log recovery procedure. Also, remove the flags variable and set the *logflagsp directly, so that the code should be more robust in the long run. Fixes: 1b24b633aafe ("xfs: move some more code into xfs_bmap_del_extent_rea= l") Signed-off-by: Jiachen Zhang Reviewed-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_bmap.c | 73 +++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 42 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index be62acffad6c..eacd7f43c952 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -5010,7 +5010,6 @@ xfs_bmap_del_extent_real( xfs_fileoff_t del_endoff; /* first offset past del */ int do_fx; /* free extent at end of routine */ int error; /* error return value */ - int flags =3D 0;/* inode logging flags */ struct xfs_bmbt_irec got; /* current extent entry */ xfs_fileoff_t got_endoff; /* first offset past got */ int i; /* temp state */ @@ -5023,6 +5022,8 @@ xfs_bmap_del_extent_real( uint32_t state =3D xfs_bmap_fork_to_state(whichfork); struct xfs_bmbt_irec old; =20 + *logflagsp =3D 0; + mp =3D ip->i_mount; XFS_STATS_INC(mp, xs_del_exlist); =20 @@ -5035,7 +5036,6 @@ xfs_bmap_del_extent_real( ASSERT(got_endoff >=3D del_endoff); ASSERT(!isnullstartblock(got.br_startblock)); qfield =3D 0; - error =3D 0; =20 /* * If it's the case where the directory code is running with no block @@ -5051,13 +5051,13 @@ xfs_bmap_del_extent_real( del->br_startoff > got.br_startoff && del_endoff < got_endoff) return -ENOSPC; =20 - flags =3D XFS_ILOG_CORE; + *logflagsp =3D XFS_ILOG_CORE; if (whichfork =3D=3D XFS_DATA_FORK && XFS_IS_REALTIME_INODE(ip)) { if (!(bflags & XFS_BMAPI_REMAP)) { error =3D xfs_rtfree_blocks(tp, del->br_startblock, del->br_blockcount); if (error) - goto done; + return error; } =20 do_fx =3D 0; @@ -5072,11 +5072,9 @@ xfs_bmap_del_extent_real( if (cur) { error =3D xfs_bmbt_lookup_eq(cur, &got, &i); if (error) - goto done; - if (XFS_IS_CORRUPT(mp, i !=3D 1)) { - error =3D -EFSCORRUPTED; - goto done; - } + return error; + if (XFS_IS_CORRUPT(mp, i !=3D 1)) + return -EFSCORRUPTED; } =20 if (got.br_startoff =3D=3D del->br_startoff) @@ -5093,17 +5091,15 @@ xfs_bmap_del_extent_real( xfs_iext_prev(ifp, icur); ifp->if_nextents--; =20 - flags |=3D XFS_ILOG_CORE; + *logflagsp |=3D XFS_ILOG_CORE; if (!cur) { - flags |=3D xfs_ilog_fext(whichfork); + *logflagsp |=3D xfs_ilog_fext(whichfork); break; } if ((error =3D xfs_btree_delete(cur, &i))) - goto done; - if (XFS_IS_CORRUPT(mp, i !=3D 1)) { - error =3D -EFSCORRUPTED; - goto done; - } + return error; + if (XFS_IS_CORRUPT(mp, i !=3D 1)) + return -EFSCORRUPTED; break; case BMAP_LEFT_FILLING: /* @@ -5114,12 +5110,12 @@ xfs_bmap_del_extent_real( got.br_blockcount -=3D del->br_blockcount; xfs_iext_update_extent(ip, state, icur, &got); if (!cur) { - flags |=3D xfs_ilog_fext(whichfork); + *logflagsp |=3D xfs_ilog_fext(whichfork); break; } error =3D xfs_bmbt_update(cur, &got); if (error) - goto done; + return error; break; case BMAP_RIGHT_FILLING: /* @@ -5128,12 +5124,12 @@ xfs_bmap_del_extent_real( got.br_blockcount -=3D del->br_blockcount; xfs_iext_update_extent(ip, state, icur, &got); if (!cur) { - flags |=3D xfs_ilog_fext(whichfork); + *logflagsp |=3D xfs_ilog_fext(whichfork); break; } error =3D xfs_bmbt_update(cur, &got); if (error) - goto done; + return error; break; case 0: /* @@ -5150,18 +5146,18 @@ xfs_bmap_del_extent_real( new.br_state =3D got.br_state; new.br_startblock =3D del_endblock; =20 - flags |=3D XFS_ILOG_CORE; + *logflagsp |=3D XFS_ILOG_CORE; if (cur) { error =3D xfs_bmbt_update(cur, &got); if (error) - goto done; + return error; error =3D xfs_btree_increment(cur, 0, &i); if (error) - goto done; + return error; cur->bc_rec.b =3D new; error =3D xfs_btree_insert(cur, &i); if (error && error !=3D -ENOSPC) - goto done; + return error; /* * If get no-space back from btree insert, it tried a * split, and we have a zero block reservation. Fix up @@ -5174,33 +5170,28 @@ xfs_bmap_del_extent_real( */ error =3D xfs_bmbt_lookup_eq(cur, &got, &i); if (error) - goto done; - if (XFS_IS_CORRUPT(mp, i !=3D 1)) { - error =3D -EFSCORRUPTED; - goto done; - } + return error; + if (XFS_IS_CORRUPT(mp, i !=3D 1)) + return -EFSCORRUPTED; /* * Update the btree record back * to the original value. */ error =3D xfs_bmbt_update(cur, &old); if (error) - goto done; + return error; /* * Reset the extent record back * to the original value. */ xfs_iext_update_extent(ip, state, icur, &old); - flags =3D 0; - error =3D -ENOSPC; - goto done; - } - if (XFS_IS_CORRUPT(mp, i !=3D 1)) { - error =3D -EFSCORRUPTED; - goto done; + *logflagsp =3D 0; + return -ENOSPC; } + if (XFS_IS_CORRUPT(mp, i !=3D 1)) + return -EFSCORRUPTED; } else - flags |=3D xfs_ilog_fext(whichfork); + *logflagsp |=3D xfs_ilog_fext(whichfork); =20 ifp->if_nextents++; xfs_iext_next(ifp, icur); @@ -5224,7 +5215,7 @@ xfs_bmap_del_extent_real( ((bflags & XFS_BMAPI_NODISCARD) || del->br_state =3D=3D XFS_EXT_UNWRITTEN)); if (error) - goto done; + return error; } } =20 @@ -5239,9 +5230,7 @@ xfs_bmap_del_extent_real( if (qfield && !(bflags & XFS_BMAPI_REMAP)) xfs_trans_mod_dquot_byino(tp, ip, qfield, (long)-nblks); =20 -done: - *logflagsp =3D flags; - return error; + return 0; } =20 /* --=20 2.20.1