openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd: rename MAY_ flags 

Rename nfsd_permission() specific MAY_* flags to NFSD_MAY_* to make it
clear, that these are not used outside nfsd, and to avoid name and
number space conflicts with the VFS.

[comment from hch: rename MAY_READ, MAY_WRITE and MAY_EXEC as well]

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Miklos Szeredi 2008-06-16 13:20:29 +02:00 committed by J. Bruce Fields
parent 599eb3046a
commit 8837abcab3
10 changed files with 105 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfsd/lockd.c
View File

@ -35,7 +35,7 @@ nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp)
fh.fh_export = NULL; fh.fh_export = NULL;
exp_readlock(); exp_readlock();
nfserr = nfsd_open(rqstp, &fh, S_IFREG, MAY_LOCK, filp); nfserr = nfsd_open(rqstp, &fh, S_IFREG, NFSD_MAY_LOCK, filp);
fh_put(&fh); fh_put(&fh);
rqstp->rq_client = NULL; rqstp->rq_client = NULL;
exp_readunlock(); exp_readunlock();

7
fs/nfsd/nfs2acl.c
View File

@ -40,7 +40,8 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp,
dprintk("nfsd: GETACL(2acl) %s\n", SVCFH_fmt(&argp->fh)); dprintk("nfsd: GETACL(2acl) %s\n", SVCFH_fmt(&argp->fh));
fh = fh_copy(&resp->fh, &argp->fh); fh = fh_copy(&resp->fh, &argp->fh);
if ((nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP))) nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP);
if (nfserr)
RETURN_STATUS(nfserr); RETURN_STATUS(nfserr);
if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT)) if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT))
@ -107,7 +108,7 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp,
dprintk("nfsd: SETACL(2acl) %s\n", SVCFH_fmt(&argp->fh)); dprintk("nfsd: SETACL(2acl) %s\n", SVCFH_fmt(&argp->fh));
fh = fh_copy(&resp->fh, &argp->fh); fh = fh_copy(&resp->fh, &argp->fh);
nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_SATTR); nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_SATTR);
if (!nfserr) { if (!nfserr) {
nfserr = nfserrno( nfsd_set_posix_acl( nfserr = nfserrno( nfsd_set_posix_acl(
@ -134,7 +135,7 @@ static __be32 nfsacld_proc_getattr(struct svc_rqst * rqstp,
dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh));
fh_copy(&resp->fh, &argp->fh); fh_copy(&resp->fh, &argp->fh);
return fh_verify(rqstp, &resp->fh, 0, MAY_NOP); return fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP);
} }
/* /*

5
fs/nfsd/nfs3acl.c
View File

@ -36,7 +36,8 @@ static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp,
__be32 nfserr = 0; __be32 nfserr = 0;
fh = fh_copy(&resp->fh, &argp->fh); fh = fh_copy(&resp->fh, &argp->fh);
if ((nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP))) nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP);
if (nfserr)
RETURN_STATUS(nfserr); RETURN_STATUS(nfserr);
if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT)) if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT))
@ -101,7 +102,7 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst * rqstp,
__be32 nfserr = 0; __be32 nfserr = 0;
fh = fh_copy(&resp->fh, &argp->fh); fh = fh_copy(&resp->fh, &argp->fh);
nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_SATTR); nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_SATTR);
if (!nfserr) { if (!nfserr) {
nfserr = nfserrno( nfsd_set_posix_acl( nfserr = nfserrno( nfsd_set_posix_acl(

8
fs/nfsd/nfs3proc.c
View File

@ -63,7 +63,7 @@ nfsd3_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp,
SVCFH_fmt(&argp->fh)); SVCFH_fmt(&argp->fh));
fh_copy(&resp->fh, &argp->fh); fh_copy(&resp->fh, &argp->fh);
nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP); nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP);
if (nfserr) if (nfserr)
RETURN_STATUS(nfserr); RETURN_STATUS(nfserr);
@ -242,7 +242,7 @@ nfsd3_proc_create(struct svc_rqst *rqstp, struct nfsd3_createargs *argp,
attr = &argp->attrs; attr = &argp->attrs;
/* Get the directory inode */ /* Get the directory inode */
nfserr = fh_verify(rqstp, dirfhp, S_IFDIR, MAY_CREATE); nfserr = fh_verify(rqstp, dirfhp, S_IFDIR, NFSD_MAY_CREATE);
if (nfserr) if (nfserr)
RETURN_STATUS(nfserr); RETURN_STATUS(nfserr);
@ -558,7 +558,7 @@ nfsd3_proc_fsinfo(struct svc_rqst * rqstp, struct nfsd_fhandle *argp,
resp->f_maxfilesize = ~(u32) 0; resp->f_maxfilesize = ~(u32) 0;
resp->f_properties = NFS3_FSF_DEFAULT; resp->f_properties = NFS3_FSF_DEFAULT;
nfserr = fh_verify(rqstp, &argp->fh, 0, MAY_NOP); nfserr = fh_verify(rqstp, &argp->fh, 0, NFSD_MAY_NOP);
/* Check special features of the file system. May request /* Check special features of the file system. May request
* different read/write sizes for file systems known to have * different read/write sizes for file systems known to have
@ -597,7 +597,7 @@ nfsd3_proc_pathconf(struct svc_rqst * rqstp, struct nfsd_fhandle *argp,
resp->p_case_insensitive = 0; resp->p_case_insensitive = 0;
resp->p_case_preserving = 1; resp->p_case_preserving = 1;
nfserr = fh_verify(rqstp, &argp->fh, 0, MAY_NOP); nfserr = fh_verify(rqstp, &argp->fh, 0, NFSD_MAY_NOP);
if (nfserr == 0) { if (nfserr == 0) {
struct super_block *sb = argp->fh.fh_dentry->d_inode->i_sb; struct super_block *sb = argp->fh.fh_dentry->d_inode->i_sb;

23
fs/nfsd/nfs4proc.c
View File

@ -71,11 +71,11 @@ do_open_permission(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfs
return nfserr_inval; return nfserr_inval;
if (open->op_share_access & NFS4_SHARE_ACCESS_READ) if (open->op_share_access & NFS4_SHARE_ACCESS_READ)
accmode |= MAY_READ; accmode |= NFSD_MAY_READ;
if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE) if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE)
accmode |= (MAY_WRITE | MAY_TRUNC); accmode |= (NFSD_MAY_WRITE | NFSD_MAY_TRUNC);
if (open->op_share_deny & NFS4_SHARE_DENY_WRITE) if (open->op_share_deny & NFS4_SHARE_DENY_WRITE)
accmode |= MAY_WRITE; accmode |= NFSD_MAY_WRITE;
status = fh_verify(rqstp, current_fh, S_IFREG, accmode); status = fh_verify(rqstp, current_fh, S_IFREG, accmode);
@ -126,7 +126,8 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o
&resfh.fh_handle.fh_base, resfh.fh_handle.fh_size); &resfh.fh_handle.fh_base, resfh.fh_handle.fh_size);
if (!created) if (!created)
status = do_open_permission(rqstp, current_fh, open, MAY_NOP); status = do_open_permission(rqstp, current_fh, open,
NFSD_MAY_NOP);
out: out:
fh_put(&resfh); fh_put(&resfh);
@ -157,7 +158,8 @@ do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_
open->op_truncate = (open->op_iattr.ia_valid & ATTR_SIZE) && open->op_truncate = (open->op_iattr.ia_valid & ATTR_SIZE) &&
(open->op_iattr.ia_size == 0); (open->op_iattr.ia_size == 0);
status = do_open_permission(rqstp, current_fh, open, MAY_OWNER_OVERRIDE); status = do_open_permission(rqstp, current_fh, open,
NFSD_MAY_OWNER_OVERRIDE);
return status; return status;
} }
@ -186,7 +188,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
cstate->current_fh.fh_handle.fh_size = rp->rp_openfh_len; cstate->current_fh.fh_handle.fh_size = rp->rp_openfh_len;
memcpy(&cstate->current_fh.fh_handle.fh_base, rp->rp_openfh, memcpy(&cstate->current_fh.fh_handle.fh_base, rp->rp_openfh,
rp->rp_openfh_len); rp->rp_openfh_len);
status = fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP); status = fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_NOP);
if (status) if (status)
dprintk("nfsd4_open: replay failed" dprintk("nfsd4_open: replay failed"
" restoring previous filehandle\n"); " restoring previous filehandle\n");
@ -285,7 +287,7 @@ nfsd4_putfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
cstate->current_fh.fh_handle.fh_size = putfh->pf_fhlen; cstate->current_fh.fh_handle.fh_size = putfh->pf_fhlen;
memcpy(&cstate->current_fh.fh_handle.fh_base, putfh->pf_fhval, memcpy(&cstate->current_fh.fh_handle.fh_base, putfh->pf_fhval,
putfh->pf_fhlen); putfh->pf_fhlen);
return fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP); return fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_NOP);
} }
static __be32 static __be32
@ -363,7 +365,8 @@ nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
fh_init(&resfh, NFS4_FHSIZE); fh_init(&resfh, NFS4_FHSIZE);
status = fh_verify(rqstp, &cstate->current_fh, S_IFDIR, MAY_CREATE); status = fh_verify(rqstp, &cstate->current_fh, S_IFDIR,
NFSD_MAY_CREATE);
if (status == nfserr_symlink) if (status == nfserr_symlink)
status = nfserr_notdir; status = nfserr_notdir;
if (status) if (status)
@ -445,7 +448,7 @@ nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
{ {
__be32 status; __be32 status;
status = fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP); status = fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_NOP);
if (status) if (status)
return status; return status;
@ -730,7 +733,7 @@ _nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
int count; int count;
__be32 status; __be32 status;
status = fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP); status = fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_NOP);
if (status) if (status)
return status; return status;

6
fs/nfsd/nfs4state.c
View File

@ -1722,9 +1722,9 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
/* Stateid was not found, this is a new OPEN */ /* Stateid was not found, this is a new OPEN */
int flags = 0; int flags = 0;
if (open->op_share_access & NFS4_SHARE_ACCESS_READ) if (open->op_share_access & NFS4_SHARE_ACCESS_READ)
flags |= MAY_READ; flags |= NFSD_MAY_READ;
if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE) if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE)
flags |= MAY_WRITE; flags |= NFSD_MAY_WRITE;
status = nfs4_new_open(rqstp, &stp, dp, current_fh, flags); status = nfs4_new_open(rqstp, &stp, dp, current_fh, flags);
if (status) if (status)
goto out; goto out;
@ -2610,7 +2610,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
return nfserr_inval; return nfserr_inval;
if ((status = fh_verify(rqstp, &cstate->current_fh, if ((status = fh_verify(rqstp, &cstate->current_fh,
S_IFREG, MAY_LOCK))) { S_IFREG, NFSD_MAY_LOCK))) {
dprintk("NFSD: nfsd4_lock: permission denied!\n"); dprintk("NFSD: nfsd4_lock: permission denied!\n");
return status; return status;
} }

2
fs/nfsd/nfsfh.c
View File

@ -279,7 +279,7 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
if (error) if (error)
goto out; goto out;
if (!(access & MAY_LOCK)) { if (!(access & NFSD_MAY_LOCK)) {
/* /*
* pseudoflavor restrictions are not enforced on NLM, * pseudoflavor restrictions are not enforced on NLM,
* which clients virtually always use auth_sys for, * which clients virtually always use auth_sys for,

8
fs/nfsd/nfsproc.c
View File

@ -65,7 +65,7 @@ nfsd_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp,
dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh));
fh_copy(&resp->fh, &argp->fh); fh_copy(&resp->fh, &argp->fh);
nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP); nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP);
return nfsd_return_attrs(nfserr, resp); return nfsd_return_attrs(nfserr, resp);
} }
@ -215,11 +215,11 @@ nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp,
SVCFH_fmt(dirfhp), argp->len, argp->name); SVCFH_fmt(dirfhp), argp->len, argp->name);
/* First verify the parent file handle */ /* First verify the parent file handle */
nfserr = fh_verify(rqstp, dirfhp, S_IFDIR, MAY_EXEC); nfserr = fh_verify(rqstp, dirfhp, S_IFDIR, NFSD_MAY_EXEC);
if (nfserr) if (nfserr)
goto done; /* must fh_put dirfhp even on error */ goto done; /* must fh_put dirfhp even on error */
/* Check for MAY_WRITE in nfsd_create if necessary */ /* Check for NFSD_MAY_WRITE in nfsd_create if necessary */
nfserr = nfserr_acces; nfserr = nfserr_acces;
if (!argp->len) if (!argp->len)
@ -281,7 +281,7 @@ nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp,
nfserr = nfsd_permission(rqstp, nfserr = nfsd_permission(rqstp,
newfhp->fh_export, newfhp->fh_export,
newfhp->fh_dentry, newfhp->fh_dentry,
MAY_WRITE|MAY_LOCAL_ACCESS); NFSD_MAY_WRITE|NFSD_MAY_LOCAL_ACCESS);
if (nfserr && nfserr != nfserr_rofs) if (nfserr && nfserr != nfserr_rofs)
goto out_unlock; goto out_unlock;
} }

115
fs/nfsd/vfs.c
View File

@ -144,7 +144,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,
dprintk("nfsd: nfsd_lookup(fh %s, %.*s)\n", SVCFH_fmt(fhp), len,name); dprintk("nfsd: nfsd_lookup(fh %s, %.*s)\n", SVCFH_fmt(fhp), len,name);
/* Obtain dentry and export. */ /* Obtain dentry and export. */
err = fh_verify(rqstp, fhp, S_IFDIR, MAY_EXEC); err = fh_verify(rqstp, fhp, S_IFDIR, NFSD_MAY_EXEC);
if (err) if (err)
return err; return err;
@ -262,14 +262,14 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
{ {
struct dentry *dentry; struct dentry *dentry;
struct inode *inode; struct inode *inode;
int accmode = MAY_SATTR; int accmode = NFSD_MAY_SATTR;
int ftype = 0; int ftype = 0;
__be32 err; __be32 err;
int host_err; int host_err;
int size_change = 0; int size_change = 0;
if (iap->ia_valid & (ATTR_ATIME | ATTR_MTIME | ATTR_SIZE)) if (iap->ia_valid & (ATTR_ATIME | ATTR_MTIME | ATTR_SIZE))
accmode |= MAY_WRITE|MAY_OWNER_OVERRIDE; accmode |= NFSD_MAY_WRITE|NFSD_MAY_OWNER_OVERRIDE;
if (iap->ia_valid & ATTR_SIZE) if (iap->ia_valid & ATTR_SIZE)
ftype = S_IFREG; ftype = S_IFREG;
@ -331,7 +331,8 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
*/ */
if (iap->ia_valid & ATTR_SIZE) { if (iap->ia_valid & ATTR_SIZE) {
if (iap->ia_size < inode->i_size) { if (iap->ia_size < inode->i_size) {
err = nfsd_permission(rqstp, fhp->fh_export, dentry, MAY_TRUNC|MAY_OWNER_OVERRIDE); err = nfsd_permission(rqstp, fhp->fh_export, dentry,
NFSD_MAY_TRUNC|NFSD_MAY_OWNER_OVERRIDE);
if (err) if (err)
goto out; goto out;
} }
@ -462,7 +463,7 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp,
unsigned int flags = 0; unsigned int flags = 0;
/* Get inode */ /* Get inode */
error = fh_verify(rqstp, fhp, 0 /* S_IFREG */, MAY_SATTR); error = fh_verify(rqstp, fhp, 0 /* S_IFREG */, NFSD_MAY_SATTR);
if (error) if (error)
return error; return error;
@ -563,20 +564,20 @@ struct accessmap {
int how; int how;
}; };
static struct accessmap nfs3_regaccess[] = { static struct accessmap nfs3_regaccess[] = {
{ NFS3_ACCESS_READ, MAY_READ }, { NFS3_ACCESS_READ, NFSD_MAY_READ },
{ NFS3_ACCESS_EXECUTE, MAY_EXEC }, { NFS3_ACCESS_EXECUTE, NFSD_MAY_EXEC },
{ NFS3_ACCESS_MODIFY, MAY_WRITE|MAY_TRUNC }, { NFS3_ACCESS_MODIFY, NFSD_MAY_WRITE|NFSD_MAY_TRUNC },
{ NFS3_ACCESS_EXTEND, MAY_WRITE }, { NFS3_ACCESS_EXTEND, NFSD_MAY_WRITE },
{ 0, 0 } { 0, 0 }
}; };
static struct accessmap nfs3_diraccess[] = { static struct accessmap nfs3_diraccess[] = {
{ NFS3_ACCESS_READ, MAY_READ }, { NFS3_ACCESS_READ, NFSD_MAY_READ },
{ NFS3_ACCESS_LOOKUP, MAY_EXEC }, { NFS3_ACCESS_LOOKUP, NFSD_MAY_EXEC },
{ NFS3_ACCESS_MODIFY, MAY_EXEC|MAY_WRITE|MAY_TRUNC }, { NFS3_ACCESS_MODIFY, NFSD_MAY_EXEC|NFSD_MAY_WRITE|NFSD_MAY_TRUNC},
{ NFS3_ACCESS_EXTEND, MAY_EXEC|MAY_WRITE }, { NFS3_ACCESS_EXTEND, NFSD_MAY_EXEC|NFSD_MAY_WRITE },
{ NFS3_ACCESS_DELETE, MAY_REMOVE }, { NFS3_ACCESS_DELETE, NFSD_MAY_REMOVE },
{ 0, 0 } { 0, 0 }
}; };
@ -589,10 +590,10 @@ static struct accessmap nfs3_anyaccess[] = {
* mainly at mode bits, and we make sure to ignore read-only * mainly at mode bits, and we make sure to ignore read-only
* filesystem checks * filesystem checks
*/ */
{ NFS3_ACCESS_READ, MAY_READ }, { NFS3_ACCESS_READ, NFSD_MAY_READ },
{ NFS3_ACCESS_EXECUTE, MAY_EXEC }, { NFS3_ACCESS_EXECUTE, NFSD_MAY_EXEC },
{ NFS3_ACCESS_MODIFY, MAY_WRITE|MAY_LOCAL_ACCESS }, { NFS3_ACCESS_MODIFY, NFSD_MAY_WRITE|NFSD_MAY_LOCAL_ACCESS },
{ NFS3_ACCESS_EXTEND, MAY_WRITE|MAY_LOCAL_ACCESS }, { NFS3_ACCESS_EXTEND, NFSD_MAY_WRITE|NFSD_MAY_LOCAL_ACCESS },
{ 0, 0 } { 0, 0 }
}; };
@ -606,7 +607,7 @@ nfsd_access(struct svc_rqst *rqstp, struct svc_fh *fhp, u32 *access, u32 *suppor
u32 query, result = 0, sresult = 0; u32 query, result = 0, sresult = 0;
__be32 error; __be32 error;
error = fh_verify(rqstp, fhp, 0, MAY_NOP); error = fh_verify(rqstp, fhp, 0, NFSD_MAY_NOP);
if (error) if (error)
goto out; goto out;
@ -678,7 +679,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
* and (hopefully) checked permission - so allow OWNER_OVERRIDE * and (hopefully) checked permission - so allow OWNER_OVERRIDE
* in case a chmod has now revoked permission. * in case a chmod has now revoked permission.
*/ */
err = fh_verify(rqstp, fhp, type, access | MAY_OWNER_OVERRIDE); err = fh_verify(rqstp, fhp, type, access | NFSD_MAY_OWNER_OVERRIDE);
if (err) if (err)
goto out; goto out;
@ -689,7 +690,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
* or any access when mandatory locking enabled * or any access when mandatory locking enabled
*/ */
err = nfserr_perm; err = nfserr_perm;
if (IS_APPEND(inode) && (access & MAY_WRITE)) if (IS_APPEND(inode) && (access & NFSD_MAY_WRITE))
goto out; goto out;
/* /*
* We must ignore files (but only files) which might have mandatory * We must ignore files (but only files) which might have mandatory
@ -706,14 +707,14 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
* Check to see if there are any leases on this file. * Check to see if there are any leases on this file.
* This may block while leases are broken. * This may block while leases are broken.
*/ */
host_err = break_lease(inode, O_NONBLOCK | ((access & MAY_WRITE) ? FMODE_WRITE : 0)); host_err = break_lease(inode, O_NONBLOCK | ((access & NFSD_MAY_WRITE) ? FMODE_WRITE : 0));
if (host_err == -EWOULDBLOCK) if (host_err == -EWOULDBLOCK)
host_err = -ETIMEDOUT; host_err = -ETIMEDOUT;
if (host_err) /* NOMEM or WOULDBLOCK */ if (host_err) /* NOMEM or WOULDBLOCK */
goto out_nfserr; goto out_nfserr;
if (access & MAY_WRITE) { if (access & NFSD_MAY_WRITE) {
if (access & MAY_READ) if (access & NFSD_MAY_READ)
flags = O_RDWR|O_LARGEFILE; flags = O_RDWR|O_LARGEFILE;
else else
flags = O_WRONLY|O_LARGEFILE; flags = O_WRONLY|O_LARGEFILE;
@ -1069,12 +1070,12 @@ nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
if (file) { if (file) {
err = nfsd_permission(rqstp, fhp->fh_export, fhp->fh_dentry, err = nfsd_permission(rqstp, fhp->fh_export, fhp->fh_dentry,
MAY_READ|MAY_OWNER_OVERRIDE); NFSD_MAY_READ|NFSD_MAY_OWNER_OVERRIDE);
if (err) if (err)
goto out; goto out;
err = nfsd_vfs_read(rqstp, fhp, file, offset, vec, vlen, count); err = nfsd_vfs_read(rqstp, fhp, file, offset, vec, vlen, count);
} else { } else {
err = nfsd_open(rqstp, fhp, S_IFREG, MAY_READ, &file); err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file);
if (err) if (err)
goto out; goto out;
err = nfsd_vfs_read(rqstp, fhp, file, offset, vec, vlen, count); err = nfsd_vfs_read(rqstp, fhp, file, offset, vec, vlen, count);
@ -1098,13 +1099,13 @@ nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
if (file) { if (file) {
err = nfsd_permission(rqstp, fhp->fh_export, fhp->fh_dentry, err = nfsd_permission(rqstp, fhp->fh_export, fhp->fh_dentry,
MAY_WRITE|MAY_OWNER_OVERRIDE); NFSD_MAY_WRITE|NFSD_MAY_OWNER_OVERRIDE);
if (err) if (err)
goto out; goto out;
err = nfsd_vfs_write(rqstp, fhp, file, offset, vec, vlen, cnt, err = nfsd_vfs_write(rqstp, fhp, file, offset, vec, vlen, cnt,
stablep); stablep);
} else { } else {
err = nfsd_open(rqstp, fhp, S_IFREG, MAY_WRITE, &file); err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_WRITE, &file);
if (err) if (err)
goto out; goto out;
@ -1136,7 +1137,8 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp,
if ((u64)count > ~(u64)offset) if ((u64)count > ~(u64)offset)
return nfserr_inval; return nfserr_inval;
if ((err = nfsd_open(rqstp, fhp, S_IFREG, MAY_WRITE, &file)) != 0) err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_WRITE, &file);
if (err)
return err; return err;
if (EX_ISSYNC(fhp->fh_export)) { if (EX_ISSYNC(fhp->fh_export)) {
if (file->f_op && file->f_op->fsync) { if (file->f_op && file->f_op->fsync) {
@ -1197,7 +1199,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
if (isdotent(fname, flen)) if (isdotent(fname, flen))
goto out; goto out;
err = fh_verify(rqstp, fhp, S_IFDIR, MAY_CREATE); err = fh_verify(rqstp, fhp, S_IFDIR, NFSD_MAY_CREATE);
if (err) if (err)
goto out; goto out;
@ -1334,7 +1336,7 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp,
goto out; goto out;
if (!(iap->ia_valid & ATTR_MODE)) if (!(iap->ia_valid & ATTR_MODE))
iap->ia_mode = 0; iap->ia_mode = 0;
err = fh_verify(rqstp, fhp, S_IFDIR, MAY_CREATE); err = fh_verify(rqstp, fhp, S_IFDIR, NFSD_MAY_CREATE);
if (err) if (err)
goto out; goto out;
@ -1471,7 +1473,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
__be32 err; __be32 err;
int host_err; int host_err;
err = fh_verify(rqstp, fhp, S_IFLNK, MAY_NOP); err = fh_verify(rqstp, fhp, S_IFLNK, NFSD_MAY_NOP);
if (err) if (err)
goto out; goto out;
@ -1526,7 +1528,7 @@ nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *fhp,
if (isdotent(fname, flen)) if (isdotent(fname, flen))
goto out; goto out;
err = fh_verify(rqstp, fhp, S_IFDIR, MAY_CREATE); err = fh_verify(rqstp, fhp, S_IFDIR, NFSD_MAY_CREATE);
if (err) if (err)
goto out; goto out;
fh_lock(fhp); fh_lock(fhp);
@ -1591,10 +1593,10 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,
__be32 err; __be32 err;
int host_err; int host_err;
err = fh_verify(rqstp, ffhp, S_IFDIR, MAY_CREATE); err = fh_verify(rqstp, ffhp, S_IFDIR, NFSD_MAY_CREATE);
if (err) if (err)
goto out; goto out;
err = fh_verify(rqstp, tfhp, -S_IFDIR, MAY_NOP); err = fh_verify(rqstp, tfhp, -S_IFDIR, NFSD_MAY_NOP);
if (err) if (err)
goto out; goto out;
@ -1661,10 +1663,10 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen,
__be32 err; __be32 err;
int host_err; int host_err;
err = fh_verify(rqstp, ffhp, S_IFDIR, MAY_REMOVE); err = fh_verify(rqstp, ffhp, S_IFDIR, NFSD_MAY_REMOVE);
if (err) if (err)
goto out; goto out;
err = fh_verify(rqstp, tfhp, S_IFDIR, MAY_CREATE); err = fh_verify(rqstp, tfhp, S_IFDIR, NFSD_MAY_CREATE);
if (err) if (err)
goto out; goto out;
@ -1768,7 +1770,7 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
err = nfserr_acces; err = nfserr_acces;
if (!flen || isdotent(fname, flen)) if (!flen || isdotent(fname, flen))
goto out; goto out;
err = fh_verify(rqstp, fhp, S_IFDIR, MAY_REMOVE); err = fh_verify(rqstp, fhp, S_IFDIR, NFSD_MAY_REMOVE);
if (err) if (err)
goto out; goto out;
@ -1834,7 +1836,7 @@ nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp,
struct file *file; struct file *file;
loff_t offset = *offsetp; loff_t offset = *offsetp;
err = nfsd_open(rqstp, fhp, S_IFDIR, MAY_READ, &file); err = nfsd_open(rqstp, fhp, S_IFDIR, NFSD_MAY_READ, &file);
if (err) if (err)
goto out; goto out;
@ -1875,7 +1877,7 @@ nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp,
__be32 __be32
nfsd_statfs(struct svc_rqst *rqstp, struct svc_fh *fhp, struct kstatfs *stat) nfsd_statfs(struct svc_rqst *rqstp, struct svc_fh *fhp, struct kstatfs *stat)
{ {
__be32 err = fh_verify(rqstp, fhp, 0, MAY_NOP); __be32 err = fh_verify(rqstp, fhp, 0, NFSD_MAY_NOP);
if (!err && vfs_statfs(fhp->fh_dentry,stat)) if (!err && vfs_statfs(fhp->fh_dentry,stat))
err = nfserr_io; err = nfserr_io;
return err; return err;
@ -1896,18 +1898,18 @@ nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp,
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
int err; int err;
if (acc == MAY_NOP) if (acc == NFSD_MAY_NOP)
return 0; return 0;
#if 0 #if 0
dprintk("nfsd: permission 0x%x%s%s%s%s%s%s%s mode 0%o%s%s%s\n", dprintk("nfsd: permission 0x%x%s%s%s%s%s%s%s mode 0%o%s%s%s\n",
acc, acc,
(acc & MAY_READ)? " read" : "", (acc & NFSD_MAY_READ)? " read" : "",
(acc & MAY_WRITE)? " write" : "", (acc & NFSD_MAY_WRITE)? " write" : "",
(acc & MAY_EXEC)? " exec" : "", (acc & NFSD_MAY_EXEC)? " exec" : "",
(acc & MAY_SATTR)? " sattr" : "", (acc & NFSD_MAY_SATTR)? " sattr" : "",
(acc & MAY_TRUNC)? " trunc" : "", (acc & NFSD_MAY_TRUNC)? " trunc" : "",
(acc & MAY_LOCK)? " lock" : "", (acc & NFSD_MAY_LOCK)? " lock" : "",
(acc & MAY_OWNER_OVERRIDE)? " owneroverride" : "", (acc & NFSD_MAY_OWNER_OVERRIDE)? " owneroverride" : "",
inode->i_mode, inode->i_mode,
IS_IMMUTABLE(inode)? " immut" : "", IS_IMMUTABLE(inode)? " immut" : "",
IS_APPEND(inode)? " append" : "", IS_APPEND(inode)? " append" : "",
@ -1920,18 +1922,18 @@ nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp,
* system. But if it is IRIX doing check on write-access for a * system. But if it is IRIX doing check on write-access for a
* device special file, we ignore rofs. * device special file, we ignore rofs.
*/ */
if (!(acc & MAY_LOCAL_ACCESS)) if (!(acc & NFSD_MAY_LOCAL_ACCESS))
if (acc & (MAY_WRITE | MAY_SATTR | MAY_TRUNC)) { if (acc & (NFSD_MAY_WRITE | NFSD_MAY_SATTR | NFSD_MAY_TRUNC)) {
if (exp_rdonly(rqstp, exp) || if (exp_rdonly(rqstp, exp) ||
__mnt_is_readonly(exp->ex_path.mnt)) __mnt_is_readonly(exp->ex_path.mnt))
return nfserr_rofs; return nfserr_rofs;
if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode)) if (/* (acc & NFSD_MAY_WRITE) && */ IS_IMMUTABLE(inode))
return nfserr_perm; return nfserr_perm;
} }
if ((acc & MAY_TRUNC) && IS_APPEND(inode)) if ((acc & NFSD_MAY_TRUNC) && IS_APPEND(inode))
return nfserr_perm; return nfserr_perm;
if (acc & MAY_LOCK) { if (acc & NFSD_MAY_LOCK) {
/* If we cannot rely on authentication in NLM requests, /* If we cannot rely on authentication in NLM requests,
* just allow locks, otherwise require read permission, or * just allow locks, otherwise require read permission, or
* ownership * ownership
@ -1939,7 +1941,7 @@ nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp,
if (exp->ex_flags & NFSEXP_NOAUTHNLM) if (exp->ex_flags & NFSEXP_NOAUTHNLM)
return 0; return 0;
else else
acc = MAY_READ | MAY_OWNER_OVERRIDE; acc = NFSD_MAY_READ | NFSD_MAY_OWNER_OVERRIDE;
} }
/* /*
* The file owner always gets access permission for accesses that * The file owner always gets access permission for accesses that
@ -1955,15 +1957,16 @@ nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp,
* We must trust the client to do permission checking - using "ACCESS" * We must trust the client to do permission checking - using "ACCESS"
* with NFSv3. * with NFSv3.
*/ */
if ((acc & MAY_OWNER_OVERRIDE) && if ((acc & NFSD_MAY_OWNER_OVERRIDE) &&
inode->i_uid == current->fsuid) inode->i_uid == current->fsuid)
return 0; return 0;
/* This assumes NFSD_MAY_{READ,WRITE,EXEC} == MAY_{READ,WRITE,EXEC} */
err = permission(inode, acc & (MAY_READ|MAY_WRITE|MAY_EXEC), NULL); err = permission(inode, acc & (MAY_READ|MAY_WRITE|MAY_EXEC), NULL);
/* Allow read access to binaries even when mode 111 */ /* Allow read access to binaries even when mode 111 */
if (err == -EACCES && S_ISREG(inode->i_mode) && if (err == -EACCES && S_ISREG(inode->i_mode) &&
acc == (MAY_READ | MAY_OWNER_OVERRIDE)) acc == (NFSD_MAY_READ | NFSD_MAY_OWNER_OVERRIDE))
err = permission(inode, MAY_EXEC, NULL); err = permission(inode, MAY_EXEC, NULL);
return err? nfserrno(err) : 0; return err? nfserrno(err) : 0;

26
include/linux/nfsd/nfsd.h
View File

@ -28,20 +28,20 @@
#define NFSD_SUPPORTED_MINOR_VERSION 0 #define NFSD_SUPPORTED_MINOR_VERSION 0
/* /*
* Special flags for nfsd_permission. These must be different from MAY_READ, * Flags for nfsd_permission
* MAY_WRITE, and MAY_EXEC.
*/ */
#define MAY_NOP 0 #define NFSD_MAY_NOP 0
#define MAY_SATTR 8 #define NFSD_MAY_EXEC 1 /* == MAY_EXEC */
#define MAY_TRUNC 16 #define NFSD_MAY_WRITE 2 /* == MAY_WRITE */
#define MAY_LOCK 32 #define NFSD_MAY_READ 4 /* == MAY_READ */
#define MAY_OWNER_OVERRIDE 64 #define NFSD_MAY_SATTR 8
#define MAY_LOCAL_ACCESS 128 /* IRIX doing local access check on device special file*/ #define NFSD_MAY_TRUNC 16
#if (MAY_SATTR | MAY_TRUNC | MAY_LOCK | MAY_OWNER_OVERRIDE | MAY_LOCAL_ACCESS) & (MAY_READ | MAY_WRITE | MAY_EXEC) #define NFSD_MAY_LOCK 32
# error "please use a different value for MAY_SATTR or MAY_TRUNC or MAY_LOCK or MAY_LOCAL_ACCESS or MAY_OWNER_OVERRIDE." #define NFSD_MAY_OWNER_OVERRIDE 64
#endif #define NFSD_MAY_LOCAL_ACCESS 128 /* IRIX doing local access check on device special file*/
#define MAY_CREATE (MAY_EXEC|MAY_WRITE)
#define MAY_REMOVE (MAY_EXEC|MAY_WRITE|MAY_TRUNC) #define NFSD_MAY_CREATE (NFSD_MAY_EXEC|NFSD_MAY_WRITE)
#define NFSD_MAY_REMOVE (NFSD_MAY_EXEC|NFSD_MAY_WRITE|NFSD_MAY_TRUNC)
/* /*
* Callback function for readdir * Callback function for readdir