From patchwork Thu Sep 14 12:04:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Yi X-Patchwork-Id: 9952911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0045560230 for ; Thu, 14 Sep 2017 11:59:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DEB6028F83 for ; Thu, 14 Sep 2017 11:59:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D033228F98; Thu, 14 Sep 2017 11:59:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3922828889 for ; Thu, 14 Sep 2017 11:59:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751807AbdINL72 (ORCPT ); Thu, 14 Sep 2017 07:59:28 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:6057 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751804AbdINL72 (ORCPT ); Thu, 14 Sep 2017 07:59:28 -0400 Received: from 172.30.72.59 (EHLO DGGEMS402-HUB.china.huawei.com) ([172.30.72.59]) by dggrg05-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id DHH26113; Thu, 14 Sep 2017 19:59:24 +0800 (CST) Received: from 138.huawei.com (10.175.124.28) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server (TLS) id 14.3.301.0; Thu, 14 Sep 2017 19:59:15 +0800 From: "zhangyi (F)" To: CC: , , , , , Subject: [PATCH xfstests 2/2] overlay: test chattr lower file in overlay Date: Thu, 14 Sep 2017 20:04:03 +0800 Message-ID: <1505390643-6981-2-git-send-email-yi.zhang@huawei.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1505390643-6981-1-git-send-email-yi.zhang@huawei.com> References: <1505390643-6981-1-git-send-email-yi.zhang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.28] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.59BA6F1C.014A, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 30b3852b547d92e30361d39f6ea7737b Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP chattr with [iap..] attributes open file for read-only and invoke ioctl(). If we chattr a lower file in overlay, it will get the lower file but not trigger copy-up, so ioctl() lead to modification of that lower file incorrectly. Add this test for this case. Signed-off-by: zhangyi (F) --- tests/overlay/040 | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/040.out | 2 ++ tests/overlay/group | 1 + 3 files changed, 92 insertions(+) create mode 100755 tests/overlay/040 create mode 100644 tests/overlay/040.out diff --git a/tests/overlay/040 b/tests/overlay/040 new file mode 100755 index 0000000..4d0c7ef --- /dev/null +++ b/tests/overlay/040 @@ -0,0 +1,89 @@ +#! /bin/bash +# FS QA Test 040 +# +# chattr with [iap..] attributes open file for read-only and +# invoke ioctl(). If we chattr a lower file in overlay, it +# will get the lower file but not trigger copy-up, so ioctl() +# lead to modification of that lower file. +# +# Upstream Commit 7c6893e3c9ab ("ovl: don't allow writing +# ioctl on lower layer") return EPERM for this case to avoid +# this issue. +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 Huawei. All Rights Reserved. +# Author: zhangyi (F) +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +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 / + $CHATTR_PROG -i $lowerdir/foo + 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 +_supported_fs overlay +_supported_os Linux +_require_scratch +_require_chattr i + +# remove all files from previous runs +_scratch_mkfs + +# prepare lower test file +lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER +mkdir -p $lowerdir +touch $lowerdir/foo + +# mounting overlay +_scratch_mount + +# Try to add immutable attributes in overlay, it will +# open file for read-only and invoke ioctl(), it should not +# modify lower origin file. +$CHATTR_PROG +i $SCRATCH_MNT/foo > /dev/null 2>&1 + +$UMOUNT_PROG $SCRATCH_MNT + +# touching origin file in lower, should succeed +touch $lowerdir/foo > /dev/null 2>&1 + +if [ $? -ne 0 ]; then + echo "Test Fail, immutable attributes is modified in lower." +fi + +# success, all done +echo "Silence is golden" +status=0 +exit diff --git a/tests/overlay/040.out b/tests/overlay/040.out new file mode 100644 index 0000000..9e3d4d9 --- /dev/null +++ b/tests/overlay/040.out @@ -0,0 +1,2 @@ +QA output created by 040 +Silence is golden diff --git a/tests/overlay/group b/tests/overlay/group index 39177c4..4cd4af1 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -42,3 +42,4 @@ 037 auto quick mount 038 auto quick copyup 039 auto quick +040 auto quick