[PATCH] knfsd: nfsd4: acls: fix handling of zero-length acls

It is legal to have zero-length NFSv4 acls; they just deny everything.

Also, nfs4_acl_nfsv4_to_posix will always return with pacl and dpacl set on
success, so the caller doesn't need to check this.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index 105544eac9a32a84cad6621743ac3d9cf7d4289b..5d94555cdc836a4f9ce2f0e998e2d5a734e1ca00 100644 (file)
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -357,33 +357,20 @@ nfs4_acl_nfsv4_to_posix(struct nfs4_acl *acl, struct posix_acl **pacl,
                goto out;
 
        error = nfs4_acl_split(acl, dacl);
-       if (error < 0)
+       if (error)
                goto out_acl;
 
-       if (acl->naces == 0) {
-               error = -ENODATA;
-               goto try_dpacl;
-       }
-
        *pacl = _nfsv4_to_posix_one(acl, flags);
        if (IS_ERR(*pacl)) {
                error = PTR_ERR(*pacl);
                *pacl = NULL;
                goto out_acl;
        }
-try_dpacl:
-       if (dacl->naces == 0) {
-               if (pacl == NULL || *pacl == NULL)
-                       error = -ENODATA;
-               goto out_acl;
-       }
 
-       error = 0;
        *dpacl = _nfsv4_to_posix_one(dacl, flags);
        if (IS_ERR(*dpacl)) {
                error = PTR_ERR(*dpacl);
                *dpacl = NULL;
-               goto out_acl;
        }
 out_acl:
        if (error) {

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 137565a136d705a3eda61c47296359c336bbcbad..1141bd29e4e3ee3b6f3b9711ace4d7323e42bd5d 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -447,13 +447,11 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp,
        } else if (error < 0)
                goto out_nfserr;
 
-       if (pacl) {
-               error = set_nfsv4_acl_one(dentry, pacl, POSIX_ACL_XATTR_ACCESS);
-               if (error < 0)
-                       goto out_nfserr;
-       }
+       error = set_nfsv4_acl_one(dentry, pacl, POSIX_ACL_XATTR_ACCESS);
+       if (error < 0)
+               goto out_nfserr;
 
-       if (dpacl) {
+       if (S_ISDIR(inode->i_mode)) {
                error = set_nfsv4_acl_one(dentry, dpacl, POSIX_ACL_XATTR_DEFAULT);
                if (error < 0)
                        goto out_nfserr;