Linux: Initialize zp in zfs_setattr_dir
The value of zp is used without having been initialized under some conditions. Initialize the pointer to NULL. Add a regression test case using chown in acl/posix. However, this is not enough because the setup sets xattr=sa, which means zfs_setattr_dir will not be called. Create a second group of acl tests in acl/posix-sa duplicating the acl/posix tests with symlinks, and remove xattr=sa from the original acl/posix tests. This provides more coverage for the default xattr=on code. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Closes #10043 Closes #11025
This commit is contained in:
parent
46c71074ca
commit
5e7198b873
|
@ -237,6 +237,7 @@ AC_CONFIG_FILES([
|
||||||
tests/zfs-tests/tests/functional/Makefile
|
tests/zfs-tests/tests/functional/Makefile
|
||||||
tests/zfs-tests/tests/functional/acl/Makefile
|
tests/zfs-tests/tests/functional/acl/Makefile
|
||||||
tests/zfs-tests/tests/functional/acl/posix/Makefile
|
tests/zfs-tests/tests/functional/acl/posix/Makefile
|
||||||
|
tests/zfs-tests/tests/functional/acl/posix-sa/Makefile
|
||||||
tests/zfs-tests/tests/functional/alloc_class/Makefile
|
tests/zfs-tests/tests/functional/alloc_class/Makefile
|
||||||
tests/zfs-tests/tests/functional/arc/Makefile
|
tests/zfs-tests/tests/functional/arc/Makefile
|
||||||
tests/zfs-tests/tests/functional/atime/Makefile
|
tests/zfs-tests/tests/functional/atime/Makefile
|
||||||
|
|
|
@ -1794,7 +1794,7 @@ on platforms which do not support the
|
||||||
feature.
|
feature.
|
||||||
.Pp
|
.Pp
|
||||||
The use of system attribute based xattrs is strongly encouraged for users of
|
The use of system attribute based xattrs is strongly encouraged for users of
|
||||||
SELinux or POSIX ACLs. Both of these features heavily rely of extended
|
SELinux or POSIX ACLs. Both of these features heavily rely on extended
|
||||||
attributes and benefit significantly from the reduced access time.
|
attributes and benefit significantly from the reduced access time.
|
||||||
.Pp
|
.Pp
|
||||||
The values
|
The values
|
||||||
|
|
|
@ -2543,7 +2543,7 @@ zfs_setattr_dir(znode_t *dzp)
|
||||||
zap_cursor_t zc;
|
zap_cursor_t zc;
|
||||||
zap_attribute_t zap;
|
zap_attribute_t zap;
|
||||||
zfs_dirlock_t *dl;
|
zfs_dirlock_t *dl;
|
||||||
znode_t *zp;
|
znode_t *zp = NULL;
|
||||||
dmu_tx_t *tx = NULL;
|
dmu_tx_t *tx = NULL;
|
||||||
uint64_t uid, gid;
|
uint64_t uid, gid;
|
||||||
sa_bulk_attr_t bulk[4];
|
sa_bulk_attr_t bulk[4];
|
||||||
|
|
|
@ -23,9 +23,13 @@ outputdir = /var/tmp/test_results
|
||||||
tags = ['functional']
|
tags = ['functional']
|
||||||
|
|
||||||
[tests/functional/acl/posix:Linux]
|
[tests/functional/acl/posix:Linux]
|
||||||
tests = ['posix_001_pos', 'posix_002_pos', 'posix_003_pos']
|
tests = ['posix_001_pos', 'posix_002_pos', 'posix_003_pos', 'posix_004_pos']
|
||||||
tags = ['functional', 'acl', 'posix']
|
tags = ['functional', 'acl', 'posix']
|
||||||
|
|
||||||
|
[tests/functional/acl/posix-sa:Linux]
|
||||||
|
tests = ['posix_001_pos', 'posix_002_pos', 'posix_003_pos', 'posix_004_pos']
|
||||||
|
tags = ['functional', 'acl', 'posix-sa']
|
||||||
|
|
||||||
[tests/functional/atime:Linux]
|
[tests/functional/atime:Linux]
|
||||||
tests = ['atime_003_pos', 'root_relatime_on']
|
tests = ['atime_003_pos', 'root_relatime_on']
|
||||||
tags = ['functional', 'atime']
|
tags = ['functional', 'atime']
|
||||||
|
|
|
@ -3,4 +3,4 @@ dist_pkgdata_DATA = \
|
||||||
acl.cfg \
|
acl.cfg \
|
||||||
acl_common.kshlib
|
acl_common.kshlib
|
||||||
|
|
||||||
SUBDIRS = posix
|
SUBDIRS = posix posix-sa
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/acl/posix-sa
|
||||||
|
dist_pkgdata_SCRIPTS = \
|
||||||
|
cleanup.ksh \
|
||||||
|
setup.ksh \
|
||||||
|
posix_001_pos.ksh \
|
||||||
|
posix_002_pos.ksh \
|
||||||
|
posix_003_pos.ksh \
|
||||||
|
posix_004_pos.ksh
|
|
@ -0,0 +1,33 @@
|
||||||
|
#!/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 2007 Sun Microsystems, Inc. All rights reserved.
|
||||||
|
# Use is subject to license terms.
|
||||||
|
#
|
||||||
|
|
||||||
|
. $STF_SUITE/include/libtest.shlib
|
||||||
|
. $STF_SUITE/tests/functional/acl/acl_common.kshlib
|
||||||
|
|
||||||
|
cleanup_user_group
|
||||||
|
|
||||||
|
default_cleanup
|
|
@ -0,0 +1 @@
|
||||||
|
../posix/posix_001_pos.ksh
|
|
@ -0,0 +1 @@
|
||||||
|
../posix/posix_002_pos.ksh
|
|
@ -0,0 +1 @@
|
||||||
|
../posix/posix_003_pos.ksh
|
|
@ -0,0 +1 @@
|
||||||
|
../posix/posix_004_pos.ksh
|
|
@ -0,0 +1,52 @@
|
||||||
|
#!/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 2007 Sun Microsystems, Inc. All rights reserved.
|
||||||
|
# Use is subject to license terms.
|
||||||
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# Copyright (c) 2016 by Delphix. All rights reserved.
|
||||||
|
#
|
||||||
|
|
||||||
|
. $STF_SUITE/include/libtest.shlib
|
||||||
|
. $STF_SUITE/tests/functional/acl/acl_common.kshlib
|
||||||
|
|
||||||
|
log_must getfacl --version
|
||||||
|
log_must setfacl --version
|
||||||
|
|
||||||
|
cleanup_user_group
|
||||||
|
|
||||||
|
# Create staff group and add user to it
|
||||||
|
log_must add_group $ZFS_ACL_STAFF_GROUP
|
||||||
|
log_must add_user $ZFS_ACL_STAFF_GROUP $ZFS_ACL_STAFF1
|
||||||
|
|
||||||
|
DISK=${DISKS%% *}
|
||||||
|
default_setup_noexit $DISK
|
||||||
|
log_must chmod 777 $TESTDIR
|
||||||
|
|
||||||
|
# Use POSIX ACLs on filesystem
|
||||||
|
log_must zfs set acltype=posix $TESTPOOL/$TESTFS
|
||||||
|
log_must zfs set xattr=sa $TESTPOOL/$TESTFS
|
||||||
|
|
||||||
|
log_pass
|
|
@ -4,4 +4,5 @@ dist_pkgdata_SCRIPTS = \
|
||||||
setup.ksh \
|
setup.ksh \
|
||||||
posix_001_pos.ksh \
|
posix_001_pos.ksh \
|
||||||
posix_002_pos.ksh \
|
posix_002_pos.ksh \
|
||||||
posix_003_pos.ksh
|
posix_003_pos.ksh \
|
||||||
|
posix_004_pos.ksh
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
#!/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
|
||||||
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# Portions Copyright 2020 iXsystems, Inc.
|
||||||
|
#
|
||||||
|
|
||||||
|
. $STF_SUITE/include/libtest.shlib
|
||||||
|
. $STF_SUITE/tests/functional/acl/acl_common.kshlib
|
||||||
|
|
||||||
|
#
|
||||||
|
# DESCRIPTION:
|
||||||
|
# Verify chown works with POSIX ACLs.
|
||||||
|
# Regression test for https://github.com/openzfs/zfs/issues/10043
|
||||||
|
#
|
||||||
|
# STRATEGY:
|
||||||
|
# 1. Prepare an appropriate ACL on the test directory
|
||||||
|
# 2. Change the owner of the directory
|
||||||
|
#
|
||||||
|
|
||||||
|
verify_runnable "both"
|
||||||
|
log_assert "Verify chown works with POSIX ACLs"
|
||||||
|
|
||||||
|
log_must setfacl -d -m u:$ZFS_ACL_STAFF1:rwx $TESTDIR
|
||||||
|
log_must setfacl -b $TESTDIR
|
||||||
|
|
||||||
|
log_must chown $ZFS_ACL_STAFF1 $TESTDIR
|
||||||
|
log_must chown 0 $TESTDIR
|
||||||
|
|
||||||
|
log_pass "chown works with POSIX ACLs"
|
|
@ -47,6 +47,5 @@ log_must chmod 777 $TESTDIR
|
||||||
|
|
||||||
# Use POSIX ACLs on filesystem
|
# Use POSIX ACLs on filesystem
|
||||||
log_must zfs set acltype=posix $TESTPOOL/$TESTFS
|
log_must zfs set acltype=posix $TESTPOOL/$TESTFS
|
||||||
log_must zfs set xattr=sa $TESTPOOL/$TESTFS
|
|
||||||
|
|
||||||
log_pass
|
log_pass
|
||||||
|
|
Loading…
Reference in New Issue