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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_1 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 67A7ECA9EB9 for ; Thu, 24 Oct 2019 00:30:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 21DB12084B for ; Thu, 24 Oct 2019 00:30:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="pZatWsZz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389874AbfJXAa0 (ORCPT ); Wed, 23 Oct 2019 20:30:26 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:50582 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388218AbfJXAa0 (ORCPT ); Wed, 23 Oct 2019 20:30:26 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x9O0Dd84126674; Thu, 24 Oct 2019 00:30:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2019-08-05; bh=KiWCVO5lHwgwj1jwkZOBieeECoBtg+t9+6dFZFLlEsA=; b=pZatWsZzHA3ppM1ctrxKRzrlqkTRvShpAuATlNjJGd/yWYWq9tiXoBpeBAj99uo/Jlyi OPlTtXYxvFhvStBZsthNWVEBQAcEcQp/ufvfj3PwwhU+YfN7zUVVrRP8qd1pxBgNM0Xp 4/V0WpUDIDkNlM94ScnwoME3oLzIXXEwneCvxpR0I/RF1SAZrhqCdUb7DF6NUKTgs5Lv ecxTY5TOWUt5S1LtvA4UrUJXGNo8hxdjio4sD4ZA3qVOAO43wXQZwI/HVDEY1vikR8UF vmVILLbysiTaWHpOoYSYrVYy8tHbXCqpOWMfS9eHmyWPpYPlMPpOhasF0bIFRrg0f6tw PA== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2130.oracle.com with ESMTP id 2vqswtrmvn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 24 Oct 2019 00:30:22 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x9O0DQ4b137118; Thu, 24 Oct 2019 00:30:22 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userp3030.oracle.com with ESMTP id 2vtjkh4rv1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 24 Oct 2019 00:30:22 +0000 Received: from abhmp0020.oracle.com (abhmp0020.oracle.com [141.146.116.26]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x9O0ULQH004564; Thu, 24 Oct 2019 00:30:21 GMT Received: from localhost (/10.159.148.95) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 23 Oct 2019 17:30:21 -0700 Date: Wed, 23 Oct 2019 17:30:20 -0700 From: "Darrick J. Wong" To: Eryu Guan Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: Re: [PATCH 2/2] xfs: make sure the kernel and repair tools catch bad names Message-ID: <20191024003020.GC6706@magnolia> References: <157170897992.1172383.2128928990011336996.stgit@magnolia> <157170899277.1172383.10473571682266133494.stgit@magnolia> <20191023154552.GD2543@desktop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191023154552.GD2543@desktop> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9419 signatures=668684 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1910240000 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9419 signatures=668684 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1910240000 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org On Wed, Oct 23, 2019 at 11:45:57PM +0800, Eryu Guan wrote: > On Mon, Oct 21, 2019 at 06:49:52PM -0700, Darrick J. Wong wrote: > > From: Darrick J. Wong > > > > Make sure we actually catch bad names in the kernel. > > > > Signed-off-by: Darrick J. Wong > > --- > > tests/xfs/749 | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > > tests/xfs/749.out | 4 ++ > > tests/xfs/group | 1 + > > 3 files changed, 108 insertions(+) > > create mode 100755 tests/xfs/749 > > create mode 100644 tests/xfs/749.out > > > > > > diff --git a/tests/xfs/749 b/tests/xfs/749 > > new file mode 100755 > > index 00000000..de219979 > > --- /dev/null > > +++ b/tests/xfs/749 > > @@ -0,0 +1,103 @@ > > +#! /bin/bash > > +# SPDX-License-Identifier: GPL-2.0-or-newer > > +# Copyright (c) 2019, Oracle and/or its affiliates. All Rights Reserved. > > +# > > +# FS QA Test No. 749 > > +# > > +# See if we catch corrupt directory names or attr names with nulls or slashes > > +# in them. > > + > > +seq=`basename $0` > > +seqres=$RESULT_DIR/$seq > > +echo "QA output created by $seq" > > + > > +here=`pwd` > > +tmp=/tmp/$$ > > +status=1 # failure is the default! > > +trap "_cleanup; exit \$status" 0 1 2 3 15 > > + > > +_cleanup() > > +{ > > + cd / > > + umount $mntpt > /dev/null 2>&1 > > $UMOUNT_PROG > > > + test -n "$loopdev" && _destroy_loop_device $loopdev > /dev/null 2>&1 > > + rm -r -f $imgfile $mntpt $tmp.* > > +} > > + > > +# get standard environment, filters and checks > > +. ./common/rc > > +. ./common/filter > > + > > +# real QA test starts here > > +_supported_fs xfs > > +_supported_os Linux > > +_require_test > > _require_attrs is also needed > > > + > > +rm -f $seqres.full > > + > > +imgfile=$TEST_DIR/img-$seq > > +mntpt=$TEST_DIR/mount-$seq > > +testdir=$mntpt/testdir > > +testfile=$mntpt/testfile > > +nullstr="too_many_beans" > > +slashstr="are_bad_for_you" > > + > > +# Format image file > > +truncate -s 40m $imgfile > > $XFS_IO_PROG -fc "truncate 40m" $imgfile > > > +loopdev=$(_create_loop_device $imgfile) > > +$MKFS_XFS_PROG $loopdev >> $seqres.full > > _mkfs_dev $loopdev ? > > > + > > +# Mount image file > > +mkdir -p $mntpt > > +mount $loopdev $mntpt > > _mount $loopdev $mntpt > > > + > > +# Create directory entries > > +mkdir -p $testdir > > +touch $testdir/$nullstr > > +touch $testdir/$slashstr > > + > > +# Create attrs > > +touch $testfile > > +$ATTR_PROG -s $nullstr -V heh $testfile >> $seqres.full > > +$ATTR_PROG -s $slashstr -V heh $testfile >> $seqres.full > > + > > +# Corrupt the entries > > +umount $mntpt > > $UMOUNT_PROG $mntpt > > > +_destroy_loop_device $loopdev > > +cp $imgfile $imgfile.old > > +sed -b \ > > + -e "s/$nullstr/too_many\x00beans/g" \ > > + -e "s/$slashstr/are_bad\/for_you/g" \ > > + -i $imgfile > > +test "$(md5sum < $imgfile)" != "$(md5sum < $imgfile.old)" || > > + _fail "sed failed to change the image file?" > > +rm -f $imgfile.old > > +loopdev=$(_create_loop_device $imgfile) > > +mount $loopdev $mntpt > > _mount $loopdev $mntpt > > > + > > +# Try to access the corrupt metadata > > +ls $testdir >> $seqres.full 2> $tmp.err > > +attr -l $testfile >> $seqres.full 2>> $tmp.err > > $ATTR_PROG > > > +cat $tmp.err | _filter_test_dir > > + > > +# Does scrub complain about this? > > +if _supports_xfs_scrub $mntpt $loopdev; then > > + $XFS_SCRUB_PROG -n $mntpt >> $seqres.full 2>&1 > > + res=$? > > + test $((res & 1)) -eq 0 && \ > > + echo "scrub failed to report corruption ($res)" > > +fi > > + > > +# Does repair complain about this? > > +umount $mntpt > > $UMOUNT_PROG Will fix all of these. > > +$XFS_REPAIR_PROG -n $loopdev >> $seqres.full 2>&1 > > +res=$? > > +test $res -eq 1 || \ > > + echo "repair failed to report corruption ($res)" > > + > > +_destroy_loop_device $loopdev > > +loopdev= > > + > > +# success, all done > > +status=0 > > +exit > > diff --git a/tests/xfs/749.out b/tests/xfs/749.out > > new file mode 100644 > > index 00000000..db704c87 > > --- /dev/null > > +++ b/tests/xfs/749.out > > @@ -0,0 +1,4 @@ > > +QA output created by 749 > > +ls: cannot access 'TEST_DIR/mount-749/testdir': Structure needs cleaning > > +attr_list: Structure needs cleaning > > +Could not list "(null)" for TEST_DIR/mount-749/testfile > > I got the following diff on my fedora 30 test vm, where attr version is > attr-2.4.48-5.fc30.x86_64, perhaps the attr output has been changed? > Looks like we need a filter, or use _getfattr? > > -Could not list "(null)" for TEST_DIR/mount-148/testfile > +Could not list TEST_DIR/mount-148/testfile How about I simply delete the line from the golden output? --D > Thanks, > Eryu > > > diff --git a/tests/xfs/group b/tests/xfs/group > > index f4ebcd8c..9600cb4e 100644 > > --- a/tests/xfs/group > > +++ b/tests/xfs/group > > @@ -507,3 +507,4 @@ > > 509 auto ioctl > > 510 auto ioctl quick > > 511 auto quick quota > > +749 auto quick fuzzers > >