Hi,
yes, the coincidence is really funny!
I have been working on a similar patch, which I attach just for
reference. It is just in a proof-of-concept stage with some
printk calls for my personal debugging, and the code is not yet
conditional.
The main difference is that I used the CIFSSMBGetPosixACL call
instead of handcrafting the reading of the xtended attribute.
I have been chatting extensively chatting with Jeff about the
implementation of multi session/user mounts, which is definitely
the way to go but much more coding work.
I also noticed the problem of file ownership, which should
in principle be solvabel by useing the "setuids" mount option,
but this seemd to have no effect in my test setup with uml
linux running from a 2.6.32 git checkout.
Cheers - Michael
Jeff Layton wrote:
> On Thu, 4 Mar 2010 11:50:04 +0100
> Jon Severinsson <jon@xxxxxxxxxxxxxxx> wrote:
>
> > Hello
> >
> > Early this weak I sent a patch implementing posix acl permission checking in
> > the linux cifs filesystem module. Unfortunately I only sent it to linux-fsdev
> > as I was unaware of the linux-cifs-client list. I later tried to submit it to
> > linux-cifs-client as well, but my message seems to have been lost in the
> > moderation queue, so I subscribed and am trying again.
> >
> > I don't believe my patch is perfect, but I think it's a good start, and would
> > like some comments from more experienced cifs developers to be able to get it
> > into shape for inclusion in the kernel.
> >
> > I did get some comments from Matthew Wilcox at linux-fsdev, but unfortunately
> > he never followed up on my response, so I'm including some unresolved
> > questions I still have, as well as attaching the patch for further comments.
> >
> > Best Regards
> > Jon Severinsson
> >
>
> (cc'ing Michael Adam since he's been working on a similar patch)
>
> I've looked over the patch and it's pretty good for a first attempt.
> There are a few minor problems with it, but it's a reasonable first
> pass.
>
> The issues I have are with the approach -- you've stepped into a bit of
> a minefield with regards to CIFS' design. The issues that Simo brings up
> however are quite valid. Let me just state outright that permission
> checking on the client is a completely bogus concept. There are a
> couple of problems with this approach:
>
> 1) Someone could change the permissions on the server between the time
> you check them and when you do your operation. Yes, I know that CIFS
> already does this for permission bits, but that's dumb too.
>
> 2) Ownership matters. This patch will have no effect on how files get
> created. They still get created with the owner set to the user who's
> credentials were used, and you can't change them afterward (since users
> can't "chown" files to other users). Now, it is possible to mount a
> samba server with root's credentials. Then you can use the "setuids"
> mount option to make chown's work and you *might* get files created the
> way you intend. I really, really do not recommend this though -- it's a
> bad idea to allow any user to share root's server credentials.
>
> I'm convinced, after working on it for more than 3 years that the *only*
> proper fix for the nightmare that is CIFS permissions is to make CIFS
> use proper credentials in the first place. CIFS is currently completely
> broken in this regard -- it's designed such that all accesses to the
> mount use the same set of credentials, and that's just plain wrong.
>
> Fixing this entails establishing new SMB sessions on the fly whenever a
> user wants to do an on the wire operation. Obviously, we can't prompt
> for passwords for this, so we need to limit this to krb5 creds or come
> up with a way for people to stash credentials for the kernel to use for
> this purpose. I'm about 1/3 of the way into a first draft of a patchset
> to do this, but it won't be fixed anytime soon and may not be suitable
> for CIFS with SMB2 getting development focus now.
>
> Now, all of that said...I don't have a specific issue with adding a
> patch to do this. I think this approach is completely ass-backwards and
> broken, but we do already attempt to enforce permission bits on the
> client currently. Adding checks for POSIX acl's don't make this (much)
> worse.
>
> The one thing I don't think we want though is to turn this on by
> default since it means an extra round trip to the server every time
> you want to check permissions. This needs to be "switchable" somehow --
> possibly via mount option (maybe -o checkposixacls or something?)
>
> > commit fa0b9415cda17b31966542101bc4ceb0c97c87cb
> > Author: Jon Severinsson <jon@xxxxxxxxxxxxxxx>
> > Date: Mon Mar 1 19:24:30 2010 +0100
> >
> > [CIFS] Adds support for permision checking vs. posix acl.
> >
> > CIFS already supports getting and setting acls through getfacl and setfacl, but
> > prior to this patch, any acls was ignored when doing permission checking.
> >
> > diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> > index 29f1da7..0605e11 100644
> > --- a/fs/cifs/cifsfs.c
> > +++ b/fs/cifs/cifsfs.c
> > @@ -284,7 +284,7 @@ static int cifs_permission(struct inode *inode, int mask)
> > on the client (above and beyond ACL on servers) for
> > servers which do not support setting and viewing mode bits,
> > so allowing client to check permissions is useful */
> > - return generic_permission(inode, mask, NULL);
> > + return generic_permission(inode, mask, inode->i_op->check_acl);
> > }
> >
> > static struct kmem_cache *cifs_inode_cachep;
> > @@ -702,6 +702,9 @@ const struct inode_operations cifs_dir_inode_ops = {
> > .getxattr = cifs_getxattr,
> > .listxattr = cifs_listxattr,
> > .removexattr = cifs_removexattr,
> > +#ifdef CONFIG_CIFS_POSIX
> > + .check_acl = cifs_check_acl,
> > +#endif
> > #endif
> > };
> >
> > @@ -716,6 +719,9 @@ const struct inode_operations cifs_file_inode_ops = {
> > .getxattr = cifs_getxattr,
> > .listxattr = cifs_listxattr,
> > .removexattr = cifs_removexattr,
> > +#ifdef CONFIG_CIFS_POSIX
> > + .check_acl = cifs_check_acl,
> > +#endif
> > #endif
> > };
> >
> > @@ -732,6 +738,9 @@ const struct inode_operations cifs_symlink_inode_ops = {
> > .getxattr = cifs_getxattr,
> > .listxattr = cifs_listxattr,
> > .removexattr = cifs_removexattr,
> > +#ifdef CONFIG_CIFS_POSIX
> > + .check_acl = cifs_check_acl,
> > +#endif
> > #endif
> > };
> >
> > diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
> > index ac2b24c..6409a83 100644
> > --- a/fs/cifs/cifsfs.h
> > +++ b/fs/cifs/cifsfs.h
> > @@ -102,11 +102,15 @@ extern int cifs_readlink(struct dentry *direntry, char __user *buffer,
> > int buflen);
> > extern int cifs_symlink(struct inode *inode, struct dentry *direntry,
> > const char *symname);
> > +
> > +/* Functions related to extended attributes */
> > extern int cifs_removexattr(struct dentry *, const char *);
> > extern int cifs_setxattr(struct dentry *, const char *, const void *,
> > size_t, int);
> > extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t);
> > extern ssize_t cifs_listxattr(struct dentry *, char *, size_t);
> > +extern int cifs_check_acl(struct inode *inode, int mask);
> > +
> > extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
> >
> > #ifdef CONFIG_CIFS_EXPERIMENTAL
> > diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c
> > index a75afa3..a07633b 100644
> > --- a/fs/cifs/xattr.c
> > +++ b/fs/cifs/xattr.c
> > @@ -374,3 +374,71 @@ ssize_t cifs_listxattr(struct dentry *direntry, char *data, size_t buf_size)
> > #endif
> > return rc;
> > }
> > +
> > +int cifs_check_acl(struct inode *inode, int mask)
> > +{
> > + int rc = -EOPNOTSUPP;
> > +#ifdef CONFIG_CIFS_XATTR
> > +#ifdef CONFIG_CIFS_POSIX
> > + struct dentry *dentry;
> > + size_t buf_size;
> > + void *ea_value = NULL;
> > + ssize_t ea_size;
> > + struct posix_acl *acl = NULL;
> > +
> > + /* CIFS gets acl from server by path, and thus needs a dentry rather than
> > + an inode. Note that the path of each dentry will point to the same inode
> > + on the backing fs at the server, so their acls will be the same, and it
> > + doesn't matter which one we pick, so just pick the fist. */
>
> ^^^ comments should follow kernel coding styles. Be sure to run your
> patch through scripts/checkpatch.pl too.
>
> > + if (!list_empty(&inode->i_dentry))
> > + dentry = list_first_entry(&inode->i_dentry, struct dentry, d_alias);
>
> ^^^^ you should probably dget this dentry to take a
> reference to it and then put it when you're finished
> with it. It could vanish out of the cache before you
> have a chance to use it otherwise.
>
> > + else
> > + return -EINVAL;
> > +
> > + /* Try to fit the extended attribute corresponding to the posix acl in 4k
> > + memory. 4k was chosen because it always fits in a single page, and is
> > + the maximum on a default ext2/3/4 backing fs. */
> > + buf_size = 4096;
> > + ea_value = kmalloc(buf_size, GFP_KERNEL);
> > + if (!ea_value) {
> > + rc = -EAGAIN;
> > + goto check_acl_exit;
> > + }
> > + ea_size = cifs_getxattr(dentry, POSIX_ACL_XATTR_ACCESS, ea_value, buf_size);
> > +
> > + /* If 4k wasn't enough, try 64k, the maximum on any current backing fs. */
> > + if (ea_size == -ERANGE) {
> > + kfree(ea_value);
> > + buf_size = 65536;
> > + ea_value = kmalloc(buf_size, GFP_KERNEL);
> > + if (!ea_value) {
> > + rc = -EAGAIN;
> > + goto check_acl_exit;
> > + }
> > + ea_size = cifs_getxattr(dentry, POSIX_ACL_XATTR_ACCESS, ea_value, buf_size);
> > + }
> > +
> > + /* If we didn't get any extended attribute, set the error code and exit */
> > + if (ea_size <= 0) {
> > + rc = -EAGAIN;
> > + if (ea_size == -EOPNOTSUPP || ea_size == -EIO || ea_size == -ENOTDIR || ea_size == -ENOENT || ea_size == -EFAULT || ea_size == -EACCES)
> > + rc = ea_size;
> > + goto check_acl_exit;
> > + }
> > +
> > + /* Set the appropriate return value. Adapted from ext4. */
> > + acl = posix_acl_from_xattr(ea_value, ea_size);
> > + if (IS_ERR(acl))
> > + rc = PTR_ERR(acl);
> > + else if (acl)
> > + rc = posix_acl_permission(inode, acl, mask);
> > + else
> > + rc = -EAGAIN;
> > +
> > +check_acl_exit:
> > + posix_acl_release(acl);
> > + kfree(ea_value);
> > +#endif /* CONFIG_CIFS_POSIX */
> > +#endif /* CONFIG_CIFS_XATTR */
> > + return rc;
> > +}
>
> The rest of the patch looks reasonable but I agree with Simo that all
> of our time would be better spent working to make CIFS use proper
> credentials on the wire.
>
> --
> Jeff Layton <jlayton@xxxxxxxxx>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
From 159de5f89c010dd2fe082d8b8109e5e3c8633462 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@xxxxxxxxx>
Date: Thu, 25 Feb 2010 17:06:03 +0100
Subject: [PATCH] cifs: prototype implementation of client-side posix acl checks.
---
fs/cifs/cifsfs.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 113 insertions(+), 1 deletions(-)
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 29f1da7..cb31ecd 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -47,6 +47,8 @@
#include <linux/key-type.h>
#include "dns_resolve.h"
#include "cifs_spnego.h"
+#include <linux/posix_acl.h>
+#include <linux/posix_acl_xattr.h>
#define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */
#ifdef CONFIG_CIFS_QUOTA
@@ -269,6 +271,116 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf)
return 0;
}
+static int cifs_check_acl(struct inode *inode, int mask)
+{
+ ssize_t rc = -EOPNOTSUPP;
+ struct cifs_sb_info *cifs_sb;
+ struct super_block *sb;
+ struct cifsTconInfo *pTcon;
+ int xid;
+ char *full_path;
+ void *ea_value = NULL;
+ size_t buf_size = 0;
+ struct dentry *dentry;
+ struct posix_acl *acl;
+
+printk(KERN_NOTICE "cifs_check_acl: entering\n");
+
+ sb = inode->i_sb;
+ if (sb == NULL) {
+ return -EIO;
+ }
+
+ cifs_sb = CIFS_SB(sb);
+ pTcon = cifs_sb->tcon;
+
+ xid = GetXid();
+
+ if (inode->i_dentry.next == NULL) {
+ /* no dentry found - deny access */
+ FreeXid(xid);
+ return -EACCES;
+ }
+
+ dentry = list_first_entry(&(inode->i_dentry), struct dentry, d_alias);
+ if (dentry == NULL) {
+ FreeXid(xid);
+ return -EACCES;
+ }
+
+printk(KERN_NOTICE "cifs_check_acl: got first dentry\n");
+
+ full_path = build_path_from_dentry(dentry);
+ if (full_path == NULL) {
+ rc = -ENOMEM;
+ FreeXid(xid);
+ return rc;
+ }
+
+printk(KERN_NOTICE "cifs_check_acl: got path '%s'\n", full_path);
+
+ if (!(sb->s_flags & MS_POSIXACL)) {
+ rc = -EOPNOTSUPP;
+ goto out;
+ }
+
+ ea_value = kmalloc(4096, GFP_KERNEL);
+ if (ea_value == NULL) {
+ rc = -ENOMEM;
+ goto out;
+ }
+ buf_size = (size_t)4096;
+
+printk(KERN_NOTICE "cifs_check_acl: allocated ea buffer (4096)\n");
+
+ rc = CIFSSMBGetPosixACL(xid, pTcon, full_path, ea_value,
+ buf_size, ACL_TYPE_ACCESS,
+ cifs_sb->local_nls,
+ cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
+ if (rc == -1) {
+printk(KERN_NOTICE "cifs_check_acl: error calling CIFSSMBGetPosixACL\n");
+ goto out;
+ }
+
+printk(KERN_NOTICE "cifs_check_ack: CIFSSMBGetPosixACL returned %d\n", rc);
+
+ acl = posix_acl_from_xattr(ea_value, rc);
+
+ if (acl == NULL) {
+printk(KERN_NOTICE "cifs_check_acl: error converting acl from ea buffer: NULL ACL\n");
+ rc = -EAGAIN;
+ goto out;
+ }
+
+ if (IS_ERR(acl)) {
+printk(KERN_NOTICE "cifs_check_acl: error converting acl from ea buffer: IS_ERR(acl): %d\n", -PTR_ERR(acl));
+ rc = PTR_ERR(acl);
+ goto out;
+ }
+
+ rc = posix_acl_valid(acl);
+ if (rc != 0) {
+printk(KERN_NOTICE "cifs_check_acl: acl is invalid\n");
+ goto out;
+ }
+
+ rc = posix_acl_permission(inode, acl, mask);
+ posix_acl_release(acl);
+
+printk(KERN_NOTICE "cifs_check_acl: posix_acl_permission check gave: %d\n", rc);
+
+out:
+ kfree(full_path);
+ FreeXid(xid);
+ if (ea_value != NULL) {
+ kfree(ea_value);
+ }
+
+printk(KERN_NOTICE "cifs_check_acl: done, returning %d\n", rc);
+
+ return rc;
+}
+
static int cifs_permission(struct inode *inode, int mask)
{
struct cifs_sb_info *cifs_sb;
@@ -284,7 +396,7 @@ static int cifs_permission(struct inode *inode, int mask)
on the client (above and beyond ACL on servers) for
servers which do not support setting and viewing mode bits,
so allowing client to check permissions is useful */
- return generic_permission(inode, mask, NULL);
+ return generic_permission(inode, mask, cifs_check_acl);
}
static struct kmem_cache *cifs_inode_cachep;
--
1.6.3.3
Attachment:
pgp6EcuoZkgkN.pgp
Description: PGP signature
