Skip to content

Commit

Permalink
Fix ZPL miswrite of default POSIX ACL
Browse files Browse the repository at this point in the history
Commit 4967a3e introduced a typo that caused the ZPL to store the
intended default ACL as an access ACL. Due to caching this problem
may not become visible until the filesystem is remounted or the inode
is evicted from the cache. Fix the typo and add a regression test.

Fixes openzfs#4520

Signed-off-by: Ned Bass <[email protected]>
  • Loading branch information
nedbass committed Apr 15, 2016
1 parent edd770e commit 830ba79
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 2 deletions.
2 changes: 1 addition & 1 deletion module/zfs/zpl_xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,7 @@ zpl_set_acl(struct inode *ip, int type, struct posix_acl *acl)
break;

case ACL_TYPE_DEFAULT:
name = XATTR_NAME_POSIX_ACL_ACCESS;
name = XATTR_NAME_POSIX_ACL_DEFAULT;
if (!S_ISDIR(ip->i_mode))
return (acl ? -EACCES : 0);
break;
Expand Down
3 changes: 2 additions & 1 deletion tests/zfs-tests/tests/functional/acl/posix/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ dist_pkgdata_SCRIPTS = \
cleanup.ksh \
setup.ksh \
posix_001_pos.ksh \
posix_002_pos.ksh
posix_002_pos.ksh \
posix_003_pos.ksh
61 changes: 61 additions & 0 deletions tests/zfs-tests/tests/functional/acl/posix/posix_003_pos.ksh
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
#!/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
#

. $STF_SUITE/include/libtest.shlib

#
# DESCRIPTION:
# Verify that ACLs survive remount.
# Regression test for https://github.com/zfsonlinux/zfs/issues/4520
#
# STRATEGY:
# 1. Test presence of default and regular ACLs after remount
# a. Can set and list ACL before remount
# b. Can list ACL after remount
#

verify_runnable "both"
log_assert "Verify regular and default POSIX ACLs survive remount"

typeset output=/tmp/zfs-posixacl.$$
typeset acl_str1="^group:zfsgrp:-wx$"
typeset acl_str2="^default:group:zfsgrp:-wx$"
typeset ACLDIR="${TESTDIR}/dir.1"

log_note "Testing access to DIRECTORY"
log_must $MKDIR $ACLDIR
log_must $SETFACL -m g:zfsgrp:wx $ACLDIR
log_must $SETFACL -d -m g:zfsgrp:wx $ACLDIR
$GETFACL $ACLDIR 2> /dev/null | $EGREP -q "${acl_str1}"
if [ "$?" -eq "0" ]; then
$GETFACL $ACLDIR 2> /dev/null | $EGREP -q "${acl_str2}"
fi

if [ "$?" -eq "0" ]; then
log_must $ZFS unmount $TESTPOOL/$TESTFS
log_must $ZFS mount $TESTPOOL/$TESTFS
log_must eval '$GETFACL $ACLDIR 2> /dev/null | $EGREP -q "${acl_str1}"'
log_must eval '$GETFACL $ACLDIR 2> /dev/null | $EGREP -q "${acl_str2}"'
log_pass "POSIX ACLs survive remount"
else
log_fail "Group 'zfsgrp' does not have 'rwx' as specified"
fi

0 comments on commit 830ba79

Please sign in to comment.