From 92e43c17188d47f47b69318e4884096dec380e36 Mon Sep 17 00:00:00 2001 From: LOLi Date: Fri, 7 Jul 2017 19:39:53 +0200 Subject: [PATCH] Fix 'zpool clear' on readonly pools Illumos 4080 inadvertently allows 'zpool clear' on readonly pools: fix this by reintroducing a check (POOL_CHECK_READONLY) in zfs_ioc_clear registration code. Signed-off-by: Giuseppe Di Natale Signed-off-by: Brian Behlendorf Signed-off-by: loli10K Closes #6306 --- module/zfs/zfs_ioctl.c | 2 +- tests/runfiles/linux.run | 3 +- .../cli_root/zpool_clear/Makefile.am | 3 +- .../zpool_clear/zpool_clear_readonly.ksh | 71 +++++++++++++++++++ 4 files changed, 76 insertions(+), 3 deletions(-) create mode 100755 tests/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_readonly.ksh diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index acdfba173..d56049931 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -6163,7 +6163,7 @@ zfs_ioctl_init(void) zfs_secpolicy_config, B_TRUE, POOL_CHECK_NONE); zfs_ioctl_register_pool(ZFS_IOC_CLEAR, zfs_ioc_clear, - zfs_secpolicy_config, B_TRUE, POOL_CHECK_NONE); + zfs_secpolicy_config, B_TRUE, POOL_CHECK_READONLY); zfs_ioctl_register_pool(ZFS_IOC_POOL_REOPEN, zfs_ioc_pool_reopen, zfs_secpolicy_config, B_TRUE, POOL_CHECK_SUSPENDED); diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run index e10ec4dc2..c7eb9cf81 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -200,7 +200,8 @@ tests = ['zpool_add_001_pos', 'zpool_add_002_pos', 'zpool_add_003_pos', tests = ['zpool_attach_001_neg', 'attach-o_ashift'] [tests/functional/cli_root/zpool_clear] -tests = ['zpool_clear_001_pos', 'zpool_clear_002_neg', 'zpool_clear_003_neg'] +tests = ['zpool_clear_001_pos', 'zpool_clear_002_neg', 'zpool_clear_003_neg', + 'zpool_clear_readonly'] [tests/functional/cli_root/zpool_create] tests = ['zpool_create_001_pos', 'zpool_create_002_pos', diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.am index 1d9a719f0..cfd4534c9 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.am @@ -5,4 +5,5 @@ dist_pkgdata_SCRIPTS = \ cleanup.ksh \ zpool_clear_001_pos.ksh \ zpool_clear_002_neg.ksh \ - zpool_clear_003_neg.ksh + zpool_clear_003_neg.ksh \ + zpool_clear_readonly.ksh diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_readonly.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_readonly.ksh new file mode 100755 index 000000000..9eb2a3608 --- /dev/null +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_readonly.ksh @@ -0,0 +1,71 @@ +#!/bin/ksh -p +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2017, loli10K . All rights reserved. +# + +. $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/cli_root/zpool_clear/zpool_clear.cfg + +# +# DESCRIPTION: +# Verify 'zpool clear' cannot be used on readonly pools. +# +# STRATEGY: +# 1. Create a pool. +# 2. Export the pool and import it readonly. +# 3. Verify 'zpool clear' on the pool (and each device) returns an error. +# + +verify_runnable "global" + +function cleanup +{ + destroy_pool $TESTPOOL1 + rm -f $TESTDIR/file.* +} + +log_assert "Verify 'zpool clear' cannot be used on readonly pools." +log_onexit cleanup + +# 1. Create a pool. +log_must truncate -s $FILESIZE $TESTDIR/file.{1,2,3} +log_must zpool create $TESTPOOL1 raidz $TESTDIR/file.* + +# 2. Export the pool and import it readonly. +log_must zpool export $TESTPOOL1 +log_must zpool import -d $TESTDIR -o readonly=on $TESTPOOL1 +if [[ "$(get_pool_prop readonly $TESTPOOL1)" != 'on' ]]; then + log_fail "Pool $TESTPOOL1 was not imported readonly." +fi + +# 3. Verify 'zpool clear' on the pool (and each device) returns an error. +log_mustnot zpool clear $TESTPOOL1 +for i in {1..3}; do + # Device must be online + log_must check_state $TESTPOOL1 $TESTDIR/file.$i 'online' + # Device cannot be cleared if the pool was imported readonly + log_mustnot zpool clear $TESTPOOL1 $TESTDIR/file.$i +done + +log_pass "'zpool clear' fails on readonly pools as expected."