Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ac7249e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

nfsd: use get_acl and ->set_acl 



Remove the boilerplate code to marshall and unmarhall ACL objects into
xattrs and operate on the posix_acl objects directly.  Also move all
the ACL handling code into nfs?acl.c where it belongs.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent feda821e

fs/nfsd/acl.h

+7 −9
Original line number Diff line number Diff line
@@ -35,7 +35,9 @@ 
#ifndef LINUX_NFS4_ACL_H

#define LINUX_NFS4_ACL_H



#include <linux/posix_acl.h>

struct nfs4_acl;

struct svc_fh;

struct svc_rqst;



/* Maximum ACL we'll accept from client; chosen (somewhat arbitrarily) to

 * fit in a page: */
@@ -45,13 +47,9 @@ struct nfs4_acl *nfs4_acl_new(int); 
int nfs4_acl_get_whotype(char *, u32);

int nfs4_acl_write_who(int who, char *p);



#define NFS4_ACL_TYPE_DEFAULT	0x01

#define NFS4_ACL_DIR		0x02

#define NFS4_ACL_OWNER		0x04



struct nfs4_acl *nfs4_acl_posix_to_nfsv4(struct posix_acl *,

				struct posix_acl *, unsigned int flags);

int nfs4_acl_nfsv4_to_posix(struct nfs4_acl *, struct posix_acl **,

				struct posix_acl **, unsigned int flags);

int nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry,

		struct nfs4_acl **acl);

__be32 nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp,

		struct nfs4_acl *acl);



#endif /* LINUX_NFS4_ACL_H */

fs/nfsd/nfs2acl.c

+40 −32
Original line number Diff line number Diff line
@@ -30,8 +30,9 @@ nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) 
static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp,

		struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp)

{

	svc_fh *fh;

	struct posix_acl *acl;

	struct inode *inode;

	svc_fh *fh;

	__be32 nfserr = 0;



	dprintk("nfsd: GETACL(2acl)   %s\n", SVCFH_fmt(&argp->fh));
@@ -41,6 +42,8 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp, 
	if (nfserr)

		RETURN_STATUS(nfserr);



	inode = fh->fh_dentry->d_inode;



	if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT))

		RETURN_STATUS(nfserr_inval);

	resp->mask = argp->mask;
@@ -50,21 +53,13 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp, 
		goto fail;



	if (resp->mask & (NFS_ACL|NFS_ACLCNT)) {

		acl = nfsd_get_posix_acl(fh, ACL_TYPE_ACCESS);

		acl = get_acl(inode, ACL_TYPE_ACCESS);

		if (IS_ERR(acl)) {

			int err = PTR_ERR(acl);



			if (err == -ENODATA || err == -EOPNOTSUPP)

				acl = NULL;

			else {

				nfserr = nfserrno(err);

			nfserr = nfserrno(PTR_ERR(acl));

			goto fail;

		}

		}

		if (acl == NULL) {

			/* Solaris returns the inode's minimum ACL. */



			struct inode *inode = fh->fh_dentry->d_inode;

			acl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);

		}

		resp->acl_access = acl;
@@ -72,18 +67,11 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp, 
	if (resp->mask & (NFS_DFACL|NFS_DFACLCNT)) {

		/* Check how Solaris handles requests for the Default ACL

		   of a non-directory! */



		acl = nfsd_get_posix_acl(fh, ACL_TYPE_DEFAULT);

		acl = get_acl(inode, ACL_TYPE_DEFAULT);

		if (IS_ERR(acl)) {

			int err = PTR_ERR(acl);



			if (err == -ENODATA || err == -EOPNOTSUPP)

				acl = NULL;

			else {

				nfserr = nfserrno(err);

			nfserr = nfserrno(PTR_ERR(acl));

			goto fail;

		}

		}

		resp->acl_default = acl;

	}
@@ -103,31 +91,51 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp, 
		struct nfsd3_setaclargs *argp,

		struct nfsd_attrstat *resp)

{

	struct inode *inode;

	svc_fh *fh;

	__be32 nfserr = 0;

	int error;



	dprintk("nfsd: SETACL(2acl)   %s\n", SVCFH_fmt(&argp->fh));



	fh = fh_copy(&resp->fh, &argp->fh);

	nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_SATTR);

	if (nfserr)

		goto out;



	if (!nfserr) {

		nfserr = nfserrno( nfsd_set_posix_acl(

			fh, ACL_TYPE_ACCESS, argp->acl_access) );

	inode = fh->fh_dentry->d_inode;

	if (!IS_POSIXACL(inode) || !inode->i_op->set_acl) {

		error = -EOPNOTSUPP;

		goto out_errno;

	}

	if (!nfserr) {

		nfserr = nfserrno( nfsd_set_posix_acl(

			fh, ACL_TYPE_DEFAULT, argp->acl_default) );

	}

	if (!nfserr) {



	error = fh_want_write(fh);

	if (error)

		goto out_errno;



	error = inode->i_op->set_acl(inode, argp->acl_access, ACL_TYPE_ACCESS);

	if (error)

		goto out_drop_write;

	error = inode->i_op->set_acl(inode, argp->acl_default,

				     ACL_TYPE_DEFAULT);

	if (error)

		goto out_drop_write;



	fh_drop_write(fh);



	nfserr = fh_getattr(fh, &resp->stat);

	}



out:

	/* argp->acl_{access,default} may have been allocated in

	   nfssvc_decode_setaclargs. */

	posix_acl_release(argp->acl_access);

	posix_acl_release(argp->acl_default);

	return nfserr;

out_drop_write:

	fh_drop_write(fh);

out_errno:

	nfserr = nfserrno(error);

	goto out;

}



/*

fs/nfsd/nfs3acl.c

+33 −29
Original line number Diff line number Diff line
@@ -29,8 +29,9 @@ nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) 
static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp,

		struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp)

{

	svc_fh *fh;

	struct posix_acl *acl;

	struct inode *inode;

	svc_fh *fh;

	__be32 nfserr = 0;



	fh = fh_copy(&resp->fh, &argp->fh);
@@ -38,26 +39,20 @@ static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp, 
	if (nfserr)

		RETURN_STATUS(nfserr);



	inode = fh->fh_dentry->d_inode;



	if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT))

		RETURN_STATUS(nfserr_inval);

	resp->mask = argp->mask;



	if (resp->mask & (NFS_ACL|NFS_ACLCNT)) {

		acl = nfsd_get_posix_acl(fh, ACL_TYPE_ACCESS);

		acl = get_acl(inode, ACL_TYPE_ACCESS);

		if (IS_ERR(acl)) {

			int err = PTR_ERR(acl);



			if (err == -ENODATA || err == -EOPNOTSUPP)

				acl = NULL;

			else {

				nfserr = nfserrno(err);

			nfserr = nfserrno(PTR_ERR(acl));

			goto fail;

		}

		}

		if (acl == NULL) {

			/* Solaris returns the inode's minimum ACL. */



			struct inode *inode = fh->fh_dentry->d_inode;

			acl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);

		}

		resp->acl_access = acl;
@@ -65,18 +60,11 @@ static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp, 
	if (resp->mask & (NFS_DFACL|NFS_DFACLCNT)) {

		/* Check how Solaris handles requests for the Default ACL

		   of a non-directory! */



		acl = nfsd_get_posix_acl(fh, ACL_TYPE_DEFAULT);

		acl = get_acl(inode, ACL_TYPE_DEFAULT);

		if (IS_ERR(acl)) {

			int err = PTR_ERR(acl);



			if (err == -ENODATA || err == -EOPNOTSUPP)

				acl = NULL;

			else {

				nfserr = nfserrno(err);

			nfserr = nfserrno(PTR_ERR(acl));

			goto fail;

		}

		}

		resp->acl_default = acl;

	}
@@ -96,21 +84,37 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst * rqstp, 
		struct nfsd3_setaclargs *argp,

		struct nfsd3_attrstat *resp)

{

	struct inode *inode;

	svc_fh *fh;

	__be32 nfserr = 0;

	int error;



	fh = fh_copy(&resp->fh, &argp->fh);

	nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_SATTR);

	if (nfserr)

		goto out;



	if (!nfserr) {

		nfserr = nfserrno( nfsd_set_posix_acl(

			fh, ACL_TYPE_ACCESS, argp->acl_access) );

	}

	if (!nfserr) {

		nfserr = nfserrno( nfsd_set_posix_acl(

			fh, ACL_TYPE_DEFAULT, argp->acl_default) );

	inode = fh->fh_dentry->d_inode;

	if (!IS_POSIXACL(inode) || !inode->i_op->set_acl) {

		error = -EOPNOTSUPP;

		goto out_errno;

	}



	error = fh_want_write(fh);

	if (error)

		goto out_errno;



	error = inode->i_op->set_acl(inode, argp->acl_access, ACL_TYPE_ACCESS);

	if (error)

		goto out_drop_write;

	error = inode->i_op->set_acl(inode, argp->acl_default,

				     ACL_TYPE_DEFAULT);



out_drop_write:

	fh_drop_write(fh);

out_errno:

	nfserr = nfserrno(error);

out:

	/* argp->acl_{access,default} may have been allocated in

	   nfs3svc_decode_setaclargs. */

	posix_acl_release(argp->acl_access);

fs/nfsd/nfs4acl.c

+92 −28
Original line number Diff line number Diff line
@@ -37,8 +37,13 @@ 
#include <linux/slab.h>

#include <linux/nfs_fs.h>

#include <linux/export.h>

#include "nfsfh.h"

#include "acl.h"

#include "vfs.h"



#define NFS4_ACL_TYPE_DEFAULT	0x01

#define NFS4_ACL_DIR		0x02

#define NFS4_ACL_OWNER		0x04



/* mode bit translations: */

#define NFS4_READ_MODE (NFS4_ACE_READ_DATA)
@@ -130,36 +135,50 @@ static short ace2type(struct nfs4_ace *); 
static void _posix_to_nfsv4_one(struct posix_acl *, struct nfs4_acl *,

				unsigned int);



struct nfs4_acl *

nfs4_acl_posix_to_nfsv4(struct posix_acl *pacl, struct posix_acl *dpacl,

			unsigned int flags)

int

nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry,

		struct nfs4_acl **acl)

{

	struct nfs4_acl *acl;

	struct inode *inode = dentry->d_inode;

	int error = 0;

	struct posix_acl *pacl = NULL, *dpacl = NULL;

	unsigned int flags = 0;

	int size = 0;



	if (pacl) {

		if (posix_acl_valid(pacl) < 0)

			return ERR_PTR(-EINVAL);

	pacl = get_acl(inode, ACL_TYPE_ACCESS);

	if (!pacl) {

		pacl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);

		if (IS_ERR(pacl))

			return PTR_ERR(pacl);

		/* allocate for worst case: one (deny, allow) pair each: */

		size += 2 * pacl->a_count;

	}

	if (dpacl) {

		if (posix_acl_valid(dpacl) < 0)

			return ERR_PTR(-EINVAL);



	if (S_ISDIR(inode->i_mode)) {

		flags = NFS4_ACL_DIR;

		dpacl = get_acl(inode, ACL_TYPE_DEFAULT);

		if (dpacl)

			size += 2 * dpacl->a_count;

	} else {

		dpacl = NULL;

	}



	/* Allocate for worst case: one (deny, allow) pair each: */

	acl = nfs4_acl_new(size);

	if (acl == NULL)

		return ERR_PTR(-ENOMEM);

	*acl = nfs4_acl_new(size);

	if (*acl == NULL) {

		error = -ENOMEM;

		goto out;

	}



	if (pacl)

		_posix_to_nfsv4_one(pacl, acl, flags & ~NFS4_ACL_TYPE_DEFAULT);

		_posix_to_nfsv4_one(pacl, *acl, flags & ~NFS4_ACL_TYPE_DEFAULT);



	if (dpacl)

		_posix_to_nfsv4_one(dpacl, acl, flags | NFS4_ACL_TYPE_DEFAULT);

		_posix_to_nfsv4_one(dpacl, *acl, flags | NFS4_ACL_TYPE_DEFAULT);



	return acl;

 out:

	posix_acl_release(pacl);

	posix_acl_release(dpacl);

	return error;

}



struct posix_acl_summary {
@@ -719,8 +738,9 @@ static void process_one_v4_ace(struct posix_acl_state *state, 
	}

}



int nfs4_acl_nfsv4_to_posix(struct nfs4_acl *acl, struct posix_acl **pacl,

			    struct posix_acl **dpacl, unsigned int flags)

static int nfs4_acl_nfsv4_to_posix(struct nfs4_acl *acl,

		struct posix_acl **pacl, struct posix_acl **dpacl,

		unsigned int flags)

{

	struct posix_acl_state effective_acl_state, default_acl_state;

	struct nfs4_ace *ace;
@@ -780,6 +800,57 @@ int nfs4_acl_nfsv4_to_posix(struct nfs4_acl *acl, struct posix_acl **pacl, 
	return ret;

}



__be32

nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp,

		struct nfs4_acl *acl)

{

	__be32 error;

	int host_error;

	struct dentry *dentry;

	struct inode *inode;

	struct posix_acl *pacl = NULL, *dpacl = NULL;

	unsigned int flags = 0;



	/* Get inode */

	error = fh_verify(rqstp, fhp, 0, NFSD_MAY_SATTR);

	if (error)

		return error;



	dentry = fhp->fh_dentry;

	inode = dentry->d_inode;



	if (!inode->i_op->set_acl || !IS_POSIXACL(inode))

		return nfserr_attrnotsupp;



	if (S_ISDIR(inode->i_mode))

		flags = NFS4_ACL_DIR;



	host_error = nfs4_acl_nfsv4_to_posix(acl, &pacl, &dpacl, flags);

	if (host_error == -EINVAL)

		return nfserr_attrnotsupp;

	if (host_error < 0)

		goto out_nfserr;



	host_error = inode->i_op->set_acl(inode, pacl, ACL_TYPE_ACCESS);

	if (host_error < 0)

		goto out_release;



	if (S_ISDIR(inode->i_mode)) {

		host_error = inode->i_op->set_acl(inode, dpacl,

						  ACL_TYPE_DEFAULT);

	}



out_release:

	posix_acl_release(pacl);

	posix_acl_release(dpacl);

out_nfserr:

	if (host_error == -EOPNOTSUPP)

		return nfserr_attrnotsupp;

	else

		return nfserrno(host_error);

}





static short

ace2type(struct nfs4_ace *ace)

{
@@ -798,9 +869,6 @@ ace2type(struct nfs4_ace *ace) 
	return -1;

}



EXPORT_SYMBOL(nfs4_acl_posix_to_nfsv4);

EXPORT_SYMBOL(nfs4_acl_nfsv4_to_posix);



struct nfs4_acl *

nfs4_acl_new(int n)

{
@@ -862,7 +930,3 @@ nfs4_acl_write_who(int who, char *p) 
	BUG();

	return -1;

}
 


EXPORT_SYMBOL(nfs4_acl_new);

EXPORT_SYMBOL(nfs4_acl_get_whotype);

EXPORT_SYMBOL(nfs4_acl_write_who);

fs/nfsd/nfs4proc.c

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "vfs.h"

#include "current_stateid.h"

#include "netns.h"

#include "acl.h"



#ifdef CONFIG_NFSD_V4_SECURITY_LABEL

#include <linux/security.h>