From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030509AbXBLXqw (ORCPT ); Mon, 12 Feb 2007 18:46:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030508AbXBLXqV (ORCPT ); Mon, 12 Feb 2007 18:46:21 -0500 Received: from cantor2.suse.de ([195.135.220.15]:55186 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030518AbXBLXpo (ORCPT ); Mon, 12 Feb 2007 18:45:44 -0500 From: NeilBrown To: Andrew Morton Date: Tue, 13 Feb 2007 10:45:07 +1100 Message-Id: <1070212234507.29358@suse.de> X-face: [Gw_3E*Gng}4rRrKRYotwlE?.2|**#s9D Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: J. Bruce Fields When setting an ACL that lacks inheritable ACEs on a directory, we should set a default ACL of zero length, not a default ACL with all bits denied. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown ### Diffstat output ./fs/nfsd/nfs4acl.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff .prev/fs/nfsd/nfs4acl.c ./fs/nfsd/nfs4acl.c --- .prev/fs/nfsd/nfs4acl.c 2007-02-13 10:38:09.000000000 +1100 +++ ./fs/nfsd/nfs4acl.c 2007-02-13 10:38:26.000000000 +1100 @@ -416,6 +416,7 @@ struct posix_ace_state_array { * calculated so far: */ struct posix_acl_state { + int empty; struct posix_ace_state owner; struct posix_ace_state group; struct posix_ace_state other; @@ -431,6 +432,7 @@ init_state(struct posix_acl_state *state int alloc; memset(state, 0, sizeof(struct posix_acl_state)); + state->empty = 1; /* * In the worst case, each individual acl could be for a distinct * named user or group, but we don't no which, so we allocate @@ -498,6 +500,20 @@ posix_state_to_acl(struct posix_acl_stat int nace; int i, error = 0; + /* + * ACLs with no ACEs are treated differently in the inheritable + * and effective cases: when there are no inheritable ACEs, we + * set a zero-length default posix acl: + */ + if (state->empty && (flags & NFS4_ACL_TYPE_DEFAULT)) { + pacl = posix_acl_alloc(0, GFP_KERNEL); + return pacl ? pacl : ERR_PTR(-ENOMEM); + } + /* + * When there are no effective ACEs, the following will end + * up setting a 3-element effective posix ACL with all + * permissions zero. + */ nace = 4 + state->users->n + state->groups->n; pacl = posix_acl_alloc(nace, GFP_KERNEL); if (!pacl) @@ -613,6 +629,8 @@ static void process_one_v4_ace(struct po u32 mask = ace->access_mask; int i; + state->empty = 0; + switch (ace2type(ace)) { case ACL_USER_OBJ: if (ace->type == NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE) { @@ -717,7 +735,8 @@ int nfs4_acl_nfsv4_to_posix(struct nfs4_ ret = PTR_ERR(*pacl); goto out_dstate; } - *dpacl = posix_state_to_acl(&default_acl_state, flags); + *dpacl = posix_state_to_acl(&default_acl_state, + flags | NFS4_ACL_TYPE_DEFAULT); if (IS_ERR(*dpacl)) { ret = PTR_ERR(*dpacl); posix_acl_release(*pacl);