On 30/03/13 20:02, J. Bruce Fields wrote: > On Sat, Mar 30, 2013 at 06:49:19PM -0400, Steve Dickson wrote: >> >> >> On 30/03/13 18:08, J. Bruce Fields wrote: >>> On Sat, Mar 30, 2013 at 05:50:21PM -0400, Steve Dickson wrote: >>>> >>>> >>>> On 28/03/13 14:58, J. Bruce Fields wrote: >>>>> On Thu, Mar 28, 2013 at 09:54:04AM -0400, Steve Dickson wrote: >>>>>> From: David Quigley <dpquigl@xxxxxxxxxxxxxxx> >>>>>> >>>>>> This patch adds the ability to encode and decode file labels on the server for >>>>>> the purpose of sending them to the client and also to process label change >>>>>> requests from the client. >>>>>> >>>>>> Signed-off-by: Matthew N. Dodd <Matthew.Dodd@xxxxxxxxxx> >>>>>> Signed-off-by: Miguel Rodel Felipe <Rodel_FM@xxxxxxxxxxxxxxxxx> >>>>>> Signed-off-by: Phua Eu Gene <PHUA_Eu_Gene@xxxxxxxxxxxxxxxxx> >>>>>> Signed-off-by: Khin Mi Mi Aung <Mi_Mi_AUNG@xxxxxxxxxxxxxxxxx> >>>>>> --- >>>>>> fs/nfsd/nfs4proc.c | 41 +++++++++++++++++++ >>>>>> fs/nfsd/nfs4xdr.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++--- >>>>>> fs/nfsd/nfsd.h | 6 ++- >>>>>> fs/nfsd/vfs.c | 29 ++++++++++++++ >>>>>> fs/nfsd/vfs.h | 2 + >>>>>> fs/nfsd/xdr4.h | 3 ++ >>>>>> 6 files changed, 191 insertions(+), 6 deletions(-) >>>>>> >>>>>> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c >>>>>> index ae73175..bb17589 100644 >>>>>> --- a/fs/nfsd/nfs4proc.c >>>>>> +++ b/fs/nfsd/nfs4proc.c >>>>>> @@ -42,6 +42,36 @@ >>>>>> #include "current_stateid.h" >>>>>> #include "netns.h" >>>>>> >>>>>> +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL >>>>>> +#include <linux/security.h> >>>>>> + >>>>>> +static inline void >>>>>> +nfsd4_security_inode_setsecctx(struct svc_fh *resfh, struct nfs4_label *label, u32 *bmval) >>>>>> +{ >>>>>> + struct inode *inode = resfh->fh_dentry->d_inode; >>>>>> + int status; >>>>>> + >>>>>> + mutex_lock(&inode->i_mutex); >>>>>> + status = security_inode_setsecctx(resfh->fh_dentry, >>>>>> + label->label, label->len); >>>>>> + mutex_unlock(&inode->i_mutex); >>>>>> + >>>>>> + if (status) >>>>>> + /* >>>>>> + * We should probably fail the whole open at this point, >>>>>> + * but we've already created or opened the file, so it's >>>>>> + * too late; So this seems the least of evils: >>>>>> + */ >>>>>> + bmval[2] &= ~FATTR4_WORD2_SECURITY_LABEL; >>>>>> + >>>>>> + return; >>>>>> +} >>>>>> +#else >>>>>> +static inline void >>>>>> +nfsd4_security_inode_setsecctx(struct svc_fh *resfh, struct nfs4_label *label, u32 *bmval) >>>>>> +{ } >>>>>> +#endif >>>>>> + >>>>>> #define NFSDDBG_FACILITY NFSDDBG_PROC >>>>>> >>>>>> static u32 nfsd_attrmask[] = { >>>>>> @@ -230,6 +260,9 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o >>>>>> (u32 *)open->op_verf.data, >>>>>> &open->op_truncate, &open->op_created); >>>>>> >>>>>> + if (!status && open->op_label != NULL) >>>>>> + nfsd4_security_inode_setsecctx(resfh, open->op_label, open->op_bmval); >>>>>> + >>>>>> /* >>>>>> * Following rfc 3530 14.2.16, use the returned bitmask >>>>>> * to indicate which attributes we used to store the >>>>>> @@ -599,6 +632,9 @@ nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, >>>>>> if (status) >>>>>> goto out; >>>>>> >>>>>> + if (create->cr_label != NULL) >>>>>> + nfsd4_security_inode_setsecctx(&resfh, create->cr_label, create->cr_bmval); >>>>>> + >>>>>> if (create->cr_acl != NULL) >>>>>> do_set_nfs4_acl(rqstp, &resfh, create->cr_acl, >>>>>> create->cr_bmval); >>>>>> @@ -888,6 +924,11 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, >>>>>> setattr->sa_acl); >>>>>> if (status) >>>>>> goto out; >>>>>> + if (setattr->sa_label != NULL) >>>>>> + status = nfsd4_set_nfs4_label(rqstp, &cstate->current_fh, >>>>>> + setattr->sa_label); >>>>>> + if (status) >>>>>> + goto out; >>>>>> status = nfsd_setattr(rqstp, &cstate->current_fh, &setattr->sa_iattr, >>>>>> 0, (time_t)0); >>>>>> out: >>>>>> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c >>>>>> index 0116886..52e219c 100644 >>>>>> --- a/fs/nfsd/nfs4xdr.c >>>>>> +++ b/fs/nfsd/nfs4xdr.c >>>>>> @@ -55,6 +55,11 @@ >>>>>> #include "cache.h" >>>>>> #include "netns.h" >>>>>> >>>>>> +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL >>>>>> +#include <linux/security.h> >>>>>> +#endif >>>>>> + >>>>>> + >>>>>> #define NFSDDBG_FACILITY NFSDDBG_XDR >>>>>> >>>>>> /* >>>>>> @@ -79,6 +84,24 @@ check_filename(char *str, int len) >>>>>> return nfserr_badname; >>>>>> return 0; >>>>>> } >>>>>> +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL >>>>>> +static struct nfs4_label *nfsd4_label_alloc(u32 len) >>>>>> +{ >>>>>> + struct nfs4_label *label = NULL; >>>>>> + >>>>>> + if (len > NFS4_MAXLABELLEN) >>>>>> + return ERR_PTR(-ENAMETOOLONG); >>>>> >>>>> This is returned as NFS4ERR_NAMETOOLONG. >>>>> >>>>> The 4.2 spec should note this case, if it's the right error. rfc 5661 >>>>> says that error's only for filenames, and doesn't allow it for setattr >>>>> (which doesn't take a filename). >>>> The 4.2 spec (draft-ietf-nfsv4-minorversion2-19.txt) defines two Labeled >>>> NFS errors: >>>> NFS4ERR_BADLABEL (Error Code 10093) >>>> NFS4ERR_WRONG_LFS (Error Code 10092) >>>> >>>> and we currently don't define either one of them... So I guess that >>>> will have to change... >>> >>> http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion2-19#section-11.1.3.1 >>> just says "The label specified is invalid in some manner" for >>> NFS4ERR_BADLABEL. >>> >>> Anyway, that sounds like the right one for this case.... >>> >>>> So what should NFS4ERR_BADLABEL map to in nfserrno()? >>> >>> I don't know; I guess I'd check out what errors can be returned from the >>> code that sets a context. >> Looking looking at the code under security/selinux, the popular returns >> seem to be are >> -EOPNOTSUPP, -EACCES, -EPERM and -EINVAL. >> >> I say we go with -EINVAL.... > > Note nfserrno() converts from -ERR to nfs4 errors. You may be thinking > of the client side nfs4_stat_to_errno(). I was looking at nfsd4_decode_fattr()... If nfsd4_label_alloc() does fail, host_err is set and we jump to out_nfserr:. Then status is then set by the return value of nfserrno(host_err); I'm thinking that status should be set to -EINVAL steved. -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html