From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 513F84D2EFD for ; Tue, 21 Jul 2026 15:00:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784646041; cv=none; b=sz5WZXL44m6DiBAZcV2/f3SrTY91zbKHxY4CsKfzGH3RCwJF00guvhPiHFm9alHpifKf+7gYI58O7i4u9va2mFI8aUlSlAO8h4dRR25ZiKEvBG6KTpt45omqge5A+JomD3/5xiWnftYzVRzE38cr0vQs16R0EvCubjzMuDRoAaM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784646041; c=relaxed/simple; bh=/YrybYQsGozpnszQC9d+lXLd3abzHsYTtrsJr4pg6C4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=XHObtCDM78N/j/82BwULhVLuAEaxUwwbh0lZnCSFX5xLajNPcSe8zWbi+XUnnCP2XAeZTJTDJEcYv+6Wji8r7945krrTOwhDB44aD+UNyBAQsbPO0YZhupQMstMbWQRlfmeAivtN/e69q+FKeNu7G2XRr8B6OOAXQ335LegSQp4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WvzP8/xs; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WvzP8/xs" Received: by smtp.kernel.org (Postfix) with UTF8SMTPSA id DB89D1F000E9; Tue, 21 Jul 2026 15:00:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784646040; bh=oinVK/zhkRuY47DDo/XQnXQN9UPV8927aECbkTeeyW0=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=WvzP8/xsIvA7Qv8ImjVoBPMwVpGdvmrhccuSWHTCHTrOBQMr5VBRWadtY1aIouzTh WGaeR6ZSg1OpeVFrp5FeUIvgOB6Z7OYbf6UHalrVbrtKhUhE5EqalkrszKlhTvBqrU AnFaWq/zgtxSY4EFUz31gjZy0PVE99oLpnjHe7vGKVNnpeKmMi1VGBuTz0uz1D/eqo Zvm0h1da57cmJzfXwuK0KDqkXhJtudhZxlMoHGmemXro7A8egMez52wU3yny4xaHzy rHzu0cJqJZjDiJpMq5LXgHAfumSAA1ra+ZTrnOZFkKipnfjky7/vmLGpYlmfLZuFtj AamUTLx0NCF5A== Date: Tue, 21 Jul 2026 08:00:39 -0700 From: "Darrick J. Wong" To: Avinesh Kumar Cc: zlang@kernel.org, fstests@vger.kernel.org Subject: Re: [PATCH v3] common: strip attr 2.6.0 --restore safety warnings Message-ID: <20260721150039.GP7398@frogsfrogsfrogs> References: <20260721102059.93453-1-avinesh.kumar@suse.com> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260721102059.93453-1-avinesh.kumar@suse.com> On Tue, Jul 21, 2026 at 12:20:59PM +0200, Avinesh Kumar wrote: > From: Avinesh Kumar > > attr 2.6.0 (CVE-2026-54371 hardening) makes "setfattr --restore" print a > warning to stderr when options -P and -h are not given, claiming it may > traverse or dereference symlinks in the dump's pathnames [0]. This warning > leaks into test output and breaks generic/062 and xfs/083 (via > _scratch_populate). > > Add a _setfattr_restore helper that takes the restore source as its first > argument, filters out just the expected warning line, and preserves any > other (unexpected) stderr. Convert the callers in common/populate, > common/overlay and generic/062 to use it. > > [0] https://cgit.git.savannah.nongnu.org/cgit/attr.git/commit/?id=3fb06b9ba314d37035d0877e6de313de754f1ac8 > > Suggested-by: Darrick J. Wong > Signed-off-by: Avinesh Kumar > --- > common/overlay | 2 +- > common/populate | 4 ++-- > common/rc | 15 +++++++++++++++ > tests/generic/062 | 2 +- > 4 files changed, 19 insertions(+), 4 deletions(-) > > diff --git a/common/overlay b/common/overlay > index d32f3219..8e89d6e4 100644 > --- a/common/overlay > +++ b/common/overlay > @@ -494,7 +494,7 @@ _overlay_trusted_to_user() > local dir=$1 > > for file in `find $dir`; do > - _getfattr --absolute-names -d -m '^trusted.overlay.(redirect|metacopy)$' $file | sed 's/^trusted/user/' | $SETFATTR_PROG --restore=- > + _getfattr --absolute-names -d -m '^trusted.overlay.(redirect|metacopy)$' $file | sed 's/^trusted/user/' | _setfattr_restore - > for xattr in `_getfattr --absolute-names -d -m '^trusted.overlay.' $file | tail -n +2 | cut -d= -f1`; do > $SETFATTR_PROG -x $xattr $file; > done > diff --git a/common/populate b/common/populate > index 1c0dd03e..f3672c1a 100644 > --- a/common/populate > +++ b/common/populate > @@ -151,7 +151,7 @@ __populate_create_attr() { > echo "# file: ${name}"; > seq --format "user.%08g=\"abcdefgh\"" 0 "${nr}" > echo > - ) | setfattr --restore - > + ) | _setfattr_restore - > > test -z "${missing}" && return > seq 1 2 "${nr}" | while read d; do > @@ -200,7 +200,7 @@ __populate_xfs_create_btree_attr() { > seq --format "user.%08g=\"abcdefgh\"" "${nr}" "$((nr + incr + 1))" > echo "user.v$(printf "%.08d" "$nr")=\"${bigval}\"" > echo > - ) | setfattr --restore - > + ) | _setfattr_restore - > done > > # ... and in the second loop we delete all the remote attrs to > diff --git a/common/rc b/common/rc > index 79189e7e..38b77bef 100644 > --- a/common/rc > +++ b/common/rc > @@ -132,6 +132,21 @@ _test_fsxattr_xflag() > grep -q "fsxattr.xflags.*\[.*$2.*\]" <($XFS_IO_PROG -c "stat -v" "$1") > } > > +# Restore xattrs from a getfattr-style dump given as $1 (a dump file, or "-" > +# for stdin); any extra setfattr options follow. attr 2.6.0 (CVE-2026-54371) > +# makes --restore warn unless both -P and -h are given, so filter out just > +# those warning lines, keep other unexpected stderr. > +_setfattr_restore() > +{ > + local restore_from="$1" > + shift > + > + $SETFATTR_PROG "$@" --restore="$restore_from" 2> $tmp.setfattr > + local ret=$? > + sed -e '/--restore=.*unsafe.*without/d' "$tmp.setfattr" 1>&2 > + return $ret > +} Looks good to me, Reviewed-by: "Darrick J. Wong" --D > + > # This test requires extsize support on the filesystem > _require_scratch_extsize() > { > diff --git a/tests/generic/062 b/tests/generic/062 > index 89659040..845d62f2 100755 > --- a/tests/generic/062 > +++ b/tests/generic/062 > @@ -186,7 +186,7 @@ _create_test_bed > _extend_test_bed > > echo "*** restore everything" > -setfattr -h --restore=$tmp.backup1 > +_setfattr_restore "$tmp.backup1" -h 2>&1 | _filter_scratch > _backup $tmp.backup2 > > echo "AFTER RESTORE" >>$seqres.full > -- > 2.55.0 >