NFSD: Server implementation of MAC Labeling
Subsystems (2)
PATCH 1/1 NFSD: Server implementation of MAC Labeling
From: David Quigley <[email protected]>
Implement labeled NFS on the server: encoding and decoding, and writing and reading, of file labels.
Enabled with CONFIG_NFSD_V4_SECURITY_LABEL.
Signed-off-by Matthew N. Dodd <[email protected]>
Signed-off-by Miguel Rodel Felipe <[email protected]>
Signed-off-by Phua Eu Gene <[email protected]>
Signed-off-by Khin Mi Mi Aung <[email protected]>
Signed-off-by J. Bruce Fields <[email protected]>
--- fs/nfsd/Kconfig | 16 ++++++++ fs/nfsd/nfs4proc.c | 41 ++++++++++++++++++++ fs/nfsd/nfs4xdr.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++---- fs/nfsd/nfsd.h | 18 ++++++++- fs/nfsd/vfs.c | 28 ++++++++++++++ fs/nfsd/vfs.h | 2 + fs/nfsd/xdr4.h | 4 ++ 7 files changed, 207 insertions(+), 10 deletions(-)
Steved, this patch includes your fixes from the weekend--is it working for you now?
If so, I'll go ahead and commit for 3.11.
It applies on top of the for-3.11 branch at
git://linux-nfs.org/~bfields/linux.git for-3.11
--b.
fs/nfsd/Kconfig +16 -0
@@ -81,6 +81,22 @@ config NFSD_V4 If unsure, say N. +config NFSD_V4_SECURITY_LABEL + bool "Provide Security Label support for NFSv4 server" + depends on NFSD_V4 && SECURITY + help + + Say Y here if you want enable fine-grained security label attribute + support for NFS version 4. Security labels allow security modules like + SELinux and Smack to label files to facilitate enforcement of their policies. + Without this an NFSv4 mount will have the same label on each file. + + If you do not wish to enable fine-grained security labels SELinux or + Smack policies on NFSv4 files, say N. + + WARNING: there is still a chance of backwards-incompatible protocol changes. + For now we recommend "Y" only for developers and testers." + config NFSD_FAULT_INJECTION bool "NFS server manual fault injection" depends on NFSD_V4 && DEBUG_KERNEL
fs/nfsd/nfs4proc.c +41 -0
65 lines not on this page · raw message
fs/nfsd/nfs4xdr.c +100 -8
199 lines not on this page · raw message
fs/nfsd/nfsd.h +16 -2
@@ -328,6 +328,13 @@ void nfsd_lockd_shutdown(void);#define NFSD4_1_SUPPORTED_ATTRS_WORD2 \ (NFSD4_SUPPORTED_ATTRS_WORD2 | FATTR4_WORD2_SUPPATTR_EXCLCREAT) +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL +#define NFSD4_2_SUPPORTED_ATTRS_WORD2 \ + (NFSD4_1_SUPPORTED_ATTRS_WORD2 | FATTR4_WORD2_SECURITY_LABEL) +#else +#define NFSD4_2_SUPPORTED_ATTRS_WORD2 0 +#endif +static inline u32 nfsd_suppattrs0 (u32 minorversion) { return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD0
@@ -342,8 +349,11 @@ static inline u32 nfsd_suppattrs1(u32 minorversion)static inline u32 nfsd_suppattrs2 (u32 minorversion) { -return minorversion ?NFSD4_1_SUPPORTED_ATTRS_WORD2 - :NFSD4_SUPPORTED_ATTRS_WORD2 ; +switch (minorversion) { +default :return NFSD4_2_SUPPORTED_ATTRS_WORD2 ; +case 1 :return NFSD4_1_SUPPORTED_ATTRS_WORD2 ; +case 0 :return NFSD4_SUPPORTED_ATTRS_WORD2 ; + } }/* These will return ERR_INVAL if specified in GETATTR or READDIR. */
@@ -356,7 +366,11 @@ static inline u32 nfsd_suppattrs2(u32 minorversion)#define NFSD_WRITEABLE_ATTRS_WORD1 \ (FATTR4_WORD1_MODE | FATTR4_WORD1_OWNER | FATTR4_WORD1_OWNER_GROUP \ | FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_MODIFY_SET) +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL +#define NFSD_WRITEABLE_ATTRS_WORD2 FATTR4_WORD2_SECURITY_LABEL +#else #define NFSD_WRITEABLE_ATTRS_WORD2 0 +#endif #define NFSD_SUPPATTR_EXCLCREAT_WORD0 \ NFSD_WRITEABLE_ATTRS_WORD0
fs/nfsd/vfs.c +28 -0
@@ -28,6 +28,7 @@#include <asm/uaccess.h> #include <linux/exportfs.h> #include <linux/writeback.h> +#include <linux/security.h> #ifdef CONFIG_NFSD_V3 #include "xdr3.h"
@@ -621,6 +622,33 @@ int nfsd4_is_junction(struct dentry *dentry)return 0 ;return 1 ; } +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL +__be32 nfsd4_set_nfs4_label (struct svc_rqst *rqstp,struct svc_fh *fhp, +struct xdr_netobj *label) +{ +__be32 error; +int host_error; +struct dentry *dentry; + + error =fh_verify (rqstp, fhp,0 /* S_IFREG */ ,NFSD_MAY_SATTR ); +if (error) +return error; + + dentry = fhp->fh_dentry; + +mutex_lock (&dentry->d_inode->i_mutex); + host_error =security_inode_setsecctx (dentry, label->data, label->len); +mutex_unlock (&dentry->d_inode->i_mutex); +return nfserrno (host_error); +} +#else +__be32 nfsd4_set_nfs4_label (struct svc_rqst *rqstp,struct svc_fh *fhp, +struct xdr_netobj *label) +{ +return nfserr_notsupp; +} +#endif +#endif /* defined(CONFIG_NFSD_V4) */ #ifdef CONFIG_NFSD_V3
fs/nfsd/vfs.h +2 -0
@@ -55,6 +55,8 @@ int nfsd_mountpoint(struct dentry *, struct svc_export *);__be32 nfsd4_set_nfs4_acl (struct svc_rqst *,struct svc_fh *,struct nfs4_acl *);int nfsd4_get_nfs4_acl (struct svc_rqst *,struct dentry *,struct nfs4_acl **); +__be32 nfsd4_set_nfs4_label (struct svc_rqst *,struct svc_fh *, +struct xdr_netobj *);#endif /* CONFIG_NFSD_V4 */ __be32 nfsd_create(struct svc_rqst *, struct svc_fh *, char *name, int len, struct iattr *attrs,
fs/nfsd/xdr4.h +4 -0
@@ -40,6 +40,7 @@#include "state.h" #include "nfsd.h" +#define NFSD4_MAX_SEC_LABEL_LEN 2048#define NFSD4_MAX_TAGLEN 128#define XDR_LEN (n) (((n) + 3) & ~3)
@@ -118,6 +119,7 @@ struct nfsd4_create {struct iattr cr_iattr;/* request */ struct nfsd4_change_info cr_cinfo;/* response */ struct nfs4_acl *cr_acl; +struct xdr_netobj cr_label; };#define cr_linklen u.link.namelen#define cr_linkname u.link.name
@@ -246,6 +248,7 @@ struct nfsd4_open {struct nfs4_file *op_file;/* used during processing */ struct nfs4_ol_stateid *op_stp;/* used during processing */ struct nfs4_acl *op_acl; +struct xdr_netobj op_label; };#define op_iattr iattr
@@ -330,6 +333,7 @@ struct nfsd4_setattr {u32 sa_bmval[3 ];/* request */ struct iattr sa_iattr;/* request */ struct nfs4_acl *sa_acl; +struct xdr_netobj sa_label; };struct nfsd4_setclientid {
Signature · 1 line
1.7.9.5