The patch titled
knfsd: nfsd4: acls: fix handling of zero-length acls
has been removed from the -mm tree. Its filename is
knfsd-nfsd4-acls-fix-handling-of-zero-length-acls.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: knfsd: nfsd4: acls: fix handling of zero-length acls
From: J.Bruce Fields <bfields@xxxxxxxxxxxx>
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@xxxxxxxxxxxxxx>
Signed-off-by: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfsd/nfs4acl.c | 15 +--------------
fs/nfsd/vfs.c | 10 ++++------
2 files changed, 5 insertions(+), 20 deletions(-)
diff -puN fs/nfsd/nfs4acl.c~knfsd-nfsd4-acls-fix-handling-of-zero-length-acls fs/nfsd/nfs4acl.c
--- a/fs/nfsd/nfs4acl.c~knfsd-nfsd4-acls-fix-handling-of-zero-length-acls
+++ a/fs/nfsd/nfs4acl.c
@@ -357,33 +357,20 @@ nfs4_acl_nfsv4_to_posix(struct nfs4_acl
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 -puN fs/nfsd/vfs.c~knfsd-nfsd4-acls-fix-handling-of-zero-length-acls fs/nfsd/vfs.c
--- a/fs/nfsd/vfs.c~knfsd-nfsd4-acls-fix-handling-of-zero-length-acls
+++ a/fs/nfsd/vfs.c
@@ -447,13 +447,11 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqst
} 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;
_
Patches currently in -mm which might be from bfields@xxxxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
