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=-6.9 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 autolearn=ham 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 5FA36C28CBC for ; Wed, 6 May 2020 19:43:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 376D720747 for ; Wed, 6 May 2020 19:43:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fW+FWKFy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729404AbgEFTnG (ORCPT ); Wed, 6 May 2020 15:43:06 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:47110 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729402AbgEFTnF (ORCPT ); Wed, 6 May 2020 15:43:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588794183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=L+LdptPr7odBN0XwK7mOZC/pwim6LEcFSqvTIvo0JsM=; b=fW+FWKFy/A6BtRFJS/jQ5KPod2AKs6Yo5T4lqdsSj+9bMPZIaJjXLrxRWdpOhDjU3jC3Mr o3yxGL2biJ1ifQbRqqguGVyoNp/JezIuYCzfg327X4ula8KgylOnXOuh3IgrJUlQrGisKL 6/Mg2l0vGcdJlvgXMcLMJqP7LOfzm4c= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-222-A2OjXgjGN5Wd-BOqXDCqLw-1; Wed, 06 May 2020 15:43:02 -0400 X-MC-Unique: A2OjXgjGN5Wd-BOqXDCqLw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4832C468 for ; Wed, 6 May 2020 19:43:01 +0000 (UTC) Received: from redhat.com (ovpn-113-201.rdu2.redhat.com [10.10.113.201]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D34A95D9DC; Wed, 6 May 2020 19:42:57 +0000 (UTC) Date: Wed, 6 May 2020 14:42:56 -0500 From: Bill O'Donnell To: Eric Sandeen Cc: fstests Subject: Re: [PATCH 3/3 V2] fstests: test restricted file access sysctls Message-ID: <20200506194256.GA156072@redhat.com> References: <99a3164b-ee00-113c-e0aa-41eab9633364@redhat.com> <8e007b9f-9fdb-c9dd-c2b0-dd273d24a517@redhat.com> <646dee70-4758-99cc-6164-36c640126616@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <646dee70-4758-99cc-6164-36c640126616@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org On Wed, May 06, 2020 at 02:29:42PM -0500, Eric Sandeen wrote: > This tests the fs.protected_regular and fs.protected_fifos > sysctls which restrict access behavior in sticky world-writable > directories as documented in the kernel at > Documentation/admin-guide/sysctl/fs.rst > > Signed-off-by: Eric Sandeen > --- > > V2: Don't count on nonzero exit from xfs_io since that is almost > always broken and was only recently fixed and may end up broken > again... collect & check any emitted error messages instead. > > diff --git a/tests/generic/901 b/tests/generic/901 > new file mode 100755 > index 00000000..9bb658e0 > --- /dev/null > +++ b/tests/generic/901 > @@ -0,0 +1,133 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2020 YOUR NAME HERE. All Rights Reserved. > +# > +# FS QA Test 900 > +# > +# Test protected_symlink and protected_hardlink ioctls > +# > +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() > +{ > + rm -rf $TEST_DIR/$seq > + sysctl -qw fs.protected_regular=$REGULAR_PROTECTION > + sysctl -qw fs.protected_fifos=$FIFO_PROTECTION > + cd / > + rm -f $tmp.* > +} > + > +# get standard environment, filters and checks > +. ./common/rc > +. ./common/filter > + > +# remove previous $seqres.full before test > +rm -f $seqres.full > + > +# real QA test starts here > + > +# Modify as appropriate. > +_supported_fs generic > +_supported_os Linux > +_require_test > +_require_sysctl fs.protected_regular > +_require_sysctl fs.protected_fifos > +_require_user fsgqa > +_require_user fsgqa2 > + > +USER1=fsgqa > +USER2=fsgqa2 > + > +# Save current system state to reset when done > +REGULAR_PROTECTION=`sysctl -n fs.protected_regular` > +FIFO_PROTECTION=`sysctl -n fs.protected_fifos` > + > +test_access() > +{ > + FILENAME=$1 > + > + # sticky dir is world & group writable: > + echo "= group & world writable dir" > + chmod og+w $TEST_DIR/$seq/sticky_dir > + # "open -f" opens O_CREAT > + result=`sudo -u $USER2 $XFS_IO_PROG -c "open -f $TEST_DIR/$seq/sticky_dir/$FILENAME" 2>&1` > + if [ -z "$result" ]; then > + echo "successfully opened $FILENAME" > + else > + echo $result | _filter_test_dir > + fi Makes sense, thanks. Reviewed-by: Bill O'Donnell > + # sticky dir is only group writable: > + echo "= only group writable dir" > + chmod o-w $TEST_DIR/$seq/sticky_dir > + result=`sudo -u $USER2 $XFS_IO_PROG -c "open -f $TEST_DIR/$seq/sticky_dir/$FILENAME" 2>&1` > + if [ -z "$result" ]; then > + echo "successfully opened $FILENAME" > + else > + echo $result | _filter_test_dir > + fi > +} > + > +setup_tree() > +{ > + # Create sticky dir owned by $USER2 > + mkdir -p $TEST_DIR/$seq > + mkdir -p $TEST_DIR/$seq/sticky_dir > + chmod 1777 $TEST_DIR/$seq/sticky_dir > + chown $USER2.$USER2 $TEST_DIR/$seq/sticky_dir > + > + # Create file & fifo in that dir owned by $USER1, and open > + # normal read/write privs for world & group > + $XFS_IO_PROG -c "open -f $TEST_DIR/$seq/sticky_dir/file" > + chown $USER1.$USER1 $TEST_DIR/$seq/sticky_dir/file > + chmod o+rw $TEST_DIR/$seq/sticky_dir/file > + > + mkfifo $TEST_DIR/$seq/sticky_dir/fifo > + chown $USER1.$USER1 $TEST_DIR/$seq/sticky_dir/fifo > + chmod o+rw $TEST_DIR/$seq/sticky_dir/fifo > +} > + > +setup_tree > + > +# First test fs.protected_regular > +# With protection set to 1, O_CREAT opens in a world-writable sticky > +# directory should fail if the file exists, is owned by another, and > +# file owner != dir owner > +# > +# With protection set to 2, the same goes for group-writable > +# sticky directories > + > +echo "== Test file open when owned by another and file owner != dir owner" > +sysctl -w fs.protected_regular=0 > +test_access file > +sysctl -w fs.protected_regular=1 > +test_access file > +sysctl -w fs.protected_regular=2 > +test_access file > + > +echo > + > +# Now test fs.protected_fifos > +# With protection set to 1, O_CREAT opens in a world-writable sticky > +# directory should fail if the fifo exists, is owned by another, and > +# file owner != dir owner > +# > +# With protection set to 2, the same goes for group-writable > +# sticky directories > +echo "== Test fifo open when owned by another and fifo owner != dir owner" > +sysctl -w fs.protected_fifos=0 > +test_access fifo > +sysctl -w fs.protected_fifos=1 > +test_access fifo > +sysctl -w fs.protected_fifos=2 > +test_access fifo > + > +# success, all done > +status=0 > +exit > diff --git a/tests/generic/901.out b/tests/generic/901.out > new file mode 100644 > index 00000000..af774ca5 > --- /dev/null > +++ b/tests/generic/901.out > @@ -0,0 +1,34 @@ > +QA output created by 901 > +== Test file open when owned by another and file owner != dir owner > +fs.protected_regular = 0 > += group & world writable dir > +successfully opened file > += only group writable dir > +successfully opened file > +fs.protected_regular = 1 > += group & world writable dir > +TEST_DIR/901/sticky_dir/file: Permission denied > += only group writable dir > +successfully opened file > +fs.protected_regular = 2 > += group & world writable dir > +TEST_DIR/901/sticky_dir/file: Permission denied > += only group writable dir > +TEST_DIR/901/sticky_dir/file: Permission denied > + > +== Test fifo open when owned by another and fifo owner != dir owner > +fs.protected_fifos = 0 > += group & world writable dir > +successfully opened fifo > += only group writable dir > +successfully opened fifo > +fs.protected_fifos = 1 > += group & world writable dir > +TEST_DIR/901/sticky_dir/fifo: Permission denied > += only group writable dir > +successfully opened fifo > +fs.protected_fifos = 2 > += group & world writable dir > +TEST_DIR/901/sticky_dir/fifo: Permission denied > += only group writable dir > +TEST_DIR/901/sticky_dir/fifo: Permission denied > diff --git a/tests/generic/group b/tests/generic/group > index 782b0cc3..d1e529d5 100644 > --- a/tests/generic/group > +++ b/tests/generic/group > @@ -599,3 +599,4 @@ > 595 auto quick encrypt > 596 auto quick > 900 auto quick perms > +901 auto quick perms >