From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793898828; b=L5E2eKi3xbJX0AVKmxZb5KSFfaAh6ytRrClAsq4VIsiRRlLIZAuW/yGb9T2tqaDG+MGM sdRXEJIhi8VNb5uZTgu06S8m2FVsC4QiFBXY1P+qHWzPlexb3NeKqh502yPKRQ+6LYwqp Nha1101KkqWnWAIUVX1tcpMUdsvJTLXNjpD1KhrcDkkyx14XZGGlOyIuXCi5M+9g3Obfp srfW7lOGZ+pIdonf9JcLEVBToccq68oiD3bB0pdI+03hoy0JEOGX0o2cyQOmj3rjQZyIl okS+XC0k8Jv+cl0dQitw9rHYt+keAqACtVdcvI33qvJruLxffFoGC3GJ5IGl+YrKD+Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793898828; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=SoWzIW7bEmjUW7FhBuDi30MWJaVlc04PymSszBYMXww=; b=G+O5uv/sWZu4TRhANTXwiVOMcHRhLPTwnd4bgQUEaP17L++SV3TlL6tUIPUk3qxH8B0G 0khoeHlShjiTR059gujBDykX/icZ0XdEexGhMhhOV3s8blee5s6511/FC7yy+7x2eRJK3 bGKN3Puc0x1j6Df/JhW1TdEREMJFojWnhxDvHtcRofRa94XZtnBkeXFBS13uUc5IKhg2w NBtM3o8SwjO0XaNVveFy4WV1MRsTA3n0UFvukRuSaDeh6oMstZbkRGMq8g1eKAGJGBrZU 8FLQ+XQ3y00Tkvgp+/E7NSYL/XsQrkMZS41mxKzCRlWcftlq+t93stp05L1Wid3WmUg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=UIgzduB7; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA086606A33D for ; Thu, 5 Nov 2026 17:13:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=UIgzduB7 Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC2021F000C1; Thu, 5 Nov 2026 17:13:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793898827; bh=SoWzIW7bEmjUW7FhBuDi30MWJaVlc04PymSszBYMXww=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UIgzduB7GC73T2ulnmKFkgRu5YbV+jvA6vDyfXpDUCYwfJJA0jxZzabP92FTrWKtp MJYRLMTJ6KhKFFsiLN4sM5GxbxKoEuRJ3bQH/c15vwsHQXv9sq4p8P6b6yYnp657O3 fqcAsoWmAUt26hkjxUd/L3HB1Yqix0AiiAlRgsljiCOna7DoEf21jFCA/b+chUA7E9 B+6wEqbzUkClmjHFiHhPrVfBBhCZpVYCKCV68gjD3E/jW6MUQByfJ3TfFEGOVgNTpK hBNZf42t0gv/ryGqE7YPxX7MwbyuAZ6kJdWG7EX+X+gK+b79+rjr5kEnt6F8bW0Dgj 4i1E6JRnNObgA== From: Sasha Levin To: stable@vger.kernel.org Cc: "Darrick J. Wong" , Christoph Hellwig , Carlos Maiolino , Sasha Levin Subject: [PATCH 6.12.y 1/2] xfs: break out xattr entry checks into separate functions Date: Thu, 5 Nov 2026 12:13:44 -0500 Message-ID: <20261105171320.2145841-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026110428-batch-urology-d8d3@gregkh> References: <2026110428-batch-urology-d8d3@gregkh> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Darrick J. Wong" [ Upstream commit 9eb04a6d41c7e474d4665118895c3c2d8e5a2741 ] We're going to add more xattr entry checking code in xchk_xattr_entry so break these out into separate functions so that we don't go crazy indenting. There's a slight behavior change here where we skip updating the usedmap if we've decided the xattr structure is corrupt. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Carlos Maiolino Stable-dep-of: 91c41f952490 ("xfs: check for buffer overruns when examining local/remote xattr entries") Signed-off-by: Sasha Levin --- fs/xfs/scrub/attr.c | 90 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 68 insertions(+), 22 deletions(-) diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c index 7315d0cb1e2e7..84507c80cf945 100644 --- a/fs/xfs/scrub/attr.c +++ b/fs/xfs/scrub/attr.c @@ -293,6 +293,66 @@ xchk_xattr_set_map( return ret; } +static unsigned int +xchk_xattr_local_entry( + struct xchk_da_btree *ds, + int level, + char *buf_end, + struct xfs_attr_leafblock *leaf, + int idx) +{ + struct xfs_attr_leaf_name_local *lentry = + xfs_attr3_leaf_name_local(leaf, idx); + char *name_end; + unsigned int namesize; + + namesize = xfs_attr_leaf_entsize_local(lentry->namelen, + be16_to_cpu(lentry->valuelen)); + name_end = (char *)lentry + namesize; + if (lentry->namelen == 0) { + xchk_da_set_corrupt(ds, level); + return 0; + } + if (name_end > buf_end) { + xchk_da_set_corrupt(ds, level); + return 0; + } + + return namesize; +} + +static unsigned int +xchk_xattr_remote_entry( + struct xchk_da_btree *ds, + int level, + char *buf_end, + struct xfs_attr_leafblock *leaf, + int idx, + struct xfs_attr_leaf_entry *ent) +{ + struct xfs_attr_leaf_name_remote *rentry = + xfs_attr3_leaf_name_remote(leaf, idx); + char *name_end; + unsigned int namesize; + + namesize = xfs_attr_leaf_entsize_remote(rentry->namelen); + name_end = (char *)rentry + namesize; + if (rentry->namelen == 0) { + xchk_da_set_corrupt(ds, level); + return 0; + } + if (rentry->valueblk == 0 && !(ent->flags & XFS_ATTR_INCOMPLETE)) { + xchk_da_set_corrupt(ds, level); + return 0; + } + if (name_end > buf_end) { + xchk_da_set_corrupt(ds, level); + return 0; + } + + return namesize; +} + /* * Check this leaf entry's relations to everything else. * Returns the number of bytes used for the name/value data. @@ -311,9 +371,6 @@ xchk_xattr_entry( { struct xfs_mount *mp = ds->state->mp; struct xchk_xattr_buf *ab = ds->sc->buf; - char *name_end; - struct xfs_attr_leaf_name_local *lentry; - struct xfs_attr_leaf_name_remote *rentry; unsigned int nameidx; unsigned int namesize; @@ -333,25 +390,14 @@ xchk_xattr_entry( } /* Check the name information. */ - if (ent->flags & XFS_ATTR_LOCAL) { - lentry = xfs_attr3_leaf_name_local(leaf, idx); - namesize = xfs_attr_leaf_entsize_local(lentry->namelen, - be16_to_cpu(lentry->valuelen)); - name_end = (char *)lentry + namesize; - if (lentry->namelen == 0) - xchk_da_set_corrupt(ds, level); - } else { - rentry = xfs_attr3_leaf_name_remote(leaf, idx); - namesize = xfs_attr_leaf_entsize_remote(rentry->namelen); - name_end = (char *)rentry + namesize; - if (rentry->namelen == 0) - xchk_da_set_corrupt(ds, level); - if (rentry->valueblk == 0 && - !(ent->flags & XFS_ATTR_INCOMPLETE)) - xchk_da_set_corrupt(ds, level); - } - if (name_end > buf_end) - xchk_da_set_corrupt(ds, level); + if (ent->flags & XFS_ATTR_LOCAL) + namesize = xchk_xattr_local_entry(ds, level, buf_end, leaf, + idx); + else + namesize = xchk_xattr_remote_entry(ds, level, buf_end, leaf, + idx, ent); + if (!namesize) + return; if (!xchk_xattr_set_map(ds->sc, ab->usedmap, nameidx, namesize)) xchk_da_set_corrupt(ds, level); -- 2.53.0