On Mon, Apr 11, 2022 at 03:54:54PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@xxxxxxxxxx>
>
> Add a regression test to make sure that unprivileged userspace renaming
> within a directory fails with EDQUOT when the directory quota limits have
> been exceeded.
>
> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> ---
> tests/generic/833 | 71 +++++++++++++++++++++++++++++++++++++++++++++++++
> tests/generic/833.out | 3 ++
> 2 files changed, 74 insertions(+)
> create mode 100755 tests/generic/833
> create mode 100644 tests/generic/833.out
>
>
> diff --git a/tests/generic/833 b/tests/generic/833
> new file mode 100755
> index 00000000..a1b3cbc0
> --- /dev/null
> +++ b/tests/generic/833
> @@ -0,0 +1,71 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (c) 2022 Oracle. All Rights Reserved.
> +#
> +# FS QA Test No. 833
> +#
> +# Ensure that unprivileged userspace hits EDQUOT while moving files into a
> +# directory when the directory's quota limits have been exceeded.
> +#
> +# Regression test for commit:
> +#
> +# 41667260bc84 ("xfs: reserve quota for target dir expansion when renaming files")
> +#
> +. ./common/preamble
> +_begin_fstest auto quick quota
> +
> +# Import common functions.
> +. ./common/filter
> +. ./common/quota
> +
> +# real QA test starts here
> +
> +# Modify as appropriate.
> +_supported_fs generic
> +_require_quota
> +_require_user
> +_require_scratch
> +
> +_scratch_mkfs > "$seqres.full" 2>&1
> +_qmount_option usrquota
> +_qmount
> +
> +blocksize=$(_get_block_size $SCRATCH_MNT)
> +scratchdir=$SCRATCH_MNT/dir
> +scratchfile=$SCRATCH_MNT/file
> +stagedir=$SCRATCH_MNT/staging
> +mkdir $scratchdir $stagedir
> +touch $scratchfile
> +
> +# Create a 2-block directory for our 1-block quota limit
> +total_size=$((blocksize * 2))
> +dirents=$((total_size / 255))
> +
> +for ((i = 0; i < dirents; i++)); do
> + name=$(printf "x%0254d" $i)
> + ln $scratchfile $scratchdir/$name
> +done
> +
> +# Set a low quota hardlimit for an unprivileged uid and chown the files to it
> +echo "set up quota" >> $seqres.full
> +setquota -u $qa_user 0 "$((blocksize / 1024))" 0 0 $SCRATCH_MNT
> +chown $qa_user $scratchdir $scratchfile
> +repquota -upn $SCRATCH_MNT >> $seqres.full
> +
> +# Fail at renaming into the directory as qa_user to ensure quota enforcement
> +# works
> +chmod a+rwx $stagedir
> +echo "fail quota" >> $seqres.full
> +for ((i = 0; i < dirents; i++)); do
> + name=$(printf "y%0254d" $i)
> + ln $scratchfile $stagedir/$name
> + su - "$qa_user" -c "mv $stagedir/$name $scratchdir/$name" 2>&1 | \
Same as [PATCH 3/4], do we need "--login"?
Oh, I just found there's only one case generic/128 use this option too. Anyway I
have no reason to object it, just speak out for review:)
Thanks,
Zorro
> + _filter_scratch | sed -e 's/y[0-9]*/yXXX/g'
> + test "${PIPESTATUS[0]}" -ne 0 && break
> +done
> +repquota -upn $SCRATCH_MNT >> $seqres.full
> +
> +# success, all done
> +echo Silence is golden
> +status=0
> +exit
> diff --git a/tests/generic/833.out b/tests/generic/833.out
> new file mode 100644
> index 00000000..d100fa07
> --- /dev/null
> +++ b/tests/generic/833.out
> @@ -0,0 +1,3 @@
> +QA output created by 833
> +mv: cannot move 'SCRATCH_MNT/staging/yXXX' to 'SCRATCH_MNT/dir/yXXX': Disk quota exceeded
> +Silence is golden
>
