From patchwork Mon Apr 11 22:54:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 12809750 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 875DBC433F5 for ; Mon, 11 Apr 2022 22:54:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350477AbiDKW5L (ORCPT ); Mon, 11 Apr 2022 18:57:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350475AbiDKW5L (ORCPT ); Mon, 11 Apr 2022 18:57:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6421BE013; Mon, 11 Apr 2022 15:54:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F3FDE61777; Mon, 11 Apr 2022 22:54:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AE99C385A4; Mon, 11 Apr 2022 22:54:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649717694; bh=MVAzYufKDJ7M/w3FluUtjlrHb4+oED2PRGEOkqEGXuk=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=kgpRfuu41MjI0UGpUiPrWFqsIuhu+6wIzw2v09OMf5nJbV4h8Ly157yYpjH6xOltw RAVBeCYO+hZOX3L7c8vVAEzdet/Xy8s2enuu1EXYcRKLpx9q46876IslFAI3yTFt+u 8sKztoEIWJhcEplUEM7kCZ3l4pTAB9lHgiJCgR/KB/EaYqAXLEYT/YW5JYFQDOeSIz wtK5EfsyXczWBClelEpLUSx2Jlx2jNo70vZxVgqG+lQahOmz8dvoMZyT51Z+d1S+O5 i4kV5wBnjfAJI3w6wNSqOu/WpZSrMtKcLmHYHMLciaM7AAzLrUVUScpoSLVh9hQ2yV HYBF8/j3DpRFg== Subject: [PATCH 4/4] generic: test that renaming into a directory fails with EDQUOT From: "Darrick J. Wong" To: djwong@kernel.org, guaneryu@gmail.com, zlang@redhat.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me Date: Mon, 11 Apr 2022 15:54:54 -0700 Message-ID: <164971769398.169983.1284630275364529313.stgit@magnolia> In-Reply-To: <164971767143.169983.12905331894414458027.stgit@magnolia> References: <164971767143.169983.12905331894414458027.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Darrick J. Wong 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 Reviewed-by: Zorro Lang --- 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 | \ + _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