[PATCH] NFS: Fix handling of the umask when an NFSv3 default acl is present.

 NFSv3 has no concept of a umask on the server side: The client applies
 the umask locally, and sends the effective permissions to the server.
 This behavior is wrong when files are created in a directory that has a
 default ACL.  In this case, the umask is supposed to be ignored, and
 only the default ACL determines the file's effective permissions.

 Usually its the server's task to conditionally apply the umask.  But
 since the server knows nothing about the umask, we have to do it on the
 client side.  This patch tries to fetch the parent directory's default
 ACL before creating a new file, computes the appropriate create mode to
 send to the server, and finally sets the new file's access and default
 acl appropriately.

 Many thanks to Buck Huppmann <buchk@pobox.com> for sending the initial
 version of this patch, as well as for arguing why we need this change.

 Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
 Acked-by: Olaf Kirch <okir@suse.de>
 Signed-off-by: Andrew Morton <akpm@osdl.org>
 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 29 insertions, 0 deletions

diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c
index 393ba79fc14f..89b6468700e7 100644
--- a/fs/nfs/nfs3acl.c
+++ b/fs/nfs/nfs3acl.c
@@ -301,3 +301,32 @@ int nfs3_proc_setacl(struct inode *inode, int type, struct posix_acl *acl)
 fail:
         return PTR_ERR(alloc);
 }
+
+int nfs3_proc_set_default_acl(struct inode *dir, struct inode *inode,
+                mode_t mode)
+{
+        struct posix_acl *dfacl, *acl;
+        int error = 0;
+
+        dfacl = nfs3_proc_getacl(dir, ACL_TYPE_DEFAULT);
+        if (IS_ERR(dfacl)) {
+                error = PTR_ERR(dfacl);
+                return (error == -EOPNOTSUPP) ? 0 : error;
+        }
+        if (!dfacl)
+                return 0;
+        acl = posix_acl_clone(dfacl, GFP_KERNEL);
+        error = -ENOMEM;
+        if (!acl)
+                goto out_release_dfacl;
+        error = posix_acl_create_masq(acl, &mode);
+        if (error < 0)
+                goto out_release_acl;
+        error = nfs3_proc_setacls(inode, acl, S_ISDIR(inode->i_mode) ?
+                                                      dfacl : NULL);
+out_release_acl:
+        posix_acl_release(acl);
+out_release_dfacl:
+        posix_acl_release(dfacl);
+        return error;
+}