lnfs: linux-3.9 release
Subsystems (6)
cover lnfs: linux-3.9 release
From: Steve Dickson <[email protected]>
Here is an the next rlease of the label NFS patches ported to the linux-3.9 release
The following changes were made from the previous release. (Note, only the server patch changed in this release)
* Remove the buffer overflow in the allocation of labels.
* Removed needless char * casting
* Removed the -EMSGSIZE to nfs4err_badlabel errno mapping by changing the return value of nfsd4_label_alloc() to be a _be32 value.
David Quigley (12):
Security: Add hook to calculate context based on a negative dentry.
Security: Add Hook to test if the particular xattr is part of a MAC
model.
LSM: Add flags field to security_sb_set_mnt_opts for in kernel mount
data.
SELinux: Add new labeling type native labels
NFSv4: Add label recommended attribute and NFSv4 flags
NFSv4: Introduce new label structure
NFSv4: Extend fattr bitmaps to support all 3 words NFS:Add labels to client function prototypes
NFS: Add label lifecycle management
NFS: Client implementation of Labeled-NFS
NFS: Extend NFS xattr handlers to accept the security namespace
NFSD: Server implementation of MAC Labeling
Steve Dickson (5):
NFSv4.2: Added v4.2 error codes
NFSv4.2: Added NFS v4.2 support to the NFS client NFSDv4.2: Added NFS v4.2 support to the NFS server
Kconfig: Add Kconfig entry for Labeled NFS V4 client
Kconfig: Add Kconfig entry for Labeled NFS V4 server
fs/nfs/Kconfig | 28 ++ fs/nfs/callback.c | 1 + fs/nfs/client.c | 2 +- fs/nfs/dir.c | 46 ++- fs/nfs/getroot.c | 2 +- fs/nfs/inode.c | 133 ++++++-- fs/nfs/namespace.c | 2 +- fs/nfs/nfs3acl.c | 4 +- fs/nfs/nfs3proc.c | 41 +-- fs/nfs/nfs4_fs.h | 8 +- fs/nfs/nfs4client.c | 5 + fs/nfs/nfs4namespace.c | 2 +- fs/nfs/nfs4proc.c | 596 ++++++++++++++++++++++++++++++++---- fs/nfs/nfs4xdr.c | 188 +++++++++--- fs/nfs/pnfs.c | 2 +- fs/nfs/proc.c | 15 +- fs/nfs/super.c | 24 +- fs/nfsd/Kconfig | 16 + fs/nfsd/nfs4proc.c | 41 +++ fs/nfsd/nfs4xdr.c | 124 +++++++- fs/nfsd/nfsd.h | 22 +- fs/nfsd/vfs.c | 28 ++ fs/nfsd/vfs.h | 2 + fs/nfsd/xdr4.h | 3 + include/linux/nfs4.h | 20 ++ include/linux/nfs_fs.h | 40 ++- include/linux/nfs_fs_sb.h | 10 +- include/linux/nfs_xdr.h | 30 +- include/linux/security.h | 57 +++- include/uapi/linux/nfs4.h | 2 +- security/capability.c | 19 +- security/security.c | 24 +- security/selinux/hooks.c | 92 +++++- security/selinux/include/security.h | 2 + security/selinux/ss/policydb.c | 5 +- security/smack/smack_lsm.c | 11 + 36 files changed, 1427 insertions(+), 220 deletions(-)
Signature · 1 line
1.8.1.4
A message that is not in the archive (sent off-list or not yet received): 1367515151-31015-1-git-send-email-SteveD-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
PATCH 3/17 NFSDv4.2: Added NFS v4.2 support to the NFS server
From: Steve Dickson <[email protected]>
This enable NFSv4.2 support for the server. To enable this code do the following:
echo "+4.2" >/proc/fs/nfsd/versions
after the nfsd kernel module is loaded.
--- fs/nfsd/nfs4xdr.c | 1 + fs/nfsd/nfsd.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
fs/nfsd/nfs4xdr.c +1 -0
@@ -1572,6 +1572,7 @@ struct nfsd4_minorversion_ops {static struct nfsd4_minorversion_ops nfsd4_minorversion[] = { [0 ] = { nfsd4_dec_ops,ARRAY_SIZE (nfsd4_dec_ops) }, [1 ] = { nfsd41_dec_ops,ARRAY_SIZE (nfsd41_dec_ops) }, + [2 ] = { nfsd41_dec_ops,ARRAY_SIZE (nfsd41_dec_ops) }, }; static __be32
fs/nfsd/nfsd.h +1 -1
@@ -24,7 +24,7 @@/* * nfsd version */ -#define NFSD_SUPPORTED_MINOR_VERSION 1 +#define NFSD_SUPPORTED_MINOR_VERSION 2/* * Maximum blocksizes supported by daemon under various circumstances. */
Signature · 6 lines
1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/17 NFSv4.2: Added v4.2 error codes
In reply to Steve DicksonFrom: Steve Dickson <[email protected]>
--- fs/nfsd/nfsd.h | 6 ++++++ include/linux/nfs4.h | 8 ++++++++ 2 files changed, 14 insertions(+)
fs/nfsd/nfsd.h +6 -0
@@ -243,6 +243,12 @@ void nfsd_lockd_shutdown(void);#define nfserr_reject_deleg cpu_to_be32(NFS4ERR_REJECT_DELEG)#define nfserr_returnconflict cpu_to_be32(NFS4ERR_RETURNCONFLICT)#define nfserr_deleg_revoked cpu_to_be32(NFS4ERR_DELEG_REVOKED) +#define nfserr_partner_notsupp cpu_to_be32(NFS4ERR_PARTNER_NOTSUPP) +#define nfserr_partner_no_auth cpu_to_be32(NFS4ERR_PARTNER_NO_AUTH) +#define nfserr_metadata_notsupp cpu_to_be32(NFS4ERR_METADATA_NOTSUPP) +#define nfserr_offload_denied cpu_to_be32(NFS4ERR_OFFLOAD_DENIED) +#define nfserr_wrong_lfs cpu_to_be32(NFS4ERR_WRONG_LFS) +#define nfserr_badlabel cpu_to_be32(NFS4ERR_BADLABEL)/* error codes for internal use */ /* if a request fails due to kmalloc failure, it gets dropped.
include/linux/nfs4.h +8 -0
@@ -219,6 +219,14 @@ enum nfsstat4 {NFS4ERR_REJECT_DELEG =10085 ,/* on callback */ NFS4ERR_RETURNCONFLICT =10086 ,/* outstanding layoutreturn */ NFS4ERR_DELEG_REVOKED =10087 ,/* deleg./layout revoked */ + +/* nfs42 */ +NFS4ERR_PARTNER_NOTSUPP =10088 , +NFS4ERR_PARTNER_NO_AUTH =10089 , +NFS4ERR_METADATA_NOTSUPP =10090 , +NFS4ERR_OFFLOAD_DENIED =10091 , +NFS4ERR_WRONG_LFS =10092 , + NFS4ERR_BADLABEL = 10093, };static inline bool seqid_mutating_err (u32 err)
Signature · 1 line
1.8.1.4
PATCH 2/17 NFSv4.2: Added NFS v4.2 support to the NFS client
In reply to Steve DicksonFrom: Steve Dickson <[email protected]>
This enable NFSv4.2 support. To enable this code the CONFIG_NFS_V4_2 Kconfig define needs to be set and the -o v4.2 mount option need to be used.
--- fs/nfs/Kconfig | 9 +++++++++ fs/nfs/callback.c | 1 + fs/nfs/nfs4client.c | 5 +++++ fs/nfs/nfs4proc.c | 15 +++++++++++++++ fs/nfs/super.c | 7 ++++++- include/linux/nfs4.h | 4 ++++ 6 files changed, 40 insertions(+), 1 deletion(-)
fs/nfs/Kconfig +9 -0
@@ -104,6 +104,15 @@ config NFS_V4_1 If unsure, say N. +config NFS_V4_2 + bool "NFS client support for NFSv4.2" + depends on NFS_V4_1 + help + This option enables support for minor version 1 of the NFSv4 protocol + in the kernel's NFS client. + + If unsure, say N. + config PNFS_FILE_LAYOUT tristate depends on NFS_V4_1
fs/nfs/callback.c +1 -0
@@ -279,6 +279,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n ret =nfs4_callback_up_net (serv, net);break ;case 1 : +case 2 : ret =nfs41_callback_up_net (serv, net);break ;default :
fs/nfs/nfs4client.c +5 -0
@@ -66,6 +66,11 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)if (err) goto error; +if (cl_init->minorversion >NFS4_MAX_MINOR_VERSION ) { + err = -EINVAL ; + goto error; + } +spin_lock_init (&clp->cl_lock);INIT_DELAYED_WORK (&clp->cl_renewd, nfs4_renew_state);rpc_init_wait_queue (&clp->cl_rpcwaitq,"NFS client" );
fs/nfs/nfs4proc.c +15 -0
@@ -6746,11 +6746,26 @@ static const struct nfs4_minor_version_ops nfs_v4_1_minor_ops = { };#endif +#if defined(CONFIG_NFS_V4_2 ) +static const struct nfs4_minor_version_ops nfs_v4_2_minor_ops = { + .minor_version =2 , + .call_sync = nfs4_call_sync_sequence, + .match_stateid = nfs41_match_stateid, + .find_root_sec = nfs41_find_root_sec, + .reboot_recovery_ops = &nfs41_reboot_recovery_ops, + .nograce_recovery_ops = &nfs41_nograce_recovery_ops, + .state_renewal_ops = &nfs41_state_renewal_ops, +}; +#endif +const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = { [0 ] = &nfs_v4_0_minor_ops, #if defined(CONFIG_NFS_V4_1) [1 ] = &nfs_v4_1_minor_ops, #endif +#if defined(CONFIG_NFS_V4_2) + [2 ] = &nfs_v4_2_minor_ops, +#endif };const struct inode_operations nfs4_dir_inode_operations = {
fs/nfs/super.c +6 -1
@@ -269,7 +269,7 @@ static match_table_t nfs_local_lock_tokens = {enum { Opt_vers_2, Opt_vers_3, Opt_vers_4, Opt_vers_4_0, - Opt_vers_4_1, + Opt_vers_4_1, Opt_vers_4_2, Opt_vers_err };
@@ -280,6 +280,7 @@ static match_table_t nfs_vers_tokens = { { Opt_vers_4, "4" }, { Opt_vers_4_0, "4.0" }, { Opt_vers_4_1, "4.1" }, + { Opt_vers_4_2, "4.2" }, { Opt_vers_err, NULL } };
@@ -1097,6 +1098,10 @@ static int nfs_parse_version_string(char *string, mnt->version =4 ; mnt->minorversion =1 ;break ; +case Opt_vers_4_2: + mnt->version =4 ; + mnt->minorversion =2 ; +break ;default :return 0 ; }
include/linux/nfs4.h +4 -0
@@ -398,11 +398,15 @@ enum lock_type4 {#define NFS4_VERSION 4#define NFS4_MINOR_VERSION 0 +#if defined(CONFIG_NFS_V4_2 ) +#define NFS4_MAX_MINOR_VERSION 2 +#else #if defined(CONFIG_NFS_V4_1 )#define NFS4_MAX_MINOR_VERSION 1#else #define NFS4_MAX_MINOR_VERSION 0#endif /* CONFIG_NFS_V4_1 */ +#endif /* CONFIG_NFS_V4_2 */ #define NFS4_DEBUG 1
Signature · 1 line
1.8.1.4
PATCH 4/17 Security: Add hook to calculate context based on a negative dentry.
In reply to Steve DicksonFrom: David Quigley <[email protected]>
There is a time where we need to calculate a context without the inode having been created yet. To do this we take the negative dentry and calculate a context based on the process and the parent directory contexts.
--- include/linux/security.h | 27 +++++++++++++++++++++++++++ security/capability.c | 8 ++++++++ security/security.c | 10 ++++++++++ security/selinux/hooks.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+)
include/linux/security.h +27 -0
@@ -26,6 +26,7 @@#include <linux/capability.h> #include <linux/slab.h> #include <linux/err.h> +#include <linux/string.h> struct linux_binprm ;struct cred ;
@@ -306,6 +307,15 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)* Parse a string of security data filling in the opts structure * @options string containing all mount options known by the LSM * @opts binary data structure usable by the LSM +* @dentry_init_security: +* Compute a context for a dentry as the inode is not yet available +* since NFSv4 has no label backed by an EA anyway. +* @dentry dentry to use in calculating the context. +* @mode mode used to determine resource type. +* @name name of the last path component used to create file +* @ctx pointer to place the pointer to the resulting context in. +* @ctxlen point to place the length of the resulting context. +* * * Security hooks for inode operations. *
@@ -1443,6 +1453,10 @@ struct security_operations {void (*sb_clone_mnt_opts) (const struct super_block *oldsb,struct super_block *newsb);int (*sb_parse_opts_str) (char *options,struct security_mnt_opts *opts); +int (*dentry_init_security) (struct dentry *dentry,int mode, +struct qstr *name,void **ctx, +u32 *ctxlen); +#ifdef CONFIG_SECURITY_PATH int (*path_unlink) (struct path *dir,struct dentry *dentry);
@@ -1729,6 +1743,9 @@ int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *ovoid security_sb_clone_mnt_opts (const struct super_block *oldsb,struct super_block *newsb);int security_sb_parse_opts_str (char *options,struct security_mnt_opts *opts); +int security_dentry_init_security (struct dentry *dentry,int mode, +struct qstr *name,void **ctx, +u32 *ctxlen);int security_inode_alloc (struct inode *inode);void security_inode_free (struct inode *inode);
@@ -2033,6 +2050,16 @@ static inline int security_inode_alloc(struct inode *inode)static inline void security_inode_free (struct inode *inode) { } +static inline int security_dentry_init_security (struct dentry *dentry, +int mode, +struct qstr *name, +void **ctx, +u32 *ctxlen) +{ +return -EOPNOTSUPP ; +} + + static inline int security_inode_init_security(struct inode *inode, struct inode *dir, const struct qstr *qstr,
security/capability.c +8 -0
@@ -108,6 +108,13 @@ static int cap_sb_parse_opts_str(char *options, struct security_mnt_opts *opts)return 0 ; } +static int cap_dentry_init_security (struct dentry *dentry,int mode, +struct qstr *name,void **ctx, +u32 *ctxlen) +{ +return 0 ; +} +static int cap_inode_alloc_security (struct inode *inode) {return 0 ;
@@ -930,6 +937,7 @@ void __init security_fixup_ops(struct security_operations *ops)set_to_cap_if_null (ops, sb_set_mnt_opts);set_to_cap_if_null (ops, sb_clone_mnt_opts);set_to_cap_if_null (ops, sb_parse_opts_str); +set_to_cap_if_null (ops, dentry_init_security);set_to_cap_if_null (ops, inode_alloc_security);set_to_cap_if_null (ops, inode_free_security);set_to_cap_if_null (ops, inode_init_security);
security/security.c +10 -0
@@ -12,6 +12,7 @@*/ #include <linux/capability.h> +#include <linux/dcache.h> #include <linux/module.h> #include <linux/init.h> #include <linux/kernel.h>
@@ -324,6 +325,15 @@ void security_inode_free(struct inode *inode) security_ops->inode_free_security (inode); } +int security_dentry_init_security (struct dentry *dentry,int mode, +struct qstr *name,void **ctx, +u32 *ctxlen) +{ +return security_ops->dentry_init_security (dentry, mode, name, + ctx, ctxlen); +} +EXPORT_SYMBOL (security_dentry_init_security); +int security_inode_init_security (struct inode *inode,struct inode *dir,const struct qstr *qstr,const initxattrs initxattrs,void *fs_data)
security/selinux/hooks.c +35 -0
@@ -2484,6 +2484,40 @@ static void selinux_inode_free_security(struct inode *inode)inode_free_security (inode); } +static int selinux_dentry_init_security (struct dentry *dentry,int mode, +struct qstr *name,void **ctx, +u32 *ctxlen) +{ +const struct cred *cred =current_cred (); +struct task_security_struct *tsec; +struct inode_security_struct *dsec; +struct superblock_security_struct *sbsec; +struct inode *dir = dentry->d_parent->d_inode; +u32 newsid; +int rc; + + tsec = cred->security; + dsec = dir->i_security; + sbsec = dir->i_sb->s_security; + +if (tsec->create_sid && sbsec->behavior !=SECURITY_FS_USE_MNTPOINT ) { + newsid = tsec->create_sid; + }else { + rc =security_transition_sid (tsec->sid, dsec->sid, +inode_mode_to_security_class (mode), + name, + &newsid); +if (rc) { +printk (KERN_WARNING +"%s: security_transition_sid failed, rc=%d\n" , + __func__, -rc); +return rc; + } + } + +return security_sid_to_context (newsid, (char **)ctx, ctxlen); +} +static int selinux_inode_init_security (struct inode *inode,struct inode *dir,const struct qstr *qstr,char **name,void **value,size_t *len)
@@ -5531,6 +5565,7 @@ static struct security_operations selinux_ops = { .sb_clone_mnt_opts = selinux_sb_clone_mnt_opts, .sb_parse_opts_str = selinux_parse_opts_str, + .dentry_init_security = selinux_dentry_init_security, .inode_alloc_security = selinux_inode_alloc_security, .inode_free_security = selinux_inode_free_security,
Signature · 1 line
1.8.1.4
Re: [PATCH 04/17] Security: Add hook to calculate context based on a negative dentry.
Quoted 10 lines · Steve Dickson
From: David Quigley <[email protected]>
There is a time where we need to calculate a context without the inode having been created yet. To do this we take the negative dentry and calculate a context based on the process and the parent directory contexts.
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]>
Quoted 188 lines
--- include/linux/security.h | 27 +++++++++++++++++++++++++++ security/capability.c | 8 ++++++++ security/security.c | 10 ++++++++++ security/selinux/hooks.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+)include/linux/security.h +27
-0@@ -26,6 +26,7 @@#include <linux/capability.h> #include <linux/slab.h> #include <linux/err.h> +#include <linux/string.h> struct linux_binprm ;struct cred ;@@ -306,6 +307,15 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)* Parse a string of security data filling in the opts structure * @options string containing all mount options known by the LSM * @opts binary data structure usable by the LSM +* @dentry_init_security: +* Compute a context for a dentry as the inode is not yet available +* since NFSv4 has no label backed by an EA anyway. +* @dentry dentry to use in calculating the context. +* @mode mode used to determine resource type. +* @name name of the last path component used to create file +* @ctx pointer to place the pointer to the resulting context in. +* @ctxlen point to place the length of the resulting context. +* * * Security hooks for inode operations. * @@ -1443,6 +1453,10 @@ struct security_operations {void (*sb_clone_mnt_opts) (const struct super_block *oldsb,struct super_block *newsb);int (*sb_parse_opts_str) (char *options,struct security_mnt_opts *opts); +int (*dentry_init_security) (struct dentry *dentry,int mode, +struct qstr *name,void **ctx, +u32 *ctxlen); +#ifdef CONFIG_SECURITY_PATH int (*path_unlink) (struct path *dir,struct dentry *dentry);@@ -1729,6 +1743,9 @@ int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *ovoid security_sb_clone_mnt_opts (const struct super_block *oldsb,struct super_block *newsb);int security_sb_parse_opts_str (char *options,struct security_mnt_opts *opts); +int security_dentry_init_security (struct dentry *dentry,int mode, +struct qstr *name,void **ctx, +u32 *ctxlen);int security_inode_alloc (struct inode *inode);void security_inode_free (struct inode *inode);@@ -2033,6 +2050,16 @@ static inline int security_inode_alloc(struct inode *inode)static inline void security_inode_free (struct inode *inode) { } +static inline int security_dentry_init_security (struct dentry *dentry, +int mode, +struct qstr *name, +void **ctx, +u32 *ctxlen) +{ +return -EOPNOTSUPP ; +} + + static inline int security_inode_init_security(struct inode *inode, struct inode *dir, const struct qstr *qstr,security/capability.c +8
-0@@ -108,6 +108,13 @@ static int cap_sb_parse_opts_str(char *options, struct security_mnt_opts *opts)return 0 ; } +static int cap_dentry_init_security (struct dentry *dentry,int mode, +struct qstr *name,void **ctx, +u32 *ctxlen) +{ +return 0 ; +} +static int cap_inode_alloc_security (struct inode *inode) {return 0 ;@@ -930,6 +937,7 @@ void __init security_fixup_ops(struct security_operations *ops)set_to_cap_if_null (ops, sb_set_mnt_opts);set_to_cap_if_null (ops, sb_clone_mnt_opts);set_to_cap_if_null (ops, sb_parse_opts_str); +set_to_cap_if_null (ops, dentry_init_security);set_to_cap_if_null (ops, inode_alloc_security);set_to_cap_if_null (ops, inode_free_security);set_to_cap_if_null (ops, inode_init_security);security/security.c +10
-0@@ -12,6 +12,7 @@*/ #include <linux/capability.h> +#include <linux/dcache.h> #include <linux/module.h> #include <linux/init.h> #include <linux/kernel.h> @@ -324,6 +325,15 @@ void security_inode_free(struct inode *inode) security_ops->inode_free_security (inode); } +int security_dentry_init_security (struct dentry *dentry,int mode, +struct qstr *name,void **ctx, +u32 *ctxlen) +{ +return security_ops->dentry_init_security (dentry, mode, name, + ctx, ctxlen); +} +EXPORT_SYMBOL (security_dentry_init_security); +int security_inode_init_security (struct inode *inode,struct inode *dir,const struct qstr *qstr,const initxattrs initxattrs,void *fs_data)security/selinux/hooks.c +35
-0@@ -2484,6 +2484,40 @@ static void selinux_inode_free_security(struct inode *inode)inode_free_security (inode); } +static int selinux_dentry_init_security (struct dentry *dentry,int mode, +struct qstr *name,void **ctx, +u32 *ctxlen) +{ +const struct cred *cred =current_cred (); +struct task_security_struct *tsec; +struct inode_security_struct *dsec; +struct superblock_security_struct *sbsec; +struct inode *dir = dentry->d_parent->d_inode; +u32 newsid; +int rc; + + tsec = cred->security; + dsec = dir->i_security; + sbsec = dir->i_sb->s_security; + +if (tsec->create_sid && sbsec->behavior !=SECURITY_FS_USE_MNTPOINT ) { + newsid = tsec->create_sid; + }else { + rc =security_transition_sid (tsec->sid, dsec->sid, +inode_mode_to_security_class (mode), + name, + &newsid); +if (rc) { +printk (KERN_WARNING +"%s: security_transition_sid failed, rc=%d\n" , + __func__, -rc); +return rc; + } + } + +return security_sid_to_context (newsid, (char **)ctx, ctxlen); +} +static int selinux_inode_init_security (struct inode *inode,struct inode *dir,const struct qstr *qstr,char **name,void **value,size_t *len)@@ -5531,6 +5565,7 @@ static struct security_operations selinux_ops = { .sb_clone_mnt_opts = selinux_sb_clone_mnt_opts, .sb_parse_opts_str = selinux_parse_opts_str, + .dentry_init_security = selinux_dentry_init_security, .inode_alloc_security = selinux_inode_alloc_security, .inode_free_security = selinux_inode_free_security,Signature · 6 lines
1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
James Morris <[email protected]>
PATCH 5/17 Security: Add Hook to test if the particular xattr is part of a MAC model.
In reply to Steve DicksonFrom: David Quigley <[email protected]>
The interface to request security labels from user space is the xattr interface. When requesting the security label from an NFS server it is important to make sure the requested xattr actually is a MAC label. This allows us to make sure that we get the desired semantics from the attribute instead of something else such as capabilities or a time based LSM.
--- include/linux/security.h | 14 ++++++++++++++ security/capability.c | 6 ++++++ security/security.c | 6 ++++++ security/selinux/hooks.c | 6 ++++++ security/smack/smack_lsm.c | 11 +++++++++++ 5 files changed, 43 insertions(+)
include/linux/security.h +14 -0
@@ -1323,6 +1323,13 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)* @pages contains the number of pages. * Return 0 if permission is granted. * +* @ismaclabel: +* Check if the extended attribute specified by @name +* represents a MAC label. Returns 1 if name is a MAC +* attribute otherwise returns 0. +* @name full extended attribute name to check against +* LSM as a MAC label. +* * @secid_to_secctx: * Convert secid to security context. If secdata is NULL the length of * the result will be returned in seclen, but no secdata will be returned.
@@ -1604,6 +1611,7 @@ struct security_operations {int (*getprocattr) (struct task_struct *p,char *name,char **value);int (*setprocattr) (struct task_struct *p,char *name,void *value,size_t size); +int (*ismaclabel) (const char *name);int (*secid_to_secctx) (u32 secid,char **secdata,u32 *seclen);int (*secctx_to_secid) (const char *secdata,u32 seclen,u32 *secid);void (*release_secctx) (char *secdata,u32 seclen);
@@ -1857,6 +1865,7 @@ void security_d_instantiate(struct dentry *dentry, struct inode *inode);int security_getprocattr (struct task_struct *p,char *name,char **value);int security_setprocattr (struct task_struct *p,char *name,void *value,size_t size);int security_netlink_send (struct sock *sk,struct sk_buff *skb); +int security_ismaclabel (const char *name);int security_secid_to_secctx (u32 secid,char **secdata,u32 *seclen);int security_secctx_to_secid (const char *secdata,u32 seclen,u32 *secid);void security_release_secctx (char *secdata,u32 seclen);
@@ -2545,6 +2554,11 @@ static inline int security_netlink_send(struct sock *sk, struct sk_buff *skb)return cap_netlink_send (sk, skb); } +static inline int security_ismaclabel (const char *name) +{ +return 0 ; +} +static inline int security_secid_to_secctx (u32 secid,char **secdata,u32 *seclen) {return -EOPNOTSUPP ;
security/capability.c +6 -0
@@ -822,6 +822,11 @@ static int cap_setprocattr(struct task_struct *p, char *name, void *value,return -EINVAL ; } +static int cap_ismaclabel (const char *name) +{ +return 0 ; +} +static int cap_secid_to_secctx (u32 secid,char **secdata,u32 *seclen) {return -EOPNOTSUPP ;
@@ -1041,6 +1046,7 @@ void __init security_fixup_ops(struct security_operations *ops)set_to_cap_if_null (ops, d_instantiate);set_to_cap_if_null (ops, getprocattr);set_to_cap_if_null (ops, setprocattr); +set_to_cap_if_null (ops, ismaclabel);set_to_cap_if_null (ops, secid_to_secctx);set_to_cap_if_null (ops, secctx_to_secid);set_to_cap_if_null (ops, release_secctx);
security/security.c +6 -0
@@ -1057,6 +1057,12 @@ int security_netlink_send(struct sock *sk, struct sk_buff *skb)return security_ops->netlink_send (sk, skb); } +int security_ismaclabel (const char *name) +{ +return security_ops->ismaclabel (name); +} +EXPORT_SYMBOL (security_ismaclabel); +int security_secid_to_secctx (u32 secid,char **secdata,u32 *seclen) {return security_ops->secid_to_secctx (secid, secdata, seclen);
security/selinux/hooks.c +6 -0
@@ -5423,6 +5423,11 @@ abort_change:return error; } +static int selinux_ismaclabel (const char *name) +{ +return (strcmp (name,XATTR_SELINUX_SUFFIX ) ==0 ); +} +static int selinux_secid_to_secctx (u32 secid,char **secdata,u32 *seclen) {return security_sid_to_context (secid, secdata, seclen);
@@ -5661,6 +5666,7 @@ static struct security_operations selinux_ops = { .getprocattr = selinux_getprocattr, .setprocattr = selinux_setprocattr, + .ismaclabel = selinux_ismaclabel, .secid_to_secctx = selinux_secid_to_secctx, .secctx_to_secid = selinux_secctx_to_secid, .release_secctx = selinux_release_secctx,
security/smack/smack_lsm.c +11 -0
@@ -3329,6 +3329,16 @@ static void smack_audit_rule_free(void *vrule)#endif /* CONFIG_AUDIT */ /** +* smack_ismaclabel - check if xattr @name references a smack MAC label +* @name: Full xattr name to check. +*/ +static int smack_ismaclabel (const char *name) +{ +return (strcmp (name,XATTR_SMACK_SUFFIX ) ==0 ); +} + + +/** * smack_secid_to_secctx - return the smack label for a secid * @secid: incoming integer * @secdata: destination
@@ -3524,6 +3534,7 @@ struct security_operations smack_ops = { .audit_rule_free = smack_audit_rule_free,#endif /* CONFIG_AUDIT */ + .ismaclabel = smack_ismaclabel, .secid_to_secctx = smack_secid_to_secctx, .secctx_to_secid = smack_secctx_to_secid, .release_secctx = smack_release_secctx,
Signature · 1 line
1.8.1.4
Re: [PATCH 05/17] Security: Add Hook to test if the particular xattr is part of a MAC model.
Quoted 8 lines · Steve Dickson
From: David Quigley <[email protected]>
The interface to request security labels from user space is the xattr interface. When requesting the security label from an NFS server it is important to make sure the requested xattr actually is a MAC label. This allows us to make sure that we get the desired semantics from the attribute instead of something else such as capabilities or a time based LSM.
Quoted 4 lines
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]>
Quoted 156 lines
--- include/linux/security.h | 14 ++++++++++++++ security/capability.c | 6 ++++++ security/security.c | 6 ++++++ security/selinux/hooks.c | 6 ++++++ security/smack/smack_lsm.c | 11 +++++++++++ 5 files changed, 43 insertions(+)include/linux/security.h +14
-0@@ -1323,6 +1323,13 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)* @pages contains the number of pages. * Return 0 if permission is granted. * +* @ismaclabel: +* Check if the extended attribute specified by @name +* represents a MAC label. Returns 1 if name is a MAC +* attribute otherwise returns 0. +* @name full extended attribute name to check against +* LSM as a MAC label. +* * @secid_to_secctx: * Convert secid to security context. If secdata is NULL the length of * the result will be returned in seclen, but no secdata will be returned. @@ -1604,6 +1611,7 @@ struct security_operations {int (*getprocattr) (struct task_struct *p,char *name,char **value);int (*setprocattr) (struct task_struct *p,char *name,void *value,size_t size); +int (*ismaclabel) (const char *name);int (*secid_to_secctx) (u32 secid,char **secdata,u32 *seclen);int (*secctx_to_secid) (const char *secdata,u32 seclen,u32 *secid);void (*release_secctx) (char *secdata,u32 seclen);@@ -1857,6 +1865,7 @@ void security_d_instantiate(struct dentry *dentry, struct inode *inode);int security_getprocattr (struct task_struct *p,char *name,char **value);int security_setprocattr (struct task_struct *p,char *name,void *value,size_t size);int security_netlink_send (struct sock *sk,struct sk_buff *skb); +int security_ismaclabel (const char *name);int security_secid_to_secctx (u32 secid,char **secdata,u32 *seclen);int security_secctx_to_secid (const char *secdata,u32 seclen,u32 *secid);void security_release_secctx (char *secdata,u32 seclen);@@ -2545,6 +2554,11 @@ static inline int security_netlink_send(struct sock *sk, struct sk_buff *skb)return cap_netlink_send (sk, skb); } +static inline int security_ismaclabel (const char *name) +{ +return 0 ; +} +static inline int security_secid_to_secctx (u32 secid,char **secdata,u32 *seclen) {return -EOPNOTSUPP ;security/capability.c +6
-0@@ -822,6 +822,11 @@ static int cap_setprocattr(struct task_struct *p, char *name, void *value,return -EINVAL ; } +static int cap_ismaclabel (const char *name) +{ +return 0 ; +} +static int cap_secid_to_secctx (u32 secid,char **secdata,u32 *seclen) {return -EOPNOTSUPP ;@@ -1041,6 +1046,7 @@ void __init security_fixup_ops(struct security_operations *ops)set_to_cap_if_null (ops, d_instantiate);set_to_cap_if_null (ops, getprocattr);set_to_cap_if_null (ops, setprocattr); +set_to_cap_if_null (ops, ismaclabel);set_to_cap_if_null (ops, secid_to_secctx);set_to_cap_if_null (ops, secctx_to_secid);set_to_cap_if_null (ops, release_secctx);security/security.c +6
-0@@ -1057,6 +1057,12 @@ int security_netlink_send(struct sock *sk, struct sk_buff *skb)return security_ops->netlink_send (sk, skb); } +int security_ismaclabel (const char *name) +{ +return security_ops->ismaclabel (name); +} +EXPORT_SYMBOL (security_ismaclabel); +int security_secid_to_secctx (u32 secid,char **secdata,u32 *seclen) {return security_ops->secid_to_secctx (secid, secdata, seclen);security/selinux/hooks.c +6
-0@@ -5423,6 +5423,11 @@ abort_change:return error; } +static int selinux_ismaclabel (const char *name) +{ +return (strcmp (name,XATTR_SELINUX_SUFFIX ) ==0 ); +} +static int selinux_secid_to_secctx (u32 secid,char **secdata,u32 *seclen) {return security_sid_to_context (secid, secdata, seclen);@@ -5661,6 +5666,7 @@ static struct security_operations selinux_ops = { .getprocattr = selinux_getprocattr, .setprocattr = selinux_setprocattr, + .ismaclabel = selinux_ismaclabel, .secid_to_secctx = selinux_secid_to_secctx, .secctx_to_secid = selinux_secctx_to_secid, .release_secctx = selinux_release_secctx,security/smack/smack_lsm.c +11
-0@@ -3329,6 +3329,16 @@ static void smack_audit_rule_free(void *vrule)#endif /* CONFIG_AUDIT */ /** +* smack_ismaclabel - check if xattr @name references a smack MAC label +* @name: Full xattr name to check. +*/ +static int smack_ismaclabel (const char *name) +{ +return (strcmp (name,XATTR_SMACK_SUFFIX ) ==0 ); +} + + +/** * smack_secid_to_secctx - return the smack label for a secid * @secid: incoming integer * @secdata: destination @@ -3524,6 +3534,7 @@ struct security_operations smack_ops = { .audit_rule_free = smack_audit_rule_free,#endif /* CONFIG_AUDIT */ + .ismaclabel = smack_ismaclabel, .secid_to_secctx = smack_secid_to_secctx, .secctx_to_secid = smack_secctx_to_secid, .release_secctx = smack_release_secctx,Signature · 6 lines
1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
James Morris <[email protected]>
PATCH 6/17 LSM: Add flags field to security_sb_set_mnt_opts for in kernel mount data.
In reply to Steve DicksonFrom: David Quigley <[email protected]>
There is no way to differentiate if a text mount option is passed from user space or the kernel. A flags field is being added to the security_sb_set_mnt_opts hook to allow for in kernel security flags to be sent to the LSM for processing in addition to the text options received from mount. This patch also updated existing code to fix compilation errors.
--- fs/nfs/super.c | 3 ++- include/linux/security.h | 13 ++++++++++--- security/capability.c | 5 ++++- security/security.c | 7 +++++-- security/selinux/hooks.c | 12 ++++++++++-- 5 files changed, 31 insertions(+), 9 deletions(-)
fs/nfs/super.c +2 -1
@@ -2378,7 +2378,8 @@ static int nfs_bdi_register(struct nfs_server *server)int nfs_set_sb_security (struct super_block *s,struct dentry *mntroot,struct nfs_mount_info *mount_info) { -return security_sb_set_mnt_opts (s, &mount_info->parsed->lsm_opts); +return security_sb_set_mnt_opts (s, &mount_info->parsed->lsm_opts, +0 ,NULL ); }EXPORT_SYMBOL_GPL (nfs_set_sb_security);
include/linux/security.h +10 -3
@@ -1456,7 +1456,9 @@ struct security_operations {int (*sb_pivotroot) (struct path *old_path,struct path *new_path);int (*sb_set_mnt_opts) (struct super_block *sb, -struct security_mnt_opts *opts); +struct security_mnt_opts *opts, +unsigned long kern_flags, +unsigned long *set_kern_flags);void (*sb_clone_mnt_opts) (const struct super_block *oldsb,struct super_block *newsb);int (*sb_parse_opts_str) (char *options,struct security_mnt_opts *opts);
@@ -1747,7 +1749,10 @@ int security_sb_mount(const char *dev_name, struct path *path, const char *type, unsigned long flags, void *data);int security_sb_umount (struct vfsmount *mnt,int flags);int security_sb_pivotroot (struct path *old_path,struct path *new_path); -int security_sb_set_mnt_opts (struct super_block *sb,struct security_mnt_opts *opts); +int security_sb_set_mnt_opts (struct super_block *sb, +struct security_mnt_opts *opts, +unsigned long kern_flags, +unsigned long *set_kern_flags);void security_sb_clone_mnt_opts (const struct super_block *oldsb,struct super_block *newsb);int security_sb_parse_opts_str (char *options,struct security_mnt_opts *opts);
@@ -2037,7 +2042,9 @@ static inline int security_sb_pivotroot(struct path *old_path, }static inline int security_sb_set_mnt_opts (struct super_block *sb, -struct security_mnt_opts *opts) +struct security_mnt_opts *opts, +unsigned long kern_flags, +unsigned long *set_kern_flags) {return 0 ; }
security/capability.c +4 -1
@@ -91,7 +91,10 @@ static int cap_sb_pivotroot(struct path *old_path, struct path *new_path) }static int cap_sb_set_mnt_opts (struct super_block *sb, -struct security_mnt_opts *opts) +struct security_mnt_opts *opts, +unsigned long kern_flags, +unsigned long *set_kern_flags) + {if (unlikely (opts->num_mnt_opts))return -EOPNOTSUPP ;
security/security.c +5 -2
@@ -294,9 +294,12 @@ int security_sb_pivotroot(struct path *old_path, struct path *new_path) }int security_sb_set_mnt_opts (struct super_block *sb, -struct security_mnt_opts *opts) +struct security_mnt_opts *opts, +unsigned long kern_flags, +unsigned long *set_kern_flags) { -return security_ops->sb_set_mnt_opts (sb, opts); +return security_ops->sb_set_mnt_opts (sb, opts, kern_flags, + set_kern_flags); }EXPORT_SYMBOL (security_sb_set_mnt_opts);
security/selinux/hooks.c +10 -2
@@ -552,7 +552,9 @@ static int bad_option(struct superblock_security_struct *sbsec, char flag,* labeling information. */ static int selinux_set_mnt_opts (struct super_block *sb, -struct security_mnt_opts *opts) +struct security_mnt_opts *opts, +unsigned long kern_flags, +unsigned long *set_kern_flags) {const struct cred *cred =current_cred ();int rc =0 , i;
@@ -580,6 +582,12 @@ static int selinux_set_mnt_opts(struct super_block *sb, "before the security server is initialized\n"); goto out; } +if (kern_flags && !set_kern_flags) { +/* Specifying internal flags without providing a place to +* place the results is not allowed */ + rc = -EINVAL ; + goto out; + }/* * Binary mount data FS will come through this function twice. Once
@@ -949,7 +957,7 @@ static int superblock_doinit(struct super_block *sb, void *data) goto out_err; out: - rc =selinux_set_mnt_opts (sb, &opts); + rc =selinux_set_mnt_opts (sb, &opts,0 ,NULL ); out_err:security_free_mnt_opts (&opts);
Signature · 1 line
1.8.1.4
Re: [PATCH 06/17] LSM: Add flags field to security_sb_set_mnt_opts for in kernel mount data.
Quoted 8 lines · Steve Dickson
From: David Quigley <[email protected]>
There is no way to differentiate if a text mount option is passed from user space or the kernel. A flags field is being added to the
security_sb_set_mnt_optshook to allow for in kernel security flags to be sent to the LSM for processing in addition to the text options received from mount. This patch also updated existing code to fix compilation errors.
Quoted 4 lines
Signed-off-by David P. Quigley <[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]>
Quoted 140 lines
--- fs/nfs/super.c | 3 ++- include/linux/security.h | 13 ++++++++++--- security/capability.c | 5 ++++- security/security.c | 7 +++++-- security/selinux/hooks.c | 12 ++++++++++-- 5 files changed, 31 insertions(+), 9 deletions(-)fs/nfs/super.c +2
-1@@ -2378,7 +2378,8 @@ static int nfs_bdi_register(struct nfs_server *server)int nfs_set_sb_security (struct super_block *s,struct dentry *mntroot,struct nfs_mount_info *mount_info) { -return security_sb_set_mnt_opts (s, &mount_info->parsed->lsm_opts); +return security_sb_set_mnt_opts (s, &mount_info->parsed->lsm_opts, +0 ,NULL ); }EXPORT_SYMBOL_GPL (nfs_set_sb_security);include/linux/security.h +10
-3@@ -1456,7 +1456,9 @@ struct security_operations {int (*sb_pivotroot) (struct path *old_path,struct path *new_path);int (*sb_set_mnt_opts) (struct super_block *sb, -struct security_mnt_opts *opts); +struct security_mnt_opts *opts, +unsigned long kern_flags, +unsigned long *set_kern_flags);void (*sb_clone_mnt_opts) (const struct super_block *oldsb,struct super_block *newsb);int (*sb_parse_opts_str) (char *options,struct security_mnt_opts *opts);@@ -1747,7 +1749,10 @@ int security_sb_mount(const char *dev_name, struct path *path, const char *type, unsigned long flags, void *data);int security_sb_umount (struct vfsmount *mnt,int flags);int security_sb_pivotroot (struct path *old_path,struct path *new_path); -int security_sb_set_mnt_opts (struct super_block *sb,struct security_mnt_opts *opts); +int security_sb_set_mnt_opts (struct super_block *sb, +struct security_mnt_opts *opts, +unsigned long kern_flags, +unsigned long *set_kern_flags);void security_sb_clone_mnt_opts (const struct super_block *oldsb,struct super_block *newsb);int security_sb_parse_opts_str (char *options,struct security_mnt_opts *opts);@@ -2037,7 +2042,9 @@ static inline int security_sb_pivotroot(struct path *old_path, }static inline int security_sb_set_mnt_opts (struct super_block *sb, -struct security_mnt_opts *opts) +struct security_mnt_opts *opts, +unsigned long kern_flags, +unsigned long *set_kern_flags) {return 0 ; }security/capability.c +4
-1@@ -91,7 +91,10 @@ static int cap_sb_pivotroot(struct path *old_path, struct path *new_path) }static int cap_sb_set_mnt_opts (struct super_block *sb, -struct security_mnt_opts *opts) +struct security_mnt_opts *opts, +unsigned long kern_flags, +unsigned long *set_kern_flags) + {if (unlikely (opts->num_mnt_opts))return -EOPNOTSUPP ;security/security.c +5
-2@@ -294,9 +294,12 @@ int security_sb_pivotroot(struct path *old_path, struct path *new_path) }int security_sb_set_mnt_opts (struct super_block *sb, -struct security_mnt_opts *opts) +struct security_mnt_opts *opts, +unsigned long kern_flags, +unsigned long *set_kern_flags) { -return security_ops->sb_set_mnt_opts (sb, opts); +return security_ops->sb_set_mnt_opts (sb, opts, kern_flags, + set_kern_flags); }EXPORT_SYMBOL (security_sb_set_mnt_opts);security/selinux/hooks.c +10
-2@@ -552,7 +552,9 @@ static int bad_option(struct superblock_security_struct *sbsec, char flag,* labeling information. */ static int selinux_set_mnt_opts (struct super_block *sb, -struct security_mnt_opts *opts) +struct security_mnt_opts *opts, +unsigned long kern_flags, +unsigned long *set_kern_flags) {const struct cred *cred =current_cred ();int rc =0 , i;@@ -580,6 +582,12 @@ static int selinux_set_mnt_opts(struct super_block *sb, "before the security server is initialized\n"); goto out; } +if (kern_flags && !set_kern_flags) { +/* Specifying internal flags without providing a place to +* place the results is not allowed */ + rc = -EINVAL ; + goto out; + }/* * Binary mount data FS will come through this function twice. Once @@ -949,7 +957,7 @@ static int superblock_doinit(struct super_block *sb, void *data) goto out_err; out: - rc =selinux_set_mnt_opts (sb, &opts); + rc =selinux_set_mnt_opts (sb, &opts,0 ,NULL ); out_err:security_free_mnt_opts (&opts);Signature · 6 lines
1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
James Morris <[email protected]>
PATCH 7/17 SELinux: Add new labeling type native labels
In reply to Steve DicksonFrom: David Quigley <[email protected]>
There currently doesn't exist a labeling type that is adequate for use with labeled NFS. Since NFS doesn't really support xattrs we can't use the use xattr labeling behavior. For this we developed a new labeling type. The native labeling type is used solely by NFS to ensure NFS inodes are labeled at runtime by the NFS code instead of relying on the SELinux security server on the client end.
--- include/linux/security.h | 3 +++ security/selinux/hooks.c | 35 ++++++++++++++++++++++++++--------- security/selinux/include/security.h | 2 ++ security/selinux/ss/policydb.c | 5 ++++- 4 files changed, 35 insertions(+), 10 deletions(-)
include/linux/security.h +3 -0
@@ -61,6 +61,9 @@ struct mm_struct;#define SECURITY_CAP_NOAUDIT 0#define SECURITY_CAP_AUDIT 1 +/* LSM Agnostic defines for sb_set_mnt_opts */ +#define SECURITY_LSM_NATIVE_LABELS 1 +struct ctl_table ;struct audit_krule ;struct user_namespace ;
security/selinux/hooks.c +26 -9
@@ -81,6 +81,7 @@#include <linux/syslog.h> #include <linux/user_namespace.h> #include <linux/export.h> +#include <linux/security.h> #include <linux/msg.h> #include <linux/shm.h>
@@ -284,13 +285,14 @@ static void superblock_free_security(struct super_block *sb)/* The file system's label must be initialized prior to use. */ -static const char *labeling_behaviors[6 ] = { +static const char *labeling_behaviors[7 ] = {"uses xattr" ,"uses transition SIDs" ,"uses task SIDs" ,"uses genfs_contexts" ,"not configured for labeling" ,"uses mountpoint labeling" , +"uses native labeling" , };static int inode_doinit_with_dentry (struct inode *inode,struct dentry *opt_dentry);
@@ -678,14 +680,21 @@ static int selinux_set_mnt_opts(struct super_block *sb,if (strcmp (sb->s_type->name,"proc" ) ==0 ) sbsec->flags |=SE_SBPROC ; -/* Determine the labeling behavior to use for this filesystem type. */ - rc =security_fs_use ((sbsec->flags &SE_SBPROC ) ?"proc" : sb->s_type->name, &sbsec->behavior, &sbsec->sid); -if (rc) { -printk (KERN_WARNING "%s: security_fs_use(%s) returned %d\n" , - __func__, sb->s_type->name, rc); - goto out; +if (!sbsec->behavior) { +/* +* Determine the labeling behavior to use for this +* filesystem type. +*/ + rc =security_fs_use ((sbsec->flags &SE_SBPROC ) ? +"proc" : sb->s_type->name, + &sbsec->behavior, &sbsec->sid); +if (rc) { +printk (KERN_WARNING +"%s: security_fs_use(%s) returned %d\n" , + __func__, sb->s_type->name, rc); + goto out; + } } -/* sets the context of the superblock for the fs being mounted. */ if (fscontext_sid) { rc =may_context_mount_sb_relabel (fscontext_sid, sbsec, cred);
@@ -700,6 +709,11 @@ static int selinux_set_mnt_opts(struct super_block *sb,* sets the label used on all file below the mountpoint, and will set * the superblock context if not already set. */ +if (kern_flags &SECURITY_LSM_NATIVE_LABELS && !context_sid) { + sbsec->behavior =SECURITY_FS_USE_NATIVE ; + *set_kern_flags |=SECURITY_LSM_NATIVE_LABELS ; + } +if (context_sid) {if (!fscontext_sid) { rc = may_context_mount_sb_relabel(context_sid, sbsec,
@@ -731,7 +745,8 @@ static int selinux_set_mnt_opts(struct super_block *sb, }if (defcontext_sid) { -if (sbsec->behavior !=SECURITY_FS_USE_XATTR ) { +if (sbsec->behavior !=SECURITY_FS_USE_XATTR && + sbsec->behavior !=SECURITY_FS_USE_NATIVE ) { rc = -EINVAL ;printk (KERN_WARNING "SELinux: defcontext option is " "invalid for this filesystem type\n" );
@@ -1199,6 +1214,8 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent }switch (sbsec->behavior) { +case SECURITY_FS_USE_NATIVE : +break ;case SECURITY_FS_USE_XATTR :if (!inode->i_op->getxattr) { isec->sid = sbsec->def_sid;
security/selinux/include/security.h +2 -0
@@ -169,6 +169,8 @@ int security_get_allow_unknown(void);#define SECURITY_FS_USE_GENFS 4/* use the genfs support */ #define SECURITY_FS_USE_NONE 5/* no labeling support */ #define SECURITY_FS_USE_MNTPOINT 6/* use mountpoint labeling */ +#define SECURITY_FS_USE_NATIVE 7/* use native label support */ +#define SECURITY_FS_USE_MAX 7/* Highest SECURITY_FS_USE_XXX */ int security_fs_use (const char *fstype,unsigned int *behavior,u32 *sid);
security/selinux/ss/policydb.c +4 -1
@@ -2168,7 +2168,10 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, rc = -EINVAL ; c->v.behavior =le32_to_cpu (buf[0 ]); -if (c->v.behavior >SECURITY_FS_USE_NONE ) +/* Determined at runtime, not in policy DB. */ +if (c->v.behavior ==SECURITY_FS_USE_MNTPOINT ) + goto out; +if (c->v.behavior >SECURITY_FS_USE_MAX ) goto out; rc = -ENOMEM ;
Signature · 1 line
1.8.1.4
A message that is not in the archive (sent off-list or not yet received): 1367515151-31015-8-git-send-email-SteveD-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
James Morris
Acked-byRe: [PATCH 07/17] SELinux: Add new labeling type native labels
Quoted 9 lines · Steve Dickson
From: David Quigley <[email protected]>
There currently doesn't exist a labeling type that is adequate for use with labeled NFS. Since NFS doesn't really support xattrs we can't use the use xattr labeling behavior. For this we developed a new labeling type. The native labeling type is used solely by NFS to ensure NFS inodes are labeled at runtime by the NFS code instead of relying on the SELinux security server on the client end.
Quoted 4 lines
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]>
Quoted 146 lines
--- include/linux/security.h | 3 +++ security/selinux/hooks.c | 35 ++++++++++++++++++++++++++--------- security/selinux/include/security.h | 2 ++ security/selinux/ss/policydb.c | 5 ++++- 4 files changed, 35 insertions(+), 10 deletions(-)include/linux/security.h +3
-0@@ -61,6 +61,9 @@ struct mm_struct;#define SECURITY_CAP_NOAUDIT 0#define SECURITY_CAP_AUDIT 1 +/* LSM Agnostic defines for sb_set_mnt_opts */ +#define SECURITY_LSM_NATIVE_LABELS 1 +struct ctl_table ;struct audit_krule ;struct user_namespace ;security/selinux/hooks.c +26
-9@@ -81,6 +81,7 @@#include <linux/syslog.h> #include <linux/user_namespace.h> #include <linux/export.h> +#include <linux/security.h> #include <linux/msg.h> #include <linux/shm.h> @@ -284,13 +285,14 @@ static void superblock_free_security(struct super_block *sb)/* The file system's label must be initialized prior to use. */ -static const char *labeling_behaviors[6 ] = { +static const char *labeling_behaviors[7 ] = {"uses xattr" ,"uses transition SIDs" ,"uses task SIDs" ,"uses genfs_contexts" ,"not configured for labeling" ,"uses mountpoint labeling" , +"uses native labeling" , };static int inode_doinit_with_dentry (struct inode *inode,struct dentry *opt_dentry);@@ -678,14 +680,21 @@ static int selinux_set_mnt_opts(struct super_block *sb,if (strcmp (sb->s_type->name,"proc" ) ==0 ) sbsec->flags |=SE_SBPROC ; -/* Determine the labeling behavior to use for this filesystem type. */ - rc =security_fs_use ((sbsec->flags &SE_SBPROC ) ?"proc" : sb->s_type->name, &sbsec->behavior, &sbsec->sid); -if (rc) { -printk (KERN_WARNING "%s: security_fs_use(%s) returned %d\n" , - __func__, sb->s_type->name, rc); - goto out; +if (!sbsec->behavior) { +/* +* Determine the labeling behavior to use for this +* filesystem type. +*/ + rc =security_fs_use ((sbsec->flags &SE_SBPROC ) ? +"proc" : sb->s_type->name, + &sbsec->behavior, &sbsec->sid); +if (rc) { +printk (KERN_WARNING +"%s: security_fs_use(%s) returned %d\n" , + __func__, sb->s_type->name, rc); + goto out; + } } -/* sets the context of the superblock for the fs being mounted. */ if (fscontext_sid) { rc =may_context_mount_sb_relabel (fscontext_sid, sbsec, cred);@@ -700,6 +709,11 @@ static int selinux_set_mnt_opts(struct super_block *sb,* sets the label used on all file below the mountpoint, and will set * the superblock context if not already set. */ +if (kern_flags &SECURITY_LSM_NATIVE_LABELS && !context_sid) { + sbsec->behavior =SECURITY_FS_USE_NATIVE ; + *set_kern_flags |=SECURITY_LSM_NATIVE_LABELS ; + } +if (context_sid) {if (!fscontext_sid) { rc = may_context_mount_sb_relabel(context_sid, sbsec,@@ -731,7 +745,8 @@ static int selinux_set_mnt_opts(struct super_block *sb, }if (defcontext_sid) { -if (sbsec->behavior !=SECURITY_FS_USE_XATTR ) { +if (sbsec->behavior !=SECURITY_FS_USE_XATTR && + sbsec->behavior !=SECURITY_FS_USE_NATIVE ) { rc = -EINVAL ;printk (KERN_WARNING "SELinux: defcontext option is " "invalid for this filesystem type\n" );@@ -1199,6 +1214,8 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent }switch (sbsec->behavior) { +case SECURITY_FS_USE_NATIVE : +break ;case SECURITY_FS_USE_XATTR :if (!inode->i_op->getxattr) { isec->sid = sbsec->def_sid;security/selinux/include/security.h +2
-0@@ -169,6 +169,8 @@ int security_get_allow_unknown(void);#define SECURITY_FS_USE_GENFS 4/* use the genfs support */ #define SECURITY_FS_USE_NONE 5/* no labeling support */ #define SECURITY_FS_USE_MNTPOINT 6/* use mountpoint labeling */ +#define SECURITY_FS_USE_NATIVE 7/* use native label support */ +#define SECURITY_FS_USE_MAX 7/* Highest SECURITY_FS_USE_XXX */ int security_fs_use (const char *fstype,unsigned int *behavior,u32 *sid);security/selinux/ss/policydb.c +4
-1@@ -2168,7 +2168,10 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, rc = -EINVAL ; c->v.behavior =le32_to_cpu (buf[0 ]); -if (c->v.behavior >SECURITY_FS_USE_NONE ) +/* Determined at runtime, not in policy DB. */ +if (c->v.behavior ==SECURITY_FS_USE_MNTPOINT ) + goto out; +if (c->v.behavior >SECURITY_FS_USE_MAX ) goto out; rc = -ENOMEM ;Signature · 6 lines
1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
James Morris <[email protected]>
PATCH 8/17 NFSv4: Add label recommended attribute and NFSv4 flags
In reply to Steve DicksonFrom: David Quigley <[email protected]>
This patch adds several new flags to allow the NFS client and server to determine if this attribute is supported and if it is being sent over the wire.
--- include/linux/nfs4.h | 1 + include/linux/nfs_fs_sb.h | 1 + include/linux/nfs_xdr.h | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-)
include/linux/nfs4.h +1 -0
@@ -385,6 +385,7 @@ enum lock_type4 {#define FATTR4_WORD1_MOUNTED_ON_FILEID (1UL << 23)#define FATTR4_WORD1_FS_LAYOUT_TYPES (1UL << 30)#define FATTR4_WORD2_LAYOUT_BLKSIZE (1UL << 1) +#define FATTR4_WORD2_SECURITY_LABEL (1UL << 17)#define FATTR4_WORD2_MDSTHRESHOLD (1UL << 4)/* MDS threshold bitmap bits */
include/linux/nfs_fs_sb.h +1 -0
@@ -197,5 +197,6 @@ struct nfs_server {#define NFS_CAP_MTIME (1U << 13)#define NFS_CAP_POSIX_LOCK (1U << 14)#define NFS_CAP_UIDGID_NOMAP (1U << 15) +#define NFS_CAP_SECURITY_LABEL (1U << 16)#endif
include/linux/nfs_xdr.h +3 -1
@@ -104,6 +104,7 @@ struct nfs_fattr {#define NFS_ATTR_FATTR_MOUNTED_ON_FILEID (1U << 22)#define NFS_ATTR_FATTR_OWNER_NAME (1U << 23)#define NFS_ATTR_FATTR_GROUP_NAME (1U << 24) +#define NFS_ATTR_FATTR_V4_SECURITY_LABEL (1U << 25)#define NFS_ATTR_FATTR (NFS_ATTR_FATTR_TYPE \ | NFS_ATTR_FATTR_MODE \
@@ -123,7 +124,8 @@ struct nfs_fattr {#define NFS_ATTR_FATTR_V3 (NFS_ATTR_FATTR \ | NFS_ATTR_FATTR_SPACE_USED)#define NFS_ATTR_FATTR_V4 (NFS_ATTR_FATTR \ - | NFS_ATTR_FATTR_SPACE_USED) + | NFS_ATTR_FATTR_SPACE_USED \ + | NFS_ATTR_FATTR_V4_SECURITY_LABEL)/* * Info on the file system
Signature · 1 line
1.8.1.4
PATCH 9/17 NFSv4: Introduce new label structure
In reply to Steve DicksonFrom: David Quigley <[email protected]>
In order to mimic the way that NFSv4 ACLs are implemented we have created a structure to be used to pass label data up and down the call chain. This patch adds the new structure and new members to the required NFSv4 call structures.
--- fs/nfs/inode.c | 28 ++++++++++++++++++++++++++++ include/linux/nfs4.h | 7 +++++++ include/linux/nfs_fs.h | 18 ++++++++++++++++++ include/linux/nfs_xdr.h | 21 +++++++++++++++++++++ include/uapi/linux/nfs4.h | 2 +- 5 files changed, 75 insertions(+), 1 deletion(-)
fs/nfs/inode.c +28 -0
@@ -257,6 +257,34 @@ nfs_init_locked(struct inode *inode, void *opaque)return 0 ; } +#ifdef CONFIG_NFS_V4_SECURITY_LABEL +struct nfs4_label *nfs4_label_alloc (struct nfs_server *server,gfp_t flags) +{ +struct nfs4_label *label =NULL ; +int minor_version = server->nfs_client->cl_minorversion; + +if (minor_version <2 ) +return label; + +if (!(server->caps &NFS_CAP_SECURITY_LABEL )) +return label; + + label =kzalloc (sizeof (struct nfs4_label ), flags); +if (label ==NULL ) +return ERR_PTR (-ENOMEM ); + + label->label =kzalloc (NFS4_MAXLABELLEN , flags); +if (label->label ==NULL ) { +kfree (label); +return ERR_PTR (-ENOMEM ); + } + label->len =NFS4_MAXLABELLEN ; + +return label; +} +EXPORT_SYMBOL_GPL (nfs4_label_alloc); +#endif +/* * This is our front-end to iget that looks up inodes by file handle * instead of inode number.
include/linux/nfs4.h +7 -0
@@ -32,6 +32,13 @@ struct nfs4_acl {struct nfs4_ace aces[0 ]; }; +struct nfs4_label { +uint32_t lfs; +uint32_t pi; +u32 len; +char *label; +}; +typedef struct {char data[NFS4_VERIFIER_SIZE ]; }nfs4_verifier ;struct nfs_stateid4 {
include/linux/nfs_fs.h +18 -0
@@ -489,6 +489,24 @@ extern int nfs_mountpoint_expiry_timeout;extern void nfs_release_automount_timer (void );/* +* linux/fs/nfs/nfs4proc.c +*/ +#ifdef CONFIG_NFS_V4_SECURITY_LABEL +extern struct nfs4_label *nfs4_label_alloc (struct nfs_server *server,gfp_t flags); +static inline void nfs4_label_free (struct nfs4_label *label) +{ +if (label) { +kfree (label->label); +kfree (label); + } +return ; +} +#else +static inline struct nfs4_label *nfs4_label_alloc (struct nfs_server *server,gfp_t flags) {return NULL ; } +static inline void nfs4_label_free (void *label) {} +#endif + +/* * linux/fs/nfs/unlink.c */ extern void nfs_complete_unlink (struct dentry *dentry,struct inode *);
include/linux/nfs_xdr.h +21 -0
@@ -351,6 +351,7 @@ struct nfs_openargs {const u32 * bitmask;const u32 * open_bitmap;__u32 claim; +const struct nfs4_label *label; };struct nfs_openres {
@@ -360,6 +361,7 @@ struct nfs_openres {struct nfs4_change_info cinfo;__u32 rflags;struct nfs_fattr * f_attr; +struct nfs4_label *f_label;struct nfs_seqid * seqid;const struct nfs_server *server;fmode_t delegation_type;
@@ -404,6 +406,7 @@ struct nfs_closeres {struct nfs4_sequence_res seq_res;nfs4_stateid stateid;struct nfs_fattr * fattr; +struct nfs4_label *label;struct nfs_seqid * seqid;const struct nfs_server *server; };
@@ -477,6 +480,7 @@ struct nfs4_delegreturnargs {struct nfs4_delegreturnres {struct nfs4_sequence_res seq_res;struct nfs_fattr * fattr; +struct nfs4_label *label;const struct nfs_server *server; };
@@ -497,6 +501,7 @@ struct nfs_readargs {struct nfs_readres {struct nfs4_sequence_res seq_res;struct nfs_fattr * fattr; +struct nfs4_label *label;__u32 count;int eof; };
@@ -565,6 +570,7 @@ struct nfs_removeres {struct nfs4_sequence_res seq_res;const struct nfs_server *server;struct nfs_fattr *dir_attr; +struct nfs4_label *dir_label;struct nfs4_change_info cinfo; };
@@ -577,6 +583,8 @@ struct nfs_renameargs {const struct nfs_fh *new_dir;const struct qstr *old_name;const struct qstr *new_name; +const struct nfs4_label *old_label; +const struct nfs4_label *new_label; };struct nfs_renameres {
@@ -584,8 +592,10 @@ struct nfs_renameres {const struct nfs_server *server;struct nfs4_change_info old_cinfo;struct nfs_fattr *old_fattr; +struct nfs4_label *old_label;struct nfs4_change_info new_cinfo;struct nfs_fattr *new_fattr; +struct nfs4_label *new_label; };/*
@@ -600,6 +610,7 @@ struct nfs_entry {int eof;struct nfs_fh * fh;struct nfs_fattr * fattr; +struct nfs4_label *label;unsigned char d_type;struct nfs_server * server; };
@@ -632,6 +643,7 @@ struct nfs_setattrargs {struct iattr * iap;const struct nfs_server * server;/* Needed for name mapping */ const u32 * bitmask; +const struct nfs4_label *label; };struct nfs_setaclargs {
@@ -667,6 +679,7 @@ struct nfs_getaclres {struct nfs_setattrres {struct nfs4_sequence_res seq_res;struct nfs_fattr * fattr; +struct nfs4_label *label;const struct nfs_server * server; };
@@ -712,6 +725,7 @@ struct nfs3_setaclargs {struct nfs_diropok {struct nfs_fh * fh;struct nfs_fattr * fattr; +struct nfs4_label *label; };struct nfs_readlinkargs {
@@ -842,6 +856,7 @@ struct nfs4_accessres {struct nfs4_sequence_res seq_res;const struct nfs_server * server;struct nfs_fattr * fattr; +struct nfs4_label *label;u32 supported;u32 access; };
@@ -864,6 +879,7 @@ struct nfs4_create_arg {const struct iattr * attrs;const struct nfs_fh * dir_fh;const u32 * bitmask; +const struct nfs4_label *label; };struct nfs4_create_res {
@@ -871,6 +887,7 @@ struct nfs4_create_res {const struct nfs_server * server;struct nfs_fh * fh;struct nfs_fattr * fattr; +struct nfs4_label *label;struct nfs4_change_info dir_cinfo; };
@@ -895,6 +912,7 @@ struct nfs4_getattr_res {struct nfs4_sequence_res seq_res;const struct nfs_server * server;struct nfs_fattr * fattr; +struct nfs4_label *label; };struct nfs4_link_arg {
@@ -909,8 +927,10 @@ struct nfs4_link_res {struct nfs4_sequence_res seq_res;const struct nfs_server * server;struct nfs_fattr * fattr; +struct nfs4_label *label;struct nfs4_change_info cinfo;struct nfs_fattr * dir_attr; +struct nfs4_label *dir_label; };
@@ -926,6 +946,7 @@ struct nfs4_lookup_res {const struct nfs_server * server;struct nfs_fattr * fattr;struct nfs_fh * fh; +struct nfs4_label *label; };struct nfs4_lookup_root_arg {
include/uapi/linux/nfs4.h +1 -1
@@ -25,7 +25,7 @@#define NFS4_MAXNAMLEN NAME_MAX#define NFS4_OPAQUE_LIMIT 1024#define NFS4_MAX_SESSIONID_LEN 16 - +#define NFS4_MAXLABELLEN 2048#define NFS4_ACCESS_READ 0x0001#define NFS4_ACCESS_LOOKUP 0x0002#define NFS4_ACCESS_MODIFY 0x0004
Signature · 1 line
1.8.1.4
PATCH 10/17 NFSv4: Extend fattr bitmaps to support all 3 words
In reply to Steve DicksonFrom: David Quigley <[email protected]>
The fattr handling bitmap code only uses the first two fattr words sofar. This patch adds the 3rd word to being sent but doesn't populate it yet.
--- fs/nfs/nfs4_fs.h | 6 +++--- fs/nfs/nfs4proc.c | 10 +++++----- fs/nfs/nfs4xdr.c | 20 ++++++++++++-------- fs/nfs/super.c | 1 + include/linux/nfs_fs_sb.h | 2 +- 5 files changed, 22 insertions(+), 17 deletions(-)
fs/nfs/nfs4_fs.h +3 -3
@@ -295,10 +295,10 @@ is_ds_client(struct nfs_client *clp)extern const struct nfs4_minor_version_ops *nfs_v4_minor_ops[];extern const u32 nfs4_fattr_bitmap[3 ]; -extern const u32 nfs4_statfs_bitmap[2 ]; -extern const u32 nfs4_pathconf_bitmap[2 ]; +extern const u32 nfs4_statfs_bitmap[3 ]; +extern const u32 nfs4_pathconf_bitmap[3 ];extern const u32 nfs4_fsinfo_bitmap[3 ]; -extern const u32 nfs4_fs_locations_bitmap[2 ]; +extern const u32 nfs4_fs_locations_bitmap[3 ];void nfs4_free_client (struct nfs_client *);
fs/nfs/nfs4proc.c +5 -5
@@ -159,7 +159,7 @@ static const u32 nfs4_open_noattr_bitmap[3] = { | FATTR4_WORD0_FILEID, }; -const u32 nfs4_statfs_bitmap[2 ] = { +const u32 nfs4_statfs_bitmap[3 ] = {FATTR4_WORD0_FILES_AVAIL |FATTR4_WORD0_FILES_FREE |FATTR4_WORD0_FILES_TOTAL ,
@@ -168,7 +168,7 @@ const u32 nfs4_statfs_bitmap[2] = { | FATTR4_WORD1_SPACE_TOTAL }; -const u32 nfs4_pathconf_bitmap[2 ] = { +const u32 nfs4_pathconf_bitmap[3 ] = {FATTR4_WORD0_MAXLINK |FATTR4_WORD0_MAXNAME ,0
@@ -183,7 +183,7 @@ const u32 nfs4_fsinfo_bitmap[3] = { FATTR4_WORD0_MAXFILESIZEFATTR4_WORD2_LAYOUT_BLKSIZE }; -const u32 nfs4_fs_locations_bitmap[2 ] = { +const u32 nfs4_fs_locations_bitmap[3 ] = {FATTR4_WORD0_TYPE |FATTR4_WORD0_CHANGE |FATTR4_WORD0_SIZE
@@ -199,7 +199,7 @@ const u32 nfs4_fs_locations_bitmap[2] = { | FATTR4_WORD1_TIME_ACCESS | FATTR4_WORD1_TIME_METADATA | FATTR4_WORD1_TIME_MODIFY - | FATTR4_WORD1_MOUNTED_ON_FILEID + | FATTR4_WORD1_MOUNTED_ON_FILEID, }; static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dentry,
@@ -5136,7 +5136,7 @@ static int _nfs4_proc_fs_locations(struct rpc_clnt *client, struct inode *dir, struct page *page) {struct nfs_server *server =NFS_SERVER (dir); -u32 bitmask[2 ] = { +u32 bitmask[3 ] = { [0 ] =FATTR4_WORD0_FSID |FATTR4_WORD0_FS_LOCATIONS , };struct nfs4_fs_locations_arg args = {
fs/nfs/nfs4xdr.c +12 -8
@@ -983,15 +983,16 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, constint len;uint32_t bmval0 =0 ;uint32_t bmval1 =0 ; +uint32_t bmval2 =0 ;/* * We reserve enough space to write the entire attribute buffer at once. * In the worst-case, this would be -* 12(bitmap) + 4(attrlen) + 8(size) + 4(mode) + 4(atime) + 4(mtime) -* = 36 bytes, plus any contribution from variable-length fields +* 16(bitmap) + 4(attrlen) + 8(size) + 4(mode) + 4(atime) + 4(mtime) +* = 40 bytes, plus any contribution from variable-length fields * such as owner/group. */ - len =16 ; + len =20 ;/* Sigh */ if (iap->ia_valid &ATTR_SIZE )
@@ -1035,9 +1036,9 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const* We write the bitmap length now, but leave the bitmap and the attribute * buffer length to be backfilled at the end of this routine. */ - *p++ =cpu_to_be32 (2 ); + *p++ =cpu_to_be32 (3 ); q = p; - p +=3 ; + p +=4 ;if (iap->ia_valid &ATTR_SIZE ) { bmval0 |=FATTR4_WORD0_SIZE ;
@@ -1086,9 +1087,10 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const len, ((char *)p - (char *)q) + 4);BUG (); } - len = (char *)p - (char *)q -12 ; + len = (char *)p - (char *)q -16 ; *q++ =htonl (bmval0); *q++ =htonl (bmval1); + *q++ =htonl (bmval2); *q =htonl (len);/* out: */
@@ -1194,8 +1196,10 @@ encode_getattr_three(struct xdr_stream *xdr,static void encode_getfattr (struct xdr_stream *xdr,const u32 * bitmask,struct compound_hdr *hdr) { -encode_getattr_two (xdr, bitmask[0 ] & nfs4_fattr_bitmap[0 ], - bitmask[1 ] & nfs4_fattr_bitmap[1 ], hdr); +encode_getattr_three (xdr, bitmask[0 ] & nfs4_fattr_bitmap[0 ], + bitmask[1 ] & nfs4_fattr_bitmap[1 ], + bitmask[2 ] & nfs4_fattr_bitmap[2 ], + hdr); } static void encode_getfattr_open(struct xdr_stream *xdr, const u32 *bitmask,
fs/nfs/super.c +1 -0
@@ -833,6 +833,7 @@ int nfs_show_stats(struct seq_file *m, struct dentry *root)seq_printf (m,"\n\tnfsv4:\t" );seq_printf (m,"bm0=0x%x" , nfss->attr_bitmask[0 ]);seq_printf (m,",bm1=0x%x" , nfss->attr_bitmask[1 ]); +seq_printf (m,",bm2=0x%x" , nfss->attr_bitmask[2 ]);seq_printf (m,",acl=0x%x" , nfss->acl_bitmask);show_sessions (m, nfss);show_pnfs (m, nfss);
include/linux/nfs_fs_sb.h +1 -1
@@ -145,7 +145,7 @@ struct nfs_server {u32 attr_bitmask[3 ];/* V4 bitmask representing the set of attributes supported on this filesystem */ -u32 cache_consistency_bitmask[2 ]; +u32 cache_consistency_bitmask[3 ];/* V4 bitmask representing the subset of change attribute, size, ctime and mtime attributes supported by
Signature · 1 line
1.8.1.4
PATCH 11/17 NFS:Add labels to client function prototypes
In reply to Steve DicksonFrom: David Quigley <[email protected]>
Quoted 1 line
From David Quigley <[email protected]>
After looking at all of the nfsv4 operations the label structure has been added to the prototypes of the functions which can transmit label data.
--- fs/nfs/client.c | 2 +- fs/nfs/dir.c | 23 +++++----- fs/nfs/getroot.c | 2 +- fs/nfs/inode.c | 33 +++++++------- fs/nfs/namespace.c | 2 +- fs/nfs/nfs3acl.c | 4 +- fs/nfs/nfs3proc.c | 41 ++++++++--------- fs/nfs/nfs4_fs.h | 2 +- fs/nfs/nfs4namespace.c | 2 +- fs/nfs/nfs4proc.c | 117 +++++++++++++++++++++++++++++++----------------- fs/nfs/proc.c | 15 ++++--- include/linux/nfs_fs.h | 9 ++-- include/linux/nfs_xdr.h | 5 ++- 13 files changed, 149 insertions(+), 108 deletions(-)
fs/nfs/client.c +1 -1
@@ -1074,7 +1074,7 @@ struct nfs_server *nfs_create_server(struct nfs_mount_info *mount_info, }if (!(fattr->valid &NFS_ATTR_FATTR )) { - error = nfs_mod->rpc_ops->getattr (server, mount_info->mntfh, fattr); + error = nfs_mod->rpc_ops->getattr (server, mount_info->mntfh, fattr,NULL );if (error <0 ) {dprintk ("nfs_create_server: getattr error = %d\n" , -error); goto error;
fs/nfs/dir.c +13 -10
@@ -447,7 +447,7 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry) dentry =d_lookup (parent, &filename);if (dentry !=NULL ) {if (nfs_same_file (dentry, entry)) { -nfs_refresh_inode (dentry->d_inode, entry->fattr); +nfs_refresh_inode (dentry->d_inode, entry->fattr, entry->label); goto out; }else {if (d_invalidate (dentry) !=0 )
@@ -460,7 +460,7 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)if (dentry ==NULL )return ; - inode =nfs_fhget (dentry->d_sb, entry->fh, entry->fattr); + inode =nfs_fhget (dentry->d_sb, entry->fh, entry->fattr, entry->label);if (IS_ERR (inode)) goto out;
@@ -1040,6 +1040,7 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags)struct dentry *parent;struct nfs_fh *fhandle =NULL ;struct nfs_fattr *fattr =NULL ; +struct nfs4_label *label =NULL ;int error;if (flags &LOOKUP_RCU )
@@ -1082,12 +1083,12 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags)if (fhandle ==NULL || fattr ==NULL ) goto out_error; - error =NFS_PROTO (dir)->lookup (dir, &dentry->d_name, fhandle, fattr); + error =NFS_PROTO (dir)->lookup (dir, &dentry->d_name, fhandle, fattr, label);if (error) goto out_bad;if (nfs_compare_fh (NFS_FH (inode), fhandle)) goto out_bad; -if ((error =nfs_refresh_inode (inode, fattr)) !=0 ) +if ((error =nfs_refresh_inode (inode, fattr, label)) !=0 ) goto out_bad;nfs_free_fattr (fattr);
@@ -1256,6 +1257,7 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned instruct inode *inode =NULL ;struct nfs_fh *fhandle =NULL ;struct nfs_fattr *fattr =NULL ; +struct nfs4_label *label =NULL ;int error; dfprintk(VFS, "NFS: lookup(%s/%s)\n",
@@ -1285,14 +1287,14 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned in parent = dentry->d_parent;/* Protect against concurrent sillydeletes */ nfs_block_sillyrename (parent); - error =NFS_PROTO (dir)->lookup (dir, &dentry->d_name, fhandle, fattr); + error =NFS_PROTO (dir)->lookup (dir, &dentry->d_name, fhandle, fattr, label);if (error == -ENOENT ) goto no_entry;if (error <0 ) { res =ERR_PTR (error); goto out_unblock_sillyrename; } - inode =nfs_fhget (dentry->d_sb, fhandle, fattr); + inode =nfs_fhget (dentry->d_sb, fhandle, fattr, label); res =ERR_CAST (inode);if (IS_ERR (res)) goto out_unblock_sillyrename;
@@ -1526,7 +1528,8 @@ no_open:* Code common to create, mkdir, and mknod. */ int nfs_instantiate (struct dentry *dentry,struct nfs_fh *fhandle, -struct nfs_fattr *fattr) +struct nfs_fattr *fattr, +struct nfs4_label *label) {struct dentry *parent =dget_parent (dentry);struct inode *dir = parent->d_inode;
@@ -1539,18 +1542,18 @@ int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle,if (dentry->d_inode) goto out;if (fhandle->size ==0 ) { - error =NFS_PROTO (dir)->lookup (dir, &dentry->d_name, fhandle, fattr); + error =NFS_PROTO (dir)->lookup (dir, &dentry->d_name, fhandle, fattr,NULL );if (error) goto out_error; }nfs_set_verifier (dentry,nfs_save_change_attribute (dir));if (!(fattr->valid &NFS_ATTR_FATTR )) {struct nfs_server *server =NFS_SB (dentry->d_sb); - error = server->nfs_client->rpc_ops->getattr (server, fhandle, fattr); + error = server->nfs_client->rpc_ops->getattr (server, fhandle, fattr,NULL );if (error <0 ) goto out_error; } - inode =nfs_fhget (dentry->d_sb, fhandle, fattr); + inode =nfs_fhget (dentry->d_sb, fhandle, fattr, label); error =PTR_ERR (inode);if (IS_ERR (inode)) goto out_error;
fs/nfs/getroot.c +1 -1
@@ -95,7 +95,7 @@ struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh, goto out; } - inode =nfs_fhget (sb, mntfh, fsinfo.fattr); + inode =nfs_fhget (sb, mntfh, fsinfo.fattr,NULL );if (IS_ERR (inode)) {dprintk ("nfs_get_root: get root inode failed\n" ); ret =ERR_CAST (inode);
fs/nfs/inode.c +17 -16
@@ -61,7 +61,7 @@static bool enable_ino64 =NFS_64_BIT_INODE_NUMBERS_ENABLED ;static void nfs_invalidate_inode (struct inode *); -static int nfs_update_inode (struct inode *,struct nfs_fattr *); +static int nfs_update_inode (struct inode *,struct nfs_fattr *,struct nfs4_label *);static struct kmem_cache * nfs_inode_cachep;
@@ -290,7 +290,7 @@ EXPORT_SYMBOL_GPL(nfs4_label_alloc);* instead of inode number. */ struct inode * -nfs_fhget (struct super_block *sb,struct nfs_fh *fh,struct nfs_fattr *fattr) +nfs_fhget (struct super_block *sb,struct nfs_fh *fh,struct nfs_fattr *fattr,struct nfs4_label *label) {struct nfs_find_desc desc = { .fh = fh,
@@ -420,7 +420,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)unlock_new_inode (inode); }else -nfs_refresh_inode (inode, fattr); +nfs_refresh_inode (inode, fattr, label); dprintk("NFS: nfs_fhget(%s/%Ld fh_crc=0x%08x ct=%d)\n", inode->i_sb->s_id, (long long)NFS_FILEID(inode),
@@ -477,7 +477,7 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)NFS_PROTO (inode)->return_delegation (inode); error =NFS_PROTO (inode)->setattr (dentry, fattr, attr);if (error ==0 ) -nfs_refresh_inode (inode, fattr); +nfs_refresh_inode (inode, fattr,NULL );nfs_free_fattr (fattr); out:return error;
@@ -816,6 +816,7 @@ int __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) { int status = -ESTALE; +struct nfs4_label *label =NULL ;struct nfs_fattr *fattr =NULL ;struct nfs_inode *nfsi =NFS_I (inode);
@@ -833,7 +834,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) goto out;nfs_inc_stats (inode,NFSIOS_INODEREVALIDATE ); - status =NFS_PROTO (inode)->getattr (server,NFS_FH (inode), fattr); + status =NFS_PROTO (inode)->getattr (server,NFS_FH (inode), fattr, label);if (status !=0 ) { dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) getattr failed, error=%d\n", inode->i_sb->s_id,
@@ -846,7 +847,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) goto out; } - status =nfs_refresh_inode (inode, fattr); + status =nfs_refresh_inode (inode, fattr, label);if (status) { dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) refresh failed, error=%d\n", inode->i_sb->s_id,
@@ -1203,10 +1204,10 @@ static int nfs_inode_attrs_need_update(const struct inode *inode, const struct n ((long )nfsi->attr_gencount - (long )nfs_read_attr_generation_counter () >0 ); } -static int nfs_refresh_inode_locked (struct inode *inode,struct nfs_fattr *fattr) +static int nfs_refresh_inode_locked (struct inode *inode,struct nfs_fattr *fattr,struct nfs4_label *label) {if (nfs_inode_attrs_need_update (inode, fattr)) -return nfs_update_inode (inode, fattr); +return nfs_update_inode (inode, fattr, label);return nfs_check_inode_attributes (inode, fattr); }
@@ -1220,21 +1221,21 @@ static int nfs_refresh_inode_locked(struct inode *inode, struct nfs_fattr *fattr* safe to do a full update of the inode attributes, or whether just to * call nfs_check_inode_attributes. */ -int nfs_refresh_inode (struct inode *inode,struct nfs_fattr *fattr) +int nfs_refresh_inode (struct inode *inode,struct nfs_fattr *fattr,struct nfs4_label *label) {int status;if ((fattr->valid &NFS_ATTR_FATTR ) ==0 )return 0 ;spin_lock (&inode->i_lock); - status =nfs_refresh_inode_locked (inode, fattr); + status =nfs_refresh_inode_locked (inode, fattr, label);spin_unlock (&inode->i_lock);return status; }EXPORT_SYMBOL_GPL (nfs_refresh_inode); -static int nfs_post_op_update_inode_locked (struct inode *inode,struct nfs_fattr *fattr) +static int nfs_post_op_update_inode_locked (struct inode *inode,struct nfs_fattr *fattr,struct nfs4_label *label) {struct nfs_inode *nfsi =NFS_I (inode);
@@ -1245,7 +1246,7 @@ static int nfs_post_op_update_inode_locked(struct inode *inode, struct nfs_fattr }if ((fattr->valid &NFS_ATTR_FATTR ) ==0 )return 0 ; -return nfs_refresh_inode_locked (inode, fattr); +return nfs_refresh_inode_locked (inode, fattr, label); }/**
@@ -1262,12 +1263,12 @@ static int nfs_post_op_update_inode_locked(struct inode *inode, struct nfs_fattr* are expected to change one or more attributes, to avoid * unnecessary NFS requests and trips through nfs_update_inode(). */ -int nfs_post_op_update_inode (struct inode *inode,struct nfs_fattr *fattr) +int nfs_post_op_update_inode (struct inode *inode,struct nfs_fattr *fattr,struct nfs4_label *label) {int status;spin_lock (&inode->i_lock); - status =nfs_post_op_update_inode_locked (inode, fattr); + status =nfs_post_op_update_inode_locked (inode, fattr, label);spin_unlock (&inode->i_lock);return status; }
@@ -1319,7 +1320,7 @@ int nfs_post_op_update_inode_force_wcc(struct inode *inode, struct nfs_fattr *fa fattr->valid |=NFS_ATTR_FATTR_PRESIZE ; } out_noforce: - status =nfs_post_op_update_inode_locked (inode, fattr); + status =nfs_post_op_update_inode_locked (inode, fattr,NULL );spin_unlock (&inode->i_lock);return status; }
@@ -1337,7 +1338,7 @@ EXPORT_SYMBOL_GPL(nfs_post_op_update_inode_force_wcc);* * A very similar scenario holds for the dir cache. */ -static int nfs_update_inode (struct inode *inode,struct nfs_fattr *fattr) +static int nfs_update_inode (struct inode *inode,struct nfs_fattr *fattr,struct nfs4_label *label) {struct nfs_server *server;struct nfs_inode *nfsi =NFS_I (inode);
fs/nfs/namespace.c +1 -1
@@ -280,7 +280,7 @@ struct vfsmount *nfs_submount(struct nfs_server *server, struct dentry *dentry,struct dentry *parent =dget_parent (dentry);/* Look it up again to get its attributes */ - err = server->nfs_client->rpc_ops->lookup (parent->d_inode, &dentry->d_name, fh, fattr); + err = server->nfs_client->rpc_ops->lookup (parent->d_inode, &dentry->d_name, fh, fattr,NULL );dput (parent);if (err !=0 )return ERR_PTR (err);
fs/nfs/nfs3acl.c +2 -2
@@ -240,7 +240,7 @@ struct posix_acl *nfs3_proc_getacl(struct inode *inode, int type)switch (status) {case 0 : - status =nfs_refresh_inode (inode, res.fattr); + status =nfs_refresh_inode (inode, res.fattr,NULL );break ;case -EPFNOSUPPORT :case -EPROTONOSUPPORT :
@@ -352,7 +352,7 @@ static int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,switch (status) {case 0 : - status =nfs_refresh_inode (inode, fattr); + status =nfs_refresh_inode (inode, fattr,NULL );nfs3_cache_acls (inode, acl, dfacl);break ;case -EPFNOSUPPORT :
fs/nfs/nfs3proc.c +21 -20
138 lines not on this page · raw message
fs/nfs/nfs4_fs.h +1 -1
@@ -229,7 +229,7 @@ extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhextern int nfs4_proc_fs_locations (struct rpc_clnt *,struct inode *,const struct qstr *,struct nfs4_fs_locations *,struct page *);extern struct rpc_clnt *nfs4_proc_lookup_mountpoint (struct inode *,struct qstr *, -struct nfs_fh *,struct nfs_fattr *); +struct nfs_fh *,struct nfs_fattr *,struct nfs4_label *);extern int nfs4_proc_secinfo (struct inode *,const struct qstr *,struct nfs4_secinfo_flavors *);extern int nfs4_release_lockowner (struct nfs4_lock_state *);extern const struct xattr_handler *nfs4_xattr_handlers[];
fs/nfs/nfs4namespace.c +1 -1
@@ -369,7 +369,7 @@ struct vfsmount *nfs4_submount(struct nfs_server *server, struct dentry *dentry,struct vfsmount *mnt;/* Look it up again to get its attributes and sec flavor */ - client =nfs4_proc_lookup_mountpoint (parent->d_inode, &dentry->d_name, fh, fattr); + client =nfs4_proc_lookup_mountpoint (parent->d_inode, &dentry->d_name, fh, fattr,NULL );dput (parent);if (IS_ERR (client))return ERR_CAST (client);
fs/nfs/nfs4proc.c +75 -42
463 lines not on this page · raw message
fs/nfs/proc.c +8 -7
@@ -98,7 +98,7 @@ nfs_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,*/ static int nfs_proc_getattr (struct nfs_server *server,struct nfs_fh *fhandle, -struct nfs_fattr *fattr) +struct nfs_fattr *fattr,struct nfs4_label *label) {struct rpc_message msg = { .rpc_proc = &nfs_procedures[NFSPROC_GETATTR ],
@@ -146,7 +146,8 @@ nfs_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,static int nfs_proc_lookup (struct inode *dir,struct qstr *name, -struct nfs_fh *fhandle,struct nfs_fattr *fattr) +struct nfs_fh *fhandle,struct nfs_fattr *fattr, +struct nfs4_label *label) {struct nfs_diropargs arg = { .fh =NFS_FH (dir),
@@ -243,7 +244,7 @@ nfs_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, status =rpc_call_sync (NFS_CLIENT (dir), &msg,0 );nfs_mark_for_revalidate (dir);if (status ==0 ) - status =nfs_instantiate (dentry, data->res.fh, data->res.fattr); + status =nfs_instantiate (dentry, data->res.fh, data->res.fattr,NULL );nfs_free_createdata (data); out:dprintk ("NFS reply create: %d\n" , status);
@@ -290,7 +291,7 @@ nfs_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr, status =rpc_call_sync (NFS_CLIENT (dir), &msg,0 ); }if (status ==0 ) - status =nfs_instantiate (dentry, data->res.fh, data->res.fattr); + status =nfs_instantiate (dentry, data->res.fh, data->res.fattr,NULL );nfs_free_createdata (data); out:dprintk ("NFS reply mknod: %d\n" , status);
@@ -442,7 +443,7 @@ nfs_proc_symlink(struct inode *dir, struct dentry *dentry, struct page *page,* should fill in the data with a LOOKUP call on the wire. */ if (status ==0 ) - status =nfs_instantiate (dentry, fh, fattr); + status =nfs_instantiate (dentry, fh, fattr,NULL ); out_free:nfs_free_fattr (fattr);
@@ -471,7 +472,7 @@ nfs_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) status =rpc_call_sync (NFS_CLIENT (dir), &msg,0 );nfs_mark_for_revalidate (dir);if (status ==0 ) - status =nfs_instantiate (dentry, data->res.fh, data->res.fattr); + status =nfs_instantiate (dentry, data->res.fh, data->res.fattr,NULL );nfs_free_createdata (data); out:dprintk ("NFS reply mkdir: %d\n" , status);
@@ -607,7 +608,7 @@ static int nfs_read_done(struct rpc_task *task, struct nfs_read_data *data)nfs_invalidate_atime (inode);if (task->tk_status >=0 ) { -nfs_refresh_inode (inode, data->res.fattr); +nfs_refresh_inode (inode, data->res.fattr, data->res.label);/* Emulate the eof flag, which isn't normally needed in NFSv2 * as it is guaranteed to always return the file attributes */
include/linux/nfs_fs.h +5 -4
@@ -328,9 +328,9 @@ extern void nfs_zap_mapping(struct inode *inode, struct address_space *mapping);extern void nfs_zap_caches (struct inode *);extern void nfs_invalidate_atime (struct inode *);extern struct inode *nfs_fhget (struct super_block *,struct nfs_fh *, -struct nfs_fattr *); -extern int nfs_refresh_inode (struct inode *,struct nfs_fattr *); -extern int nfs_post_op_update_inode (struct inode *inode,struct nfs_fattr *fattr); +struct nfs_fattr *,struct nfs4_label *); +extern int nfs_refresh_inode (struct inode *,struct nfs_fattr *,struct nfs4_label *); +extern int nfs_post_op_update_inode (struct inode *inode,struct nfs_fattr *fattr,struct nfs4_label *);extern int nfs_post_op_update_inode_force_wcc (struct inode *inode,struct nfs_fattr *fattr);extern int nfs_getattr (struct vfsmount *,struct dentry *,struct kstat *);extern void nfs_access_add_cache (struct inode *,struct nfs_access_entry *);
@@ -460,7 +460,8 @@ extern const struct file_operations nfs_dir_operations;extern const struct dentry_operations nfs_dentry_operations;extern void nfs_force_lookup_revalidate (struct inode *dir); -extern int nfs_instantiate (struct dentry *dentry,struct nfs_fh *fh,struct nfs_fattr *fattr); +extern int nfs_instantiate (struct dentry *dentry,struct nfs_fh *fh, +struct nfs_fattr *fattr,struct nfs4_label *label);extern int nfs_may_open (struct inode *inode,struct rpc_cred *cred,int openflags);extern void nfs_access_zap_cache (struct inode *inode);
include/linux/nfs_xdr.h +3 -2
@@ -1400,11 +1400,12 @@ struct nfs_rpc_ops {struct dentry *(*try_mount) (int ,const char *,struct nfs_mount_info *,struct nfs_subversion *);int (*getattr) (struct nfs_server *,struct nfs_fh *, -struct nfs_fattr *); +struct nfs_fattr *,struct nfs4_label *);int (*setattr) (struct dentry *,struct nfs_fattr *,struct iattr *);int (*lookup) (struct inode *,struct qstr *, -struct nfs_fh *,struct nfs_fattr *); +struct nfs_fh *,struct nfs_fattr *, +struct nfs4_label *);int (*access) (struct inode *,struct nfs_access_entry *);int (*readlink)(struct inode *,struct page *,unsigned int ,unsigned int );
Signature · 1 line
1.8.1.4
PATCH 12/17 NFS: Add label lifecycle management
In reply to Steve DicksonFrom: David Quigley <[email protected]>
Quoted 1 line
From David Quigley <[email protected]>
This patch adds the lifecycle management for the security label structure introduced in an earlier patch. The label is not used yet but allocations and freeing of the structure is handled.
--- fs/nfs/dir.c | 23 ++++++++++++- fs/nfs/inode.c | 15 +++++++-- fs/nfs/nfs4proc.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 126 insertions(+), 10 deletions(-)
fs/nfs/dir.c +22 -1
@@ -585,10 +585,16 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page,if (entry.fh ==NULL || entry.fattr ==NULL ) goto out; + entry.label =nfs4_label_alloc (NFS_SERVER (inode),GFP_NOWAIT ); +if (IS_ERR (entry.label)) { + status =PTR_ERR (entry.label); + goto out; + } + array =nfs_readdir_get_array (page);if (IS_ERR (array)) { status =PTR_ERR (array); - goto out; + goto out_label_free; }memset (array,0 ,sizeof (struct nfs_cache_array )); array->eof_index =-1 ;
@@ -614,6 +620,8 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page,nfs_readdir_free_large_page (pages_ptr, pages, array_size); out_release_array:nfs_readdir_release_array (page); +out_label_free: +nfs4_label_free (entry.label); out:nfs_free_fattr (entry.fattr);nfs_free_fhandle (entry.fh);
@@ -1083,6 +1091,10 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags)if (fhandle ==NULL || fattr ==NULL ) goto out_error; + label =nfs4_label_alloc (NFS_SERVER (inode),GFP_NOWAIT ); +if (IS_ERR (label)) + goto out_error; + error =NFS_PROTO (dir)->lookup (dir, &dentry->d_name, fhandle, fattr, label);if (error) goto out_bad;
@@ -1093,6 +1105,8 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags)nfs_free_fattr (fattr);nfs_free_fhandle (fhandle); +nfs4_label_free (label); + out_set_verifier:nfs_set_verifier (dentry,nfs_save_change_attribute (dir)); out_valid:
@@ -1109,6 +1123,7 @@ out_zap_parent: out_bad:nfs_free_fattr (fattr);nfs_free_fhandle (fhandle); +nfs4_label_free (label);nfs_mark_for_revalidate (dir);if (inode &&S_ISDIR (inode->i_mode)) {/* Purge readdir caches. */
@@ -1129,6 +1144,7 @@ out_zap_parent: out_error:nfs_free_fattr (fattr);nfs_free_fhandle (fhandle); +nfs4_label_free (label);dput (parent); dfprintk(LOOKUPCACHE, "NFS: %s(%s/%s) lookup returned error %d\n", __func__, dentry->d_parent->d_name.name,
@@ -1284,6 +1300,10 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned inif (fhandle ==NULL || fattr ==NULL ) goto out; + label =nfs4_label_alloc (NFS_SERVER (dir),GFP_NOWAIT ); +if (IS_ERR (label)) + goto out; + parent = dentry->d_parent;/* Protect against concurrent sillydeletes */ nfs_block_sillyrename (parent);
@@ -1312,6 +1332,7 @@ no_entry:nfs_set_verifier (dentry,nfs_save_change_attribute (dir)); out_unblock_sillyrename:nfs_unblock_sillyrename (parent); +nfs4_label_free (label); out:nfs_free_fattr (fattr);nfs_free_fhandle (fhandle);
fs/nfs/inode.c +12 -3
@@ -834,6 +834,13 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) goto out;nfs_inc_stats (inode,NFSIOS_INODEREVALIDATE ); + + label =nfs4_label_alloc (NFS_SERVER (inode),GFP_KERNEL ); +if (IS_ERR (label)) { + status =PTR_ERR (label); + goto out; + } + status =NFS_PROTO (inode)->getattr (server,NFS_FH (inode), fattr, label);if (status !=0 ) { dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) getattr failed, error=%d\n",
@@ -844,7 +851,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)if (!S_ISDIR (inode->i_mode))set_bit (NFS_INO_STALE , &NFS_I (inode)->flags); } - goto out; + goto err_out; } status =nfs_refresh_inode (inode, fattr, label);
@@ -852,7 +859,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)dfprintk (PAGECACHE ,"nfs_revalidate_inode: (%s/%Ld) refresh failed, error=%d\n" , inode->i_sb->s_id, (long long )NFS_FILEID (inode), status); - goto out; + goto err_out; }if (nfsi->cache_validity &NFS_INO_INVALID_ACL )
@@ -862,7 +869,9 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) inode->i_sb->s_id, (long long)NFS_FILEID(inode)); - out: +err_out: +nfs4_label_free (label); +out:nfs_free_fattr (fattr);return status; }
fs/nfs/nfs4proc.c +92 -6
224 lines not on this page · raw message
Signature · 1 line
1.8.1.4
PATCH 13/17 NFS: Client implementation of Labeled-NFS
In reply to Steve DicksonFrom: David Quigley <[email protected]>
This patch implements the client transport and handling support for labeled NFS. The patch adds two functions to encode and decode the security label recommended attribute which makes use of the LSM hooks added earlier. It also adds code to grab the label from the file attribute structures and encode the label to be sent back to the server.
--- fs/nfs/inode.c | 57 ++++++++- fs/nfs/nfs4proc.c | 318 +++++++++++++++++++++++++++++++++++++++++++--- fs/nfs/nfs4xdr.c | 168 ++++++++++++++++++------ fs/nfs/pnfs.c | 2 +- fs/nfs/super.c | 17 ++- include/linux/nfs_fs.h | 13 ++ include/linux/nfs_fs_sb.h | 7 + security/selinux/hooks.c | 4 + 8 files changed, 524 insertions(+), 62 deletions(-)
fs/nfs/inode.c +51 -6
@@ -162,11 +162,19 @@ static void nfs_zap_caches_locked(struct inode *inode)memset (NFS_I (inode)->cookieverf,0 ,sizeof (NFS_I (inode)->cookieverf));if (S_ISREG (mode) ||S_ISDIR (mode) ||S_ISLNK (mode)) { - nfsi->cache_validity |=NFS_INO_INVALID_ATTR |NFS_INO_INVALID_DATA |NFS_INO_INVALID_ACCESS |NFS_INO_INVALID_ACL |NFS_INO_REVAL_PAGECACHE ;nfs_fscache_invalidate (inode); - }else { - nfsi->cache_validity |=NFS_INO_INVALID_ATTR |NFS_INO_INVALID_ACCESS |NFS_INO_INVALID_ACL |NFS_INO_REVAL_PAGECACHE ; - } + nfsi->cache_validity |=NFS_INO_INVALID_ATTR + |NFS_INO_INVALID_LABEL + |NFS_INO_INVALID_DATA + |NFS_INO_INVALID_ACCESS + |NFS_INO_INVALID_ACL + |NFS_INO_REVAL_PAGECACHE ; + }else + nfsi->cache_validity |=NFS_INO_INVALID_ATTR + |NFS_INO_INVALID_LABEL + |NFS_INO_INVALID_ACCESS + |NFS_INO_INVALID_ACL + |NFS_INO_REVAL_PAGECACHE ; }void nfs_zap_caches (struct inode *inode)
@@ -258,6 +266,24 @@ nfs_init_locked(struct inode *inode, void *opaque) }#ifdef CONFIG_NFS_V4_SECURITY_LABEL +void nfs_setsecurity (struct inode *inode,struct nfs_fattr *fattr, +struct nfs4_label *label) +{ +int error; + +if ((fattr->valid &NFS_ATTR_FATTR_V4_SECURITY_LABEL ) && + label && inode->i_security) { + error =security_inode_notifysecctx (inode, label->label, + label->len); +if (error) +printk (KERN_ERR "%s() %s %d " +"security_inode_notifysecctx() %d\n" , + __func__, + (char *)label->label, + label->len, error); + } +} +struct nfs4_label *nfs4_label_alloc (struct nfs_server *server,gfp_t flags) {struct nfs4_label *label =NULL ;
@@ -283,7 +309,13 @@ struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags) return label; }EXPORT_SYMBOL_GPL (nfs4_label_alloc); +#else +void inline nfs_setsecurity (struct inode *inode,struct nfs_fattr *fattr, +struct nfs4_label *label) +{ +}#endif +EXPORT_SYMBOL_GPL (nfs_setsecurity);/* * This is our front-end to iget that looks up inodes by file handle
@@ -412,6 +444,9 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st*/ inode->i_blocks =nfs_calc_block_size (fattr->du.nfs3.used); } + +nfs_setsecurity (inode, fattr, label); + nfsi->attrtimeo =NFS_MINATTRTIMEO (inode); nfsi->attrtimeo_timestamp = now; nfsi->access_cache =RB_ROOT ;
@@ -771,6 +806,7 @@ struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cspin_unlock (&inode->i_lock);return ctx; } +EXPORT_SYMBOL_GPL (nfs_find_open_context);static void nfs_file_clear_open_context (struct file *filp) {
@@ -899,7 +935,8 @@ static int nfs_attribute_cache_expired(struct inode *inode)*/ int nfs_revalidate_inode (struct nfs_server *server,struct inode *inode) { -if (!(NFS_I (inode)->cache_validity &NFS_INO_INVALID_ATTR ) +if (!(NFS_I (inode)->cache_validity & + (NFS_INO_INVALID_ATTR |NFS_INO_INVALID_LABEL )) && !nfs_attribute_cache_expired (inode))return NFS_STALE (inode) ? -ESTALE :0 ;return __nfs_revalidate_inode (server, inode);
@@ -1240,6 +1277,9 @@ int nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr, struct nfs4_ status =nfs_refresh_inode_locked (inode, fattr, label);spin_unlock (&inode->i_lock); +if (label && !status) +nfs_setsecurity (inode, fattr, label); +return status; }EXPORT_SYMBOL_GPL (nfs_refresh_inode);
@@ -1279,6 +1319,10 @@ int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr, strucspin_lock (&inode->i_lock); status =nfs_post_op_update_inode_locked (inode, fattr, label);spin_unlock (&inode->i_lock); +if (nfs_server_capable (inode,NFS_CAP_SECURITY_LABEL )) { +if (label && !status) +nfs_setsecurity (inode, fattr, label); + }return status; }EXPORT_SYMBOL_GPL (nfs_post_op_update_inode);
@@ -1519,7 +1563,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, struct inode->i_blocks = fattr->du.nfs2.blocks;/* Update attrtimeo value if we're out of the unstable period */ -if (invalid &NFS_INO_INVALID_ATTR ) { +if (invalid & (NFS_INO_INVALID_ATTR |NFS_INO_INVALID_LABEL )) {nfs_inc_stats (inode,NFSIOS_ATTRINVALIDATE ); nfsi->attrtimeo =NFS_MINATTRTIMEO (inode); nfsi->attrtimeo_timestamp = now;
@@ -1532,6 +1576,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, struct } } invalid &= ~NFS_INO_INVALID_ATTR ; + invalid &= ~NFS_INO_INVALID_LABEL ;/* Don't invalidate the data if we were to blame */ if (!(S_ISREG (inode->i_mode) ||S_ISDIR (inode->i_mode) ||S_ISLNK (inode->i_mode)))
fs/nfs/nfs4proc.c +302 -16
517 lines not on this page · raw message
fs/nfs/nfs4xdr.c +131 -37
393 lines not on this page · raw message
fs/nfs/pnfs.c +1 -1
@@ -1922,7 +1922,7 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync) data->args.inode = inode; data->cred =get_rpccred (nfsi->layout->plh_lc_cred);nfs_fattr_init (&data->fattr); - data->args.bitmask =NFS_SERVER (inode)->cache_consistency_bitmask; + data->args.bitmask =nfs4_cache_bitmask (NFS_SERVER (inode),NULL ); data->res.fattr = &data->fattr; data->args.lastbytewritten = end_pos -1 ; data->res.server =NFS_SERVER (inode);
fs/nfs/super.c +15 -2
@@ -2379,8 +2379,21 @@ static int nfs_bdi_register(struct nfs_server *server)int nfs_set_sb_security (struct super_block *s,struct dentry *mntroot,struct nfs_mount_info *mount_info) { -return security_sb_set_mnt_opts (s, &mount_info->parsed->lsm_opts, -0 ,NULL ); +int error; +unsigned long kflags =0 , kflags_out =0 ; +if (NFS_SB (s)->caps &NFS_CAP_SECURITY_LABEL ) + kflags |=SECURITY_LSM_NATIVE_LABELS ; + + error =security_sb_set_mnt_opts (s, &mount_info->parsed->lsm_opts, + kflags, &kflags_out); +if (error) + goto err; + +if (NFS_SB (s)->caps &NFS_CAP_SECURITY_LABEL && + !(kflags_out &SECURITY_LSM_NATIVE_LABELS )) +NFS_SB (s)->caps &= ~NFS_CAP_SECURITY_LABEL ; +err: +return error; }EXPORT_SYMBOL_GPL (nfs_set_sb_security);
include/linux/nfs_fs.h +13 -0
@@ -199,6 +199,7 @@ struct nfs_inode {#define NFS_INO_INVALID_ACL 0x0010/* cached acls are invalid */ #define NFS_INO_REVAL_PAGECACHE 0x0020/* must revalidate pagecache */ #define NFS_INO_REVAL_FORCED 0x0040/* force revalidation ignoring a delegation */ +#define NFS_INO_INVALID_LABEL 0x0080/* cached label is invalid */ /* * Bit offsets in flags field
@@ -344,6 +345,8 @@ extern int __nfs_revalidate_inode(struct nfs_server *, struct inode *);extern int nfs_revalidate_mapping (struct inode *inode,struct address_space *mapping);extern int nfs_setattr (struct dentry *,struct iattr *);extern void nfs_setattr_update_inode (struct inode *inode,struct iattr *attr); +extern void nfs_setsecurity (struct inode *inode,struct nfs_fattr *fattr, +struct nfs4_label *label);extern struct nfs_open_context *get_nfs_open_context (struct nfs_open_context *ctx);extern void put_nfs_open_context (struct nfs_open_context *ctx);extern struct nfs_open_context *nfs_find_open_context (struct inode *inode,struct rpc_cred *cred,fmode_t mode);
@@ -502,9 +505,19 @@ static inline void nfs4_label_free(struct nfs4_label *label) }return ; } +static inline u32 *nfs4_cache_bitmask (struct nfs_server *server,struct nfs4_label *label) +{ +if (label) +return server->cache_consistency_bitmask; + +return server->cache_consistency_bitmask_nl; +}#else static inline struct nfs4_label *nfs4_label_alloc (struct nfs_server *server,gfp_t flags) {return NULL ; }static inline void nfs4_label_free (void *label) {} +static inline u32 * +nfs4_cache_bitmask (struct nfs_server *server,struct nfs4_label *label) +{return server->cache_consistency_bitmask; }#endif /*
include/linux/nfs_fs_sb.h +7 -0
@@ -145,11 +145,18 @@ struct nfs_server {u32 attr_bitmask[3 ];/* V4 bitmask representing the set of attributes supported on this filesystem */ +u32 attr_bitmask_nl[3 ]; +/* V4 bitmask representing the +set of attributes supported +on this filesystem excluding +the label support bit. */ u32 cache_consistency_bitmask[3 ];/* V4 bitmask representing the subset of change attribute, size, ctime and mtime attributes supported by the server */ +u32 cache_consistency_bitmask_nl[3 ]; +/* As above, excluding label. */ u32 acl_bitmask;/* V4 bitmask representing the ACEs that are supported on this filesystem */
security/selinux/hooks.c +4 -0
@@ -2877,7 +2877,10 @@ static void selinux_inode_post_setxattr(struct dentry *dentry, const char *name,return ; } + isec->sclass =inode_mode_to_security_class (inode->i_mode); isec->sid = newsid; + isec->initialized =1 ; +return ; }
@@ -2965,6 +2968,7 @@ static int selinux_inode_setsecurity(struct inode *inode, const char *name,if (rc)return rc; + isec->sclass =inode_mode_to_security_class (inode->i_mode); isec->sid = newsid; isec->initialized =1 ;return 0 ;
Signature · 1 line
1.8.1.4
Re: [PATCH 13/17] NFS: Client implementation of Labeled-NFS
James, thanks very much for taking a look at these. I notice this is the one patch that touches security that you didn't respond to (note the 4 lines in hooks.c)--do you see any problem here, or does this look OK too?
--b.
Quoted 1,270 lines · Steve Dickson
From: David Quigley <[email protected]>
This patch implements the client transport and handling support for labeled NFS. The patch adds two functions to encode and decode the security label recommended attribute which makes use of the LSM hooks added earlier. It also adds code to grab the label from the file attribute structures and encode the label to be sent back to the server.
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]>--- fs/nfs/inode.c | 57 ++++++++- fs/nfs/nfs4proc.c | 318 +++++++++++++++++++++++++++++++++++++++++++--- fs/nfs/nfs4xdr.c | 168 ++++++++++++++++++------ fs/nfs/pnfs.c | 2 +- fs/nfs/super.c | 17 ++- include/linux/nfs_fs.h | 13 ++ include/linux/nfs_fs_sb.h | 7 + security/selinux/hooks.c | 4 + 8 files changed, 524 insertions(+), 62 deletions(-)fs/nfs/inode.c +51
-6@@ -162,11 +162,19 @@ static void nfs_zap_caches_locked(struct inode *inode)memset (NFS_I (inode)->cookieverf,0 ,sizeof (NFS_I (inode)->cookieverf));if (S_ISREG (mode) ||S_ISDIR (mode) ||S_ISLNK (mode)) { - nfsi->cache_validity |=NFS_INO_INVALID_ATTR |NFS_INO_INVALID_DATA |NFS_INO_INVALID_ACCESS |NFS_INO_INVALID_ACL |NFS_INO_REVAL_PAGECACHE ;nfs_fscache_invalidate (inode); - }else { - nfsi->cache_validity |=NFS_INO_INVALID_ATTR |NFS_INO_INVALID_ACCESS |NFS_INO_INVALID_ACL |NFS_INO_REVAL_PAGECACHE ; - } + nfsi->cache_validity |=NFS_INO_INVALID_ATTR + |NFS_INO_INVALID_LABEL + |NFS_INO_INVALID_DATA + |NFS_INO_INVALID_ACCESS + |NFS_INO_INVALID_ACL + |NFS_INO_REVAL_PAGECACHE ; + }else + nfsi->cache_validity |=NFS_INO_INVALID_ATTR + |NFS_INO_INVALID_LABEL + |NFS_INO_INVALID_ACCESS + |NFS_INO_INVALID_ACL + |NFS_INO_REVAL_PAGECACHE ; }void nfs_zap_caches (struct inode *inode)@@ -258,6 +266,24 @@ nfs_init_locked(struct inode *inode, void *opaque) }#ifdef CONFIG_NFS_V4_SECURITY_LABEL +void nfs_setsecurity (struct inode *inode,struct nfs_fattr *fattr, +struct nfs4_label *label) +{ +int error; + +if ((fattr->valid &NFS_ATTR_FATTR_V4_SECURITY_LABEL ) && + label && inode->i_security) { + error =security_inode_notifysecctx (inode, label->label, + label->len); +if (error) +printk (KERN_ERR "%s() %s %d " +"security_inode_notifysecctx() %d\n" , + __func__, + (char *)label->label, + label->len, error); + } +} +struct nfs4_label *nfs4_label_alloc (struct nfs_server *server,gfp_t flags) {struct nfs4_label *label =NULL ;@@ -283,7 +309,13 @@ struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags) return label; }EXPORT_SYMBOL_GPL (nfs4_label_alloc); +#else +void inline nfs_setsecurity (struct inode *inode,struct nfs_fattr *fattr, +struct nfs4_label *label) +{ +}#endif +EXPORT_SYMBOL_GPL (nfs_setsecurity);/* * This is our front-end to iget that looks up inodes by file handle @@ -412,6 +444,9 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st*/ inode->i_blocks =nfs_calc_block_size (fattr->du.nfs3.used); } + +nfs_setsecurity (inode, fattr, label); + nfsi->attrtimeo =NFS_MINATTRTIMEO (inode); nfsi->attrtimeo_timestamp = now; nfsi->access_cache =RB_ROOT ;@@ -771,6 +806,7 @@ struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cspin_unlock (&inode->i_lock);return ctx; } +EXPORT_SYMBOL_GPL (nfs_find_open_context);static void nfs_file_clear_open_context (struct file *filp) {@@ -899,7 +935,8 @@ static int nfs_attribute_cache_expired(struct inode *inode)*/ int nfs_revalidate_inode (struct nfs_server *server,struct inode *inode) { -if (!(NFS_I (inode)->cache_validity &NFS_INO_INVALID_ATTR ) +if (!(NFS_I (inode)->cache_validity & + (NFS_INO_INVALID_ATTR |NFS_INO_INVALID_LABEL )) && !nfs_attribute_cache_expired (inode))return NFS_STALE (inode) ? -ESTALE :0 ;return __nfs_revalidate_inode (server, inode);@@ -1240,6 +1277,9 @@ int nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr, struct nfs4_ status =nfs_refresh_inode_locked (inode, fattr, label);spin_unlock (&inode->i_lock); +if (label && !status) +nfs_setsecurity (inode, fattr, label); +return status; }EXPORT_SYMBOL_GPL (nfs_refresh_inode);@@ -1279,6 +1319,10 @@ int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr, strucspin_lock (&inode->i_lock); status =nfs_post_op_update_inode_locked (inode, fattr, label);spin_unlock (&inode->i_lock); +if (nfs_server_capable (inode,NFS_CAP_SECURITY_LABEL )) { +if (label && !status) +nfs_setsecurity (inode, fattr, label); + }return status; }EXPORT_SYMBOL_GPL (nfs_post_op_update_inode);@@ -1519,7 +1563,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, struct inode->i_blocks = fattr->du.nfs2.blocks;/* Update attrtimeo value if we're out of the unstable period */ -if (invalid &NFS_INO_INVALID_ATTR ) { +if (invalid & (NFS_INO_INVALID_ATTR |NFS_INO_INVALID_LABEL )) {nfs_inc_stats (inode,NFSIOS_ATTRINVALIDATE ); nfsi->attrtimeo =NFS_MINATTRTIMEO (inode); nfsi->attrtimeo_timestamp = now;@@ -1532,6 +1576,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, struct } } invalid &= ~NFS_INO_INVALID_ATTR ; + invalid &= ~NFS_INO_INVALID_LABEL ;/* Don't invalidate the data if we were to blame */ if (!(S_ISREG (inode->i_mode) ||S_ISDIR (inode->i_mode) ||S_ISLNK (inode->i_mode)))fs/nfs/nfs4proc.c +302
-16@@ -87,6 +87,52 @@ static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,static int nfs41_test_stateid (struct nfs_server *,nfs4_stateid *);static int nfs41_free_stateid (struct nfs_server *,nfs4_stateid *);#endif + +#ifdef CONFIG_NFS_V4_SECURITY_LABEL +static inline struct nfs4_label * +nfs4_label_init_security (struct inode *dir,struct dentry *dentry, +struct iattr *sattr,struct nfs4_label *l) +{ +int err; +int minor_version =NFS_SERVER (dir)->nfs_client->cl_minorversion; + +if (minor_version <2 ) +return NULL ; + +if (nfs_server_capable (dir,NFS_CAP_SECURITY_LABEL )) { + err =security_dentry_init_security (dentry, sattr->ia_mode, + &dentry->d_name, (void **)&l->label, &l->len); +if (err ==0 ) +return l; + } +return NULL ; +} +static inline void +nfs4_label_release_security (struct nfs4_label *label) +{ +if (label) +security_release_secctx (label->label, label->len); +} +static inline u32 *nfs4_bitmask (struct nfs_server *server,struct nfs4_label *label) +{ +if (label) +return server->attr_bitmask; + +return server->attr_bitmask_nl; +} +#else +static inline struct nfs4_label * +nfs4_label_init_security (struct inode *dir,struct dentry *dentry, +struct iattr *sattr,struct nfs4_label *l) +{return NULL ; } +static inline void +nfs4_label_release_security (struct nfs4_label *label) +{return ; } +static inline u32 * +nfs4_bitmask (struct nfs_server *server,struct nfs4_label *label) +{return server->attr_bitmask; } +#endif +/* Prevent leaks of NFSv4 errors into userland */ static int nfs4_map_errors (int err) {@@ -133,7 +179,10 @@ const u32 nfs4_fattr_bitmap[3] = { | FATTR4_WORD1_SPACE_USED | FATTR4_WORD1_TIME_ACCESS | FATTR4_WORD1_TIME_METADATA - | FATTR4_WORD1_TIME_MODIFY + | FATTR4_WORD1_TIME_MODIFY, +#ifdef CONFIG_NFS_V4_SECURITY_LABEL + FATTR4_WORD2_SECURITY_LABEL +#endif };static const u32 nfs4_pnfs_open_bitmap[3 ] = {@@ -817,7 +866,7 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry, p->o_arg.id.uniquifier = sp->so_seqid.owner_id; p->o_arg.name = &dentry->d_name; p->o_arg.server = server; - p->o_arg.bitmask = server->attr_bitmask; + p->o_arg.bitmask =nfs4_bitmask (server, label); p->o_arg.open_bitmap = &nfs4_fattr_bitmap[0 ]; p->o_arg.claim =NFS4_OPEN_CLAIM_NULL ; p->o_arg.label = label;@@ -1973,6 +2022,7 @@ static int _nfs4_do_open(struct inode *dir,if (status ==0 ) {nfs_setattr_update_inode (state->inode, sattr);nfs_post_op_update_inode (state->inode, opendata->o_res.f_attr, olabel); +nfs_setsecurity (state->inode, opendata->o_res.f_attr, olabel); } }@@ -2086,6 +2136,10 @@ static int _nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,unsigned long timestamp = jiffies;int status; + arg.bitmask =nfs4_bitmask (server, ilabel); +if (ilabel) + arg.bitmask =nfs4_bitmask (server, olabel); +nfs_fattr_init (fattr);if (state !=NULL ) {@@ -2315,7 +2369,7 @@ int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait)if (calldata->arg.seqid ==NULL ) goto out_free_calldata; calldata->arg.fmode =0 ; - calldata->arg.bitmask = server->cache_consistency_bitmask; + calldata->arg.bitmask = server->cache_consistency_bitmask_nl; calldata->res.fattr = &calldata->fattr; calldata->res.seqid = calldata->arg.seqid; calldata->res.server = server;@@ -2345,11 +2399,16 @@ static struct inode * nfs4_atomic_open(struct inode *dir, struct nfs_open_context *ctx, int open_flags, struct iattr *attr) { struct nfs4_state *state; -struct nfs4_label *label =NULL ; +struct nfs4_label l = {0 ,0 ,0 ,NULL }, *label =NULL ; + + label =nfs4_label_init_security (dir, ctx->dentry, attr, &l);/* Protect against concurrent sillydeletes */ state =nfs4_do_open (dir, ctx->dentry, ctx->mode, open_flags, attr, label, ctx->cred, &ctx->mdsthreshold); + +nfs4_label_release_security (label); +if (IS_ERR (state))return ERR_CAST (state); ctx->state = state;@@ -2409,10 +2468,26 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f server->caps |=NFS_CAP_CTIME ;if (res.attr_bitmask[1 ] &FATTR4_WORD1_TIME_MODIFY ) server->caps |=NFS_CAP_MTIME ; +#ifdef CONFIG_NFS_V4_SECURITY_LABEL +if (res.attr_bitmask[2 ] &FATTR4_WORD2_SECURITY_LABEL ) + server->caps |=NFS_CAP_SECURITY_LABEL ; +#endif +memcpy (server->attr_bitmask_nl, res.attr_bitmask, +sizeof (server->attr_bitmask)); + +if (server->caps &NFS_CAP_SECURITY_LABEL ) + server->attr_bitmask_nl[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ;memcpy (server->cache_consistency_bitmask, res.attr_bitmask,sizeof (server->cache_consistency_bitmask)); server->cache_consistency_bitmask[0 ] &=FATTR4_WORD0_CHANGE |FATTR4_WORD0_SIZE ; - server->cache_consistency_bitmask[1 ] &=FATTR4_WORD1_TIME_METADATA |FATTR4_WORD1_TIME_MODIFY ; + server->cache_consistency_bitmask[1 ] &=FATTR4_WORD1_TIME_METADATA | +FATTR4_WORD1_TIME_MODIFY ; +#ifdef CONFIG_NFS_V4_SECURITY_LABEL + server->cache_consistency_bitmask[2 ] &=FATTR4_WORD2_SECURITY_LABEL ; +#endif +memcpy (server->cache_consistency_bitmask_nl, server->cache_consistency_bitmask, +sizeof (server->cache_consistency_bitmask_nl)); + server->cache_consistency_bitmask_nl[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ; server->acl_bitmask = res.acl_bitmask; server->fh_expire_type = res.fh_expire_type; }@@ -2435,8 +2510,9 @@ int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)static int _nfs4_lookup_root (struct nfs_server *server,struct nfs_fh *fhandle,struct nfs_fsinfo *info) { +u32 bitmask[3 ];struct nfs4_lookup_root_arg args = { - .bitmask = nfs4_fattr_bitmap, + .bitmask = bitmask, };struct nfs4_lookup_res res = { .server = server,@@ -2449,6 +2525,13 @@ static int _nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, .rpc_resp = &res, }; + bitmask[0 ] = nfs4_fattr_bitmap[0 ]; + bitmask[1 ] = nfs4_fattr_bitmap[1 ]; +/* +* Process the label in the upcoming getfattr +*/ + bitmask[2 ] = nfs4_fattr_bitmap[2 ] & ~FATTR4_WORD2_SECURITY_LABEL ; +nfs_fattr_init (info->fattr);return nfs4_call_sync (server->client, server, &msg, &args.seq_args, &res.seq_res,0 ); }@@ -2635,7 +2718,9 @@ static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, .rpc_argp = &args, .rpc_resp = &res, }; - + + args.bitmask =nfs4_bitmask (server, label); +nfs_fattr_init (fattr);return nfs4_call_sync (server->client, server, &msg, &args.seq_args, &res.seq_res,0 ); }@@ -2730,6 +2815,7 @@ static int _nfs4_proc_lookup(struct rpc_clnt *clnt, struct inode *dir,struct nfs4_lookup_res res = { .server = server, .fattr = fattr, + .label = label, .fh = fhandle, };struct rpc_message msg = {@@ -2738,6 +2824,8 @@ static int _nfs4_proc_lookup(struct rpc_clnt *clnt, struct inode *dir, .rpc_resp = &res, }; + args.bitmask =nfs4_bitmask (server, label); +nfs_fattr_init (fattr);dprintk ("NFS call lookup %s\n" , name->name);@@ -2844,7 +2932,7 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry .rpc_cred = entry->cred, };int mode = entry->mask; -int status; +int status =0 ;/* * Determine which access bits we want to ask for... @@ -2873,6 +2961,8 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry goto out; } + args.bitmask =nfs4_cache_bitmask (server, res.label); + status =nfs4_call_sync (server->client, server, &msg, &args.seq_args, &res.seq_res,0 );if (!status) {nfs_access_set_mask (entry, res.access);@@ -2959,7 +3049,7 @@ static int nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, int flags) { - struct nfs4_label *ilabel = NULL; + struct nfs4_label l, *ilabel = NULL;struct nfs_open_context *ctx;struct nfs4_state *state;int status =0 ;@@ -2968,6 +3058,8 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,if (IS_ERR (ctx))return PTR_ERR (ctx); + ilabel =nfs4_label_init_security (dir, dentry, sattr, &l); + sattr->ia_mode &= ~current_umask (); state = nfs4_do_open(dir, dentry, ctx->mode, flags, sattr, ilabel, ctx->cred,@@ -2981,6 +3073,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,nfs_set_verifier (dentry,nfs_save_change_attribute (dir)); ctx->state = state; out: +nfs4_label_release_security (ilabel);put_nfs_open_context (ctx);return status; }@@ -3029,6 +3122,8 @@ static void nfs4_proc_unlink_setup(struct rpc_message *msg, struct inode *dir) res->server = server; msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_REMOVE ];nfs41_init_sequence (&args->seq_args, &res->seq_res,1 ); + +nfs_fattr_init (res->dir_attr); }static void nfs4_proc_unlink_rpc_prepare (struct rpc_task *task,struct nfs_unlinkdata *data)@@ -3179,6 +3274,7 @@ static int _nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr * status =PTR_ERR (res.label); goto out; } + arg.bitmask =nfs4_bitmask (server, res.label); status =nfs4_call_sync (server->client, server, &msg, &arg.seq_args, &res.seq_res,1 );if (!status) {@@ -3236,7 +3332,7 @@ static struct nfs4_createdata *nfs4_alloc_createdata(struct inode *dir, data->arg.name = name; data->arg.attrs = sattr; data->arg.ftype = ftype; - data->arg.bitmask = server->attr_bitmask; + data->arg.bitmask =nfs4_bitmask (server, data->label); data->res.server = server; data->res.fh = &data->fh; data->res.fattr = &data->fattr;@@ -3297,14 +3393,19 @@ static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry, struct page *page, unsigned int len, struct iattr *sattr) { struct nfs4_exception exception = { }; -struct nfs4_label *label =NULL ; +struct nfs4_label l, *label =NULL ;int err; + + label =nfs4_label_init_security (dir, dentry, sattr, &l); +do { err =nfs4_handle_exception (NFS_SERVER (dir),_nfs4_proc_symlink (dir, dentry, page, len, sattr, label), &exception); }while (exception.retry); + +nfs4_label_release_security (label);return err; }@@ -3330,15 +3431,19 @@ static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) {struct nfs4_exception exception = { }; -struct nfs4_label *label =NULL ; +struct nfs4_label l, *label =NULL ;int err; + label =nfs4_label_init_security (dir, dentry, sattr, &l); + sattr->ia_mode &= ~current_umask ();do { err =nfs4_handle_exception (NFS_SERVER (dir),_nfs4_proc_mkdir (dir, dentry, sattr, label), &exception); }while (exception.retry); +nfs4_label_release_security (label); +return err; }@@ -3354,7 +3459,9 @@ static int _nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, .bitmask = NFS_SERVER(dentry->d_inode)->attr_bitmask, .plus = plus, }; -struct nfs4_readdir_res res; +struct nfs4_readdir_res res = { + .pgbase =0 , + };struct rpc_message msg = { .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READDIR ], .rpc_argp = &args,@@ -3434,15 +3541,20 @@ static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr, dev_t rdev) {struct nfs4_exception exception = { }; -struct nfs4_label *label =NULL ; +struct nfs4_label l, *label =NULL ;int err; + label =nfs4_label_init_security (dir, dentry, sattr, &l); + sattr->ia_mode &= ~current_umask ();do { err =nfs4_handle_exception (NFS_SERVER (dir),_nfs4_proc_mknod (dir, dentry, sattr, label, rdev), &exception); }while (exception.retry); + +nfs4_label_release_security (label); +return err; }@@ -3658,7 +3770,8 @@ static void nfs4_proc_write_setup(struct nfs_write_data *data, struct rpc_messag data->args.bitmask =NULL ; data->res.fattr =NULL ; }else - data->args.bitmask = server->cache_consistency_bitmask; + + data->args.bitmask =nfs4_cache_bitmask (server,NULL );if (!data->write_done_cb) data->write_done_cb = nfs4_write_done_cb;@@ -4083,6 +4196,179 @@ static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflenreturn err; } +#ifdef CONFIG_NFS_V4_SECURITY_LABEL +static int _nfs4_get_security_label (struct inode *inode,void *buf, +size_t buflen) +{ +struct nfs_server *server =NFS_SERVER (inode); +struct nfs_fattr fattr; +struct nfs4_label label = {0 ,0 , buflen, buf}; + +u32 bitmask[3 ] = {0 ,0 ,FATTR4_WORD2_SECURITY_LABEL }; +struct nfs4_getattr_arg args = { + .fh =NFS_FH (inode), + .bitmask = bitmask, + }; +struct nfs4_getattr_res res = { + .fattr = &fattr, + .label = &label, + .server = server, + }; +struct rpc_message msg = { + .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_GETATTR ], + .rpc_argp = &args, + .rpc_resp = &res, + }; +int ret; + +nfs_fattr_init (&fattr); + + ret =rpc_call_sync (server->client, &msg,0 ); +if (ret) +return ret; +if (!(fattr.valid &NFS_ATTR_FATTR_V4_SECURITY_LABEL )) +return -ENOENT ; +if (buflen < label.len) +return -ERANGE ; +return 0 ; +} + +static int nfs4_get_security_label (struct inode *inode,void *buf, +size_t buflen) +{ +struct nfs4_exception exception = { }; +int err; + +if (!nfs_server_capable (inode,NFS_CAP_SECURITY_LABEL )) +return -EOPNOTSUPP ; + +do { + err =nfs4_handle_exception (NFS_SERVER (inode), +_nfs4_get_security_label (inode, buf, buflen), + &exception); + }while (exception.retry); +return err; +} + +static int _nfs4_do_set_security_label (struct inode *inode, +struct nfs4_label *ilabel, +struct nfs_fattr *fattr, +struct nfs4_label *olabel, +struct nfs4_state *state) +{ + +struct iattr sattr = {0 }; +struct nfs_server *server =NFS_SERVER (inode); +const u32 bitmask[3 ] = {0 ,0 ,FATTR4_WORD2_SECURITY_LABEL }; +struct nfs_setattrargs args = { + .fh =NFS_FH (inode), + .iap = &sattr, + .server = server, + .bitmask = bitmask, + .label = ilabel, + }; +struct nfs_setattrres res = { + .fattr = fattr, + .label = olabel, + .server = server, + }; +struct rpc_message msg = { + .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETATTR ], + .rpc_argp = &args, + .rpc_resp = &res, + }; +unsigned long timestamp = jiffies; +int status; + +if (state !=NULL ) { +struct nfs_lockowner lockowner = { + .l_owner = current->files, + .l_pid = current->tgid, + }; + + msg.rpc_cred = state->owner->so_cred; +nfs4_select_rw_stateid (&args.stateid, state,FMODE_WRITE , + &lockowner); + }else if (nfs4_copy_delegation_stateid (&args.stateid, inode, +FMODE_WRITE )) { +/* Use that stateid */ + }else +nfs4_stateid_copy (&args.stateid, &zero_stateid); + + status =rpc_call_sync (server->client, &msg,0 ); +if (status ==0 && state !=NULL ) +renew_lease (server, timestamp); +return status; +} + +static int nfs4_do_set_security_label (struct inode *inode, +struct nfs4_label *ilabel, +struct nfs_fattr *fattr, +struct nfs4_label *olabel, +struct nfs4_state *state) +{ +struct nfs4_exception exception = { }; +int err; + +do { + err =nfs4_handle_exception (NFS_SERVER (inode), +_nfs4_do_set_security_label (inode, ilabel, + fattr, olabel, state), + &exception); + }while (exception.retry); +return err; +} + +static int +nfs4_set_security_label (struct dentry *dentry,const void *buf,size_t buflen) +{ +struct nfs4_label ilabel, *olabel =NULL ; +struct nfs_fattr fattr; +struct rpc_cred *cred; +struct nfs_open_context *ctx; +struct nfs4_state *state =NULL ; +struct inode *inode = dentry->d_inode; +int status; + +if (!nfs_server_capable (inode,NFS_CAP_SECURITY_LABEL )) +return -EOPNOTSUPP ; + +nfs_fattr_init (&fattr); + + ilabel.pi =0 ; + ilabel.lfs =0 ; + ilabel.label = (char *)buf; + ilabel.len = buflen; + + cred =rpc_lookup_cred (); +if (IS_ERR (cred)) +return PTR_ERR (cred); + + olabel =nfs4_label_alloc (NFS_SERVER (inode),GFP_KERNEL ); +if (IS_ERR (olabel)) { + status = -PTR_ERR (olabel); + goto out; + } + +/* Search for an existing open(O_WRITE) file */ + ctx =nfs_find_open_context (inode, cred,FMODE_WRITE ); +if (ctx !=NULL ) + state = ctx->state; + + status =nfs4_do_set_security_label (inode, &ilabel, &fattr, olabel, + state); +if (status ==0 ) +nfs_setsecurity (inode, &fattr, olabel); +if (ctx !=NULL ) +put_nfs_open_context (ctx); +nfs4_label_free (olabel); +out: +put_rpccred (cred); +return status; +} +#endif /* CONFIG_NFS_V4_SECURITY_LABEL */ + +static int nfs4_async_handle_error (struct rpc_task *task,const struct nfs_server *server,struct nfs4_state *state) {@@ -4371,7 +4657,7 @@ static int _nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, confs41_init_sequence (&data->args.seq_args, &data->res.seq_res,1 ); data->args.fhandle = &data->fh; data->args.stateid = &data->stateid; - data->args.bitmask = server->cache_consistency_bitmask; + data->args.bitmask = server->cache_consistency_bitmask_nl;nfs_copy_fh (&data->fh,NFS_FH (inode));nfs4_stateid_copy (&data->stateid, stateid); data->res.fattr = &data->fattr;fs/nfs/nfs4xdr.c +131
-37@@ -102,12 +102,23 @@ static int nfs4_stat_to_errno(int);#define nfs4_path_maxsz (1 + ((3 + NFS4_MAXPATHLEN) >> 2))#define nfs4_owner_maxsz (1 + XDR_QUADLEN(IDMAP_NAMESZ))#define nfs4_group_maxsz (1 + XDR_QUADLEN(IDMAP_NAMESZ)) +#ifdef CONFIG_NFS_V4_SECURITY_LABEL +/* PI(4 bytes) + LFS(4 bytes) + 1(for null terminator?) + MAXLABELLEN */ +#define nfs4_label_maxsz (4 + 4 + 1 + XDR_QUADLEN(NFS4_MAXLABELLEN)) +#define encode_readdir_space 24 +#define encode_readdir_bitmask_sz 3 +#else +#define nfs4_label_maxsz 0 +#define encode_readdir_space 20 +#define encode_readdir_bitmask_sz 2 +#endif /* We support only one layout type per file system */ #define decode_mdsthreshold_maxsz (1 + 1 + nfs4_fattr_bitmap_maxsz + 1 + 8)/* This is based on getfattr, which uses the most attributes: */ #define nfs4_fattr_value_maxsz (1 + (1 + 2 + 2 + 4 + 2 + 1 + 1 + 2 + 2 + \ 3 + 3 + 3 + nfs4_owner_maxsz + \ - nfs4_group_maxsz + decode_mdsthreshold_maxsz)) + nfs4_group_maxsz + nfs4_label_maxsz + \ + decode_mdsthreshold_maxsz))#define nfs4_fattr_maxsz (nfs4_fattr_bitmap_maxsz + \ nfs4_fattr_value_maxsz)#define decode_getattr_maxsz (op_decode_hdr_maxsz + nfs4_fattr_maxsz)@@ -115,6 +126,7 @@ static int nfs4_stat_to_errno(int); 1 + 2 + 1 + \ nfs4_owner_maxsz + \ nfs4_group_maxsz + \ + nfs4_label_maxsz + \ 4 + 4)#define encode_savefh_maxsz (op_encode_hdr_maxsz)#define decode_savefh_maxsz (op_decode_hdr_maxsz)@@ -192,9 +204,11 @@ static int nfs4_stat_to_errno(int); encode_stateid_maxsz + 3)#define decode_read_maxsz (op_decode_hdr_maxsz + 2)#define encode_readdir_maxsz (op_encode_hdr_maxsz + \ - 2 + encode_verifier_maxsz + 5) + 2 + encode_verifier_maxsz + 5 + \ + nfs4_label_maxsz)#define decode_readdir_maxsz (op_decode_hdr_maxsz + \ - decode_verifier_maxsz) + decode_verifier_maxsz + \ + nfs4_label_maxsz + nfs4_fattr_maxsz)#define encode_readlink_maxsz (op_encode_hdr_maxsz)#define decode_readlink_maxsz (op_decode_hdr_maxsz + 1)#define encode_write_maxsz (op_encode_hdr_maxsz + \@@ -972,7 +986,9 @@ static void encode_nfs4_verifier(struct xdr_stream *xdr, const nfs4_verifier *veencode_opaque_fixed (xdr, verf->data,NFS4_VERIFIER_SIZE ); } -static void encode_attrs (struct xdr_stream *xdr,const struct iattr *iap,const struct nfs_server *server) +static void encode_attrs (struct xdr_stream *xdr,const struct iattr *iap, +const struct nfs4_label *label, +const struct nfs_server *server) {char owner_name[IDMAP_NAMESZ ];char owner_group[IDMAP_NAMESZ ];@@ -1022,6 +1038,8 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const } len +=4 + (XDR_QUADLEN (owner_grouplen) <<2 ); } +if (label) + len +=4 +4 +4 + (XDR_QUADLEN (label->len) <<2 );if (iap->ia_valid &ATTR_ATIME_SET ) len +=16 ;else if (iap->ia_valid &ATTR_ATIME )@@ -1078,6 +1096,13 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const bmval1 |=FATTR4_WORD1_TIME_MODIFY_SET ; *p++ =cpu_to_be32 (NFS4_SET_TO_SERVER_TIME ); } +if (label) { + bmval2 |=FATTR4_WORD2_SECURITY_LABEL ; + *p++ =cpu_to_be32 (label->lfs); + *p++ =cpu_to_be32 (label->pi); + *p++ =cpu_to_be32 (label->len); + p =xdr_encode_opaque_fixed (p, label->label, label->len); + }/* * Now we backfill the bitmap and the attribute buffer length. @@ -1144,7 +1169,7 @@ static void encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg * }encode_string (xdr, create->name->len, create->name->name); -encode_attrs (xdr, create->attrs, create->server); +encode_attrs (xdr, create->attrs, create->label, create->server); }static void encode_getattr_one (struct xdr_stream *xdr,uint32_t bitmap,struct compound_hdr *hdr)@@ -1377,21 +1402,23 @@ static inline void encode_createmode(struct xdr_stream *xdr, const struct nfs_opswitch (arg->open_flags &O_EXCL ) {case 0 : *p =cpu_to_be32 (NFS4_CREATE_UNCHECKED ); -encode_attrs (xdr, arg->u.attrs, arg->server); +encode_attrs (xdr, arg->u.attrs, arg->label, arg->server);break ;default : clp = arg->server->nfs_client;if (clp->cl_mvops->minor_version >0 ) {if (nfs4_has_persistent_session (clp)) { *p =cpu_to_be32 (NFS4_CREATE_GUARDED ); -encode_attrs (xdr, arg->u.attrs, arg->server); +encode_attrs (xdr, arg->u.attrs, arg->label, + arg->server); }else {struct iattr dummy; *p =cpu_to_be32 (NFS4_CREATE_EXCLUSIVE4_1 );encode_nfs4_verifier (xdr, &arg->u.verifier); dummy.ia_valid =0 ; -encode_attrs (xdr, &dummy, arg->server); +encode_attrs (xdr, &dummy, arg->label, + arg->server); } }else { *p =cpu_to_be32 (NFS4_CREATE_EXCLUSIVE );@@ -1547,7 +1574,7 @@ static void encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args,static void encode_readdir (struct xdr_stream *xdr,const struct nfs4_readdir_arg *readdir,struct rpc_rqst *req,struct compound_hdr *hdr) { -uint32_t attrs[2 ] = { +uint32_t attrs[3 ] = {FATTR4_WORD0_RDATTR_ERROR ,FATTR4_WORD1_MOUNTED_ON_FILEID , };@@ -1570,20 +1597,26 @@ static void encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_argencode_op_hdr (xdr,OP_READDIR , decode_readdir_maxsz, hdr);encode_uint64 (xdr, readdir->cookie);encode_nfs4_verifier (xdr, &readdir->verifier); - p =reserve_space (xdr,20 ); + p =reserve_space (xdr, encode_readdir_space); *p++ =cpu_to_be32 (dircount); *p++ =cpu_to_be32 (readdir->count); - *p++ =cpu_to_be32 (2 ); - + *p++ =cpu_to_be32 (encode_readdir_bitmask_sz); *p++ =cpu_to_be32 (attrs[0 ] & readdir->bitmask[0 ]); - *p =cpu_to_be32 (attrs[1 ] & readdir->bitmask[1 ]); + *p =cpu_to_be32 (attrs[1 ] & readdir->bitmask[1 ]); +if (encode_readdir_bitmask_sz >2 ) { +if (hdr->minorversion >1 ) + attrs[2 ] |=FATTR4_WORD2_SECURITY_LABEL ; + p++, *p++ =cpu_to_be32 (attrs[2 ] & readdir->bitmask[2 ]); + }memcpy (verf, readdir->verifier.data,sizeof (verf)); -dprintk ("%s: cookie = %Lu, verifier = %08x:%08x, bitmap = %08x:%08x\n" , + +dprintk ("%s: cookie = %llu, verifier = %08x:%08x, bitmap = %08x:%08x:%08x\n" , __func__, (unsigned long long )readdir->cookie, verf[0 ], verf[1 ], attrs[0 ] & readdir->bitmask[0 ], - attrs[1 ] & readdir->bitmask[1 ]); + attrs[1 ] & readdir->bitmask[1 ], + attrs[2 ] & readdir->bitmask[2 ]); }static void encode_readlink (struct xdr_stream *xdr,const struct nfs4_readlink *readlink,struct rpc_rqst *req,struct compound_hdr *hdr)@@ -1642,7 +1675,7 @@ static void encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs {encode_op_hdr (xdr,OP_SETATTR , decode_setattr_maxsz, hdr);encode_nfs4_stateid (xdr, &arg->stateid); -encode_attrs (xdr, arg->iap, server); +encode_attrs (xdr, arg->iap, arg->label, server); }static void encode_setclientid (struct xdr_stream *xdr,const struct nfs4_setclientid *setclientid,struct compound_hdr *hdr)@@ -4060,6 +4093,60 @@ static int decode_attr_time_delta(struct xdr_stream *xdr, uint32_t *bitmap,return status; } +static int decode_attr_security_label (struct xdr_stream *xdr,uint32_t *bitmap, +struct nfs4_label *label) +{ +uint32_t pi =0 ; +uint32_t lfs =0 ; +__u32 len; +__be32 *p; +int status =0 ; + +if (unlikely (bitmap[2 ] & (FATTR4_WORD2_SECURITY_LABEL -1U ))) +return -EIO ; +if (likely (bitmap[2 ] &FATTR4_WORD2_SECURITY_LABEL )) { + p =xdr_inline_decode (xdr,4 ); +if (unlikely (!p)) + goto out_overflow; + lfs =be32_to_cpup (p++); + p =xdr_inline_decode (xdr,4 ); +if (unlikely (!p)) + goto out_overflow; + pi =be32_to_cpup (p++); + p =xdr_inline_decode (xdr,4 ); +if (unlikely (!p)) + goto out_overflow; + len =be32_to_cpup (p++); + p =xdr_inline_decode (xdr, len); +if (unlikely (!p)) + goto out_overflow; +if (len <NFS4_MAXLABELLEN ) { +if (label) { +memcpy (label->label, p, len); + label->len = len; + label->pi = pi; + label->lfs = lfs; + status =NFS_ATTR_FATTR_V4_SECURITY_LABEL ; + }else { +printk ("%s(): NULL label.\n" , __func__); +dump_stack (); + goto out_overflow; + } + bitmap[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ; + }else +printk (KERN_WARNING "%s: label too long (%u)!\n" , + __func__, len); + } +if (label && label->label) +dprintk ("%s: label=%s, len=%d, PI=%d, LFS=%d\n" , __func__, + (char *)label->label, label->len, label->pi, label->lfs); +return status; + +out_overflow: +print_overflow_msg (__func__, xdr); +return -EIO ; +} +static int decode_attr_time_modify (struct xdr_stream *xdr,uint32_t *bitmap,struct timespec *time) {int status =0 ;@@ -4402,7 +4489,7 @@ out_overflow:static int decode_getfattr_attrs (struct xdr_stream *xdr,uint32_t *bitmap,struct nfs_fattr *fattr,struct nfs_fh *fh, -struct nfs4_fs_locations *fs_loc, +struct nfs4_fs_locations *fs_loc,struct nfs4_label *label,const struct nfs_server *server) {int status;@@ -4510,6 +4597,11 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap,if (status <0 ) goto xdr_error; + status =decode_attr_security_label (xdr, bitmap, label); +if (status <0 ) + goto xdr_error; + fattr->valid |= status; + xdr_error:dprintk ("%s: xdr returned %d\n" , __func__, -status);return status;@@ -4517,7 +4609,7 @@ xdr_error:static int decode_getfattr_generic (struct xdr_stream *xdr,struct nfs_fattr *fattr,struct nfs_fh *fh,struct nfs4_fs_locations *fs_loc, -const struct nfs_server *server) +struct nfs4_label *label,const struct nfs_server *server) {unsigned int savep; uint32_t attrlen,@@ -4536,7 +4628,8 @@ static int decode_getfattr_generic(struct xdr_stream *xdr, struct nfs_fattr *fatif (status <0 ) goto xdr_error; - status =decode_getfattr_attrs (xdr, bitmap, fattr, fh, fs_loc, server); + status =decode_getfattr_attrs (xdr, bitmap, fattr, fh, fs_loc, + label, server);if (status <0 ) goto xdr_error;@@ -4547,9 +4640,9 @@ xdr_error: }static int decode_getfattr (struct xdr_stream *xdr,struct nfs_fattr *fattr, -const struct nfs_server *server) +struct nfs4_label *label,const struct nfs_server *server) { -return decode_getfattr_generic (xdr, fattr,NULL ,NULL , server); +return decode_getfattr_generic (xdr, fattr,NULL ,NULL , label, server); }/* @@ -5883,7 +5976,7 @@ static int nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp, status =decode_open_downgrade (xdr, res);if (status !=0 ) goto out; -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -5909,7 +6002,7 @@ static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, struct xdr_stream *xdr, status =decode_access (xdr, &res->supported, &res->access);if (status !=0 ) goto out; -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -5938,7 +6031,7 @@ static int nfs4_xdr_dec_lookup(struct rpc_rqst *rqstp, struct xdr_stream *xdr, status =decode_getfh (xdr, res->fh);if (status) goto out; - status =decode_getfattr (xdr, res->fattr, res->server); + status =decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -5964,7 +6057,8 @@ static int nfs4_xdr_dec_lookup_root(struct rpc_rqst *rqstp, goto out; status =decode_getfh (xdr, res->fh);if (status ==0 ) - status =decode_getfattr (xdr, res->fattr, res->server); + status =decode_getfattr (xdr, res->fattr, + res->label, res->server); out:return status; }@@ -6055,7 +6149,7 @@ static int nfs4_xdr_dec_link(struct rpc_rqst *rqstp, struct xdr_stream *xdr, status =decode_restorefh (xdr);if (status) goto out; -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -6084,7 +6178,7 @@ static int nfs4_xdr_dec_create(struct rpc_rqst *rqstp, struct xdr_stream *xdr, status =decode_getfh (xdr, res->fh);if (status) goto out; -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -6116,7 +6210,7 @@ static int nfs4_xdr_dec_getattr(struct rpc_rqst *rqstp, struct xdr_stream *xdr, status =decode_putfh (xdr);if (status) goto out; - status =decode_getfattr (xdr, res->fattr, res->server); + status =decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -6218,7 +6312,7 @@ static int nfs4_xdr_dec_close(struct rpc_rqst *rqstp, struct xdr_stream *xdr,* an ESTALE error. Shouldn't be a problem, * though, since fattr->valid will remain unset. */ -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -6249,7 +6343,7 @@ static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, struct xdr_stream *xdr, goto out;if (res->access_request)decode_access (xdr, &res->access_supported, &res->access_result); -decode_getfattr (xdr, res->f_attr, res->server); +decode_getfattr (xdr, res->f_attr, res->f_label, res->server); out:return status; }@@ -6299,7 +6393,7 @@ static int nfs4_xdr_dec_open_noattr(struct rpc_rqst *rqstp, goto out;if (res->access_request)decode_access (xdr, &res->access_supported, &res->access_result); -decode_getfattr (xdr, res->f_attr, res->server); +decode_getfattr (xdr, res->f_attr,NULL , res->server); out:return status; }@@ -6326,7 +6420,7 @@ static int nfs4_xdr_dec_setattr(struct rpc_rqst *rqstp, status =decode_setattr (xdr);if (status) goto out; -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -6506,7 +6600,7 @@ static int nfs4_xdr_dec_write(struct rpc_rqst *rqstp, struct xdr_stream *xdr,if (status) goto out;if (res->fattr) -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr,NULL , res->server);if (!status) status = res->count; out:@@ -6687,7 +6781,7 @@ static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp, status =decode_putfh (xdr);if (status !=0 ) goto out; - status =decode_getfattr (xdr, res->fattr, res->server); + status =decode_getfattr (xdr, res->fattr, res->label, res->server);if (status !=0 ) goto out; status =decode_delegreturn (xdr);@@ -6720,7 +6814,7 @@ static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req,xdr_enter_page (xdr,PAGE_SIZE ); status =decode_getfattr_generic (xdr, &res->fs_locations->fattr,NULL , res->fs_locations, - res->fs_locations->server); +NULL , res->fs_locations->server); out:return status; }@@ -7001,7 +7095,7 @@ static int nfs4_xdr_dec_layoutcommit(struct rpc_rqst *rqstp, status =decode_layoutcommit (xdr, rqstp, res);if (status) goto out; -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr,NULL , res->server); out:return status; }@@ -7133,7 +7227,7 @@ int nfs4_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, goto out_overflow;if (decode_getfattr_attrs (xdr, bitmap, entry->fattr, entry->fh, -NULL , entry->server) <0 ) +NULL , entry->label, entry->server) <0 ) goto out_overflow;if (entry->fattr->valid &NFS_ATTR_FATTR_MOUNTED_ON_FILEID ) entry->ino = entry->fattr->mounted_on_fileid;fs/nfs/pnfs.c +1
-1@@ -1922,7 +1922,7 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync) data->args.inode = inode; data->cred =get_rpccred (nfsi->layout->plh_lc_cred);nfs_fattr_init (&data->fattr); - data->args.bitmask =NFS_SERVER (inode)->cache_consistency_bitmask; + data->args.bitmask =nfs4_cache_bitmask (NFS_SERVER (inode),NULL ); data->res.fattr = &data->fattr; data->args.lastbytewritten = end_pos -1 ; data->res.server =NFS_SERVER (inode);fs/nfs/super.c +15
-2@@ -2379,8 +2379,21 @@ static int nfs_bdi_register(struct nfs_server *server)int nfs_set_sb_security (struct super_block *s,struct dentry *mntroot,struct nfs_mount_info *mount_info) { -return security_sb_set_mnt_opts (s, &mount_info->parsed->lsm_opts, -0 ,NULL ); +int error; +unsigned long kflags =0 , kflags_out =0 ; +if (NFS_SB (s)->caps &NFS_CAP_SECURITY_LABEL ) + kflags |=SECURITY_LSM_NATIVE_LABELS ; + + error =security_sb_set_mnt_opts (s, &mount_info->parsed->lsm_opts, + kflags, &kflags_out); +if (error) + goto err; + +if (NFS_SB (s)->caps &NFS_CAP_SECURITY_LABEL && + !(kflags_out &SECURITY_LSM_NATIVE_LABELS )) +NFS_SB (s)->caps &= ~NFS_CAP_SECURITY_LABEL ; +err: +return error; }EXPORT_SYMBOL_GPL (nfs_set_sb_security);include/linux/nfs_fs.h +13
-0@@ -199,6 +199,7 @@ struct nfs_inode {#define NFS_INO_INVALID_ACL 0x0010/* cached acls are invalid */ #define NFS_INO_REVAL_PAGECACHE 0x0020/* must revalidate pagecache */ #define NFS_INO_REVAL_FORCED 0x0040/* force revalidation ignoring a delegation */ +#define NFS_INO_INVALID_LABEL 0x0080/* cached label is invalid */ /* * Bit offsets in flags field @@ -344,6 +345,8 @@ extern int __nfs_revalidate_inode(struct nfs_server *, struct inode *);extern int nfs_revalidate_mapping (struct inode *inode,struct address_space *mapping);extern int nfs_setattr (struct dentry *,struct iattr *);extern void nfs_setattr_update_inode (struct inode *inode,struct iattr *attr); +extern void nfs_setsecurity (struct inode *inode,struct nfs_fattr *fattr, +struct nfs4_label *label);extern struct nfs_open_context *get_nfs_open_context (struct nfs_open_context *ctx);extern void put_nfs_open_context (struct nfs_open_context *ctx);extern struct nfs_open_context *nfs_find_open_context (struct inode *inode,struct rpc_cred *cred,fmode_t mode);@@ -502,9 +505,19 @@ static inline void nfs4_label_free(struct nfs4_label *label) }return ; } +static inline u32 *nfs4_cache_bitmask (struct nfs_server *server,struct nfs4_label *label) +{ +if (label) +return server->cache_consistency_bitmask; + +return server->cache_consistency_bitmask_nl; +}#else static inline struct nfs4_label *nfs4_label_alloc (struct nfs_server *server,gfp_t flags) {return NULL ; }static inline void nfs4_label_free (void *label) {} +static inline u32 * +nfs4_cache_bitmask (struct nfs_server *server,struct nfs4_label *label) +{return server->cache_consistency_bitmask; }#endif /* include/linux/nfs_fs_sb.h +7
-0@@ -145,11 +145,18 @@ struct nfs_server {u32 attr_bitmask[3 ];/* V4 bitmask representing the set of attributes supported on this filesystem */ +u32 attr_bitmask_nl[3 ]; +/* V4 bitmask representing the +set of attributes supported +on this filesystem excluding +the label support bit. */ u32 cache_consistency_bitmask[3 ];/* V4 bitmask representing the subset of change attribute, size, ctime and mtime attributes supported by the server */ +u32 cache_consistency_bitmask_nl[3 ]; +/* As above, excluding label. */ u32 acl_bitmask;/* V4 bitmask representing the ACEs that are supported on this filesystem */ security/selinux/hooks.c +4
-0@@ -2877,7 +2877,10 @@ static void selinux_inode_post_setxattr(struct dentry *dentry, const char *name,return ; } + isec->sclass =inode_mode_to_security_class (inode->i_mode); isec->sid = newsid; + isec->initialized =1 ; +return ; }@@ -2965,6 +2968,7 @@ static int selinux_inode_setsecurity(struct inode *inode, const char *name,if (rc)return rc; + isec->sclass =inode_mode_to_security_class (inode->i_mode); isec->sid = newsid; isec->initialized =1 ;return 0 ;Signature · 6 lines
1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 13/17] NFS: Client implementation of Labeled-NFS
Quoted 4 lines · J. Bruce Fields
James, thanks very much for taking a look at these. I notice this is the one patch that touches security that you didn't respond to (note the 4 lines in hooks.c)--do you see any problem here, or does this look OK too?
Yep, looks fine.
Quoted 1,279 lines
--b.
Quoted 1,270 lines · Steve Dickson
From: David Quigley <[email protected]>
This patch implements the client transport and handling support for labeled NFS. The patch adds two functions to encode and decode the security label recommended attribute which makes use of the LSM hooks added earlier. It also adds code to grab the label from the file attribute structures and encode the label to be sent back to the server.
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]>--- fs/nfs/inode.c | 57 ++++++++- fs/nfs/nfs4proc.c | 318 +++++++++++++++++++++++++++++++++++++++++++--- fs/nfs/nfs4xdr.c | 168 ++++++++++++++++++------ fs/nfs/pnfs.c | 2 +- fs/nfs/super.c | 17 ++- include/linux/nfs_fs.h | 13 ++ include/linux/nfs_fs_sb.h | 7 + security/selinux/hooks.c | 4 + 8 files changed, 524 insertions(+), 62 deletions(-)fs/nfs/inode.c +51
-6@@ -162,11 +162,19 @@ static void nfs_zap_caches_locked(struct inode *inode)memset (NFS_I (inode)->cookieverf,0 ,sizeof (NFS_I (inode)->cookieverf));if (S_ISREG (mode) ||S_ISDIR (mode) ||S_ISLNK (mode)) { - nfsi->cache_validity |=NFS_INO_INVALID_ATTR |NFS_INO_INVALID_DATA |NFS_INO_INVALID_ACCESS |NFS_INO_INVALID_ACL |NFS_INO_REVAL_PAGECACHE ;nfs_fscache_invalidate (inode); - }else { - nfsi->cache_validity |=NFS_INO_INVALID_ATTR |NFS_INO_INVALID_ACCESS |NFS_INO_INVALID_ACL |NFS_INO_REVAL_PAGECACHE ; - } + nfsi->cache_validity |=NFS_INO_INVALID_ATTR + |NFS_INO_INVALID_LABEL + |NFS_INO_INVALID_DATA + |NFS_INO_INVALID_ACCESS + |NFS_INO_INVALID_ACL + |NFS_INO_REVAL_PAGECACHE ; + }else + nfsi->cache_validity |=NFS_INO_INVALID_ATTR + |NFS_INO_INVALID_LABEL + |NFS_INO_INVALID_ACCESS + |NFS_INO_INVALID_ACL + |NFS_INO_REVAL_PAGECACHE ; }void nfs_zap_caches (struct inode *inode)@@ -258,6 +266,24 @@ nfs_init_locked(struct inode *inode, void *opaque) }#ifdef CONFIG_NFS_V4_SECURITY_LABEL +void nfs_setsecurity (struct inode *inode,struct nfs_fattr *fattr, +struct nfs4_label *label) +{ +int error; + +if ((fattr->valid &NFS_ATTR_FATTR_V4_SECURITY_LABEL ) && + label && inode->i_security) { + error =security_inode_notifysecctx (inode, label->label, + label->len); +if (error) +printk (KERN_ERR "%s() %s %d " +"security_inode_notifysecctx() %d\n" , + __func__, + (char *)label->label, + label->len, error); + } +} +struct nfs4_label *nfs4_label_alloc (struct nfs_server *server,gfp_t flags) {struct nfs4_label *label =NULL ;@@ -283,7 +309,13 @@ struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags) return label; }EXPORT_SYMBOL_GPL (nfs4_label_alloc); +#else +void inline nfs_setsecurity (struct inode *inode,struct nfs_fattr *fattr, +struct nfs4_label *label) +{ +}#endif +EXPORT_SYMBOL_GPL (nfs_setsecurity);/* * This is our front-end to iget that looks up inodes by file handle @@ -412,6 +444,9 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st*/ inode->i_blocks =nfs_calc_block_size (fattr->du.nfs3.used); } + +nfs_setsecurity (inode, fattr, label); + nfsi->attrtimeo =NFS_MINATTRTIMEO (inode); nfsi->attrtimeo_timestamp = now; nfsi->access_cache =RB_ROOT ;@@ -771,6 +806,7 @@ struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cspin_unlock (&inode->i_lock);return ctx; } +EXPORT_SYMBOL_GPL (nfs_find_open_context);static void nfs_file_clear_open_context (struct file *filp) {@@ -899,7 +935,8 @@ static int nfs_attribute_cache_expired(struct inode *inode)*/ int nfs_revalidate_inode (struct nfs_server *server,struct inode *inode) { -if (!(NFS_I (inode)->cache_validity &NFS_INO_INVALID_ATTR ) +if (!(NFS_I (inode)->cache_validity & + (NFS_INO_INVALID_ATTR |NFS_INO_INVALID_LABEL )) && !nfs_attribute_cache_expired (inode))return NFS_STALE (inode) ? -ESTALE :0 ;return __nfs_revalidate_inode (server, inode);@@ -1240,6 +1277,9 @@ int nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr, struct nfs4_ status =nfs_refresh_inode_locked (inode, fattr, label);spin_unlock (&inode->i_lock); +if (label && !status) +nfs_setsecurity (inode, fattr, label); +return status; }EXPORT_SYMBOL_GPL (nfs_refresh_inode);@@ -1279,6 +1319,10 @@ int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr, strucspin_lock (&inode->i_lock); status =nfs_post_op_update_inode_locked (inode, fattr, label);spin_unlock (&inode->i_lock); +if (nfs_server_capable (inode,NFS_CAP_SECURITY_LABEL )) { +if (label && !status) +nfs_setsecurity (inode, fattr, label); + }return status; }EXPORT_SYMBOL_GPL (nfs_post_op_update_inode);@@ -1519,7 +1563,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, struct inode->i_blocks = fattr->du.nfs2.blocks;/* Update attrtimeo value if we're out of the unstable period */ -if (invalid &NFS_INO_INVALID_ATTR ) { +if (invalid & (NFS_INO_INVALID_ATTR |NFS_INO_INVALID_LABEL )) {nfs_inc_stats (inode,NFSIOS_ATTRINVALIDATE ); nfsi->attrtimeo =NFS_MINATTRTIMEO (inode); nfsi->attrtimeo_timestamp = now;@@ -1532,6 +1576,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, struct } } invalid &= ~NFS_INO_INVALID_ATTR ; + invalid &= ~NFS_INO_INVALID_LABEL ;/* Don't invalidate the data if we were to blame */ if (!(S_ISREG (inode->i_mode) ||S_ISDIR (inode->i_mode) ||S_ISLNK (inode->i_mode)))fs/nfs/nfs4proc.c +302
-16@@ -87,6 +87,52 @@ static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,static int nfs41_test_stateid (struct nfs_server *,nfs4_stateid *);static int nfs41_free_stateid (struct nfs_server *,nfs4_stateid *);#endif + +#ifdef CONFIG_NFS_V4_SECURITY_LABEL +static inline struct nfs4_label * +nfs4_label_init_security (struct inode *dir,struct dentry *dentry, +struct iattr *sattr,struct nfs4_label *l) +{ +int err; +int minor_version =NFS_SERVER (dir)->nfs_client->cl_minorversion; + +if (minor_version <2 ) +return NULL ; + +if (nfs_server_capable (dir,NFS_CAP_SECURITY_LABEL )) { + err =security_dentry_init_security (dentry, sattr->ia_mode, + &dentry->d_name, (void **)&l->label, &l->len); +if (err ==0 ) +return l; + } +return NULL ; +} +static inline void +nfs4_label_release_security (struct nfs4_label *label) +{ +if (label) +security_release_secctx (label->label, label->len); +} +static inline u32 *nfs4_bitmask (struct nfs_server *server,struct nfs4_label *label) +{ +if (label) +return server->attr_bitmask; + +return server->attr_bitmask_nl; +} +#else +static inline struct nfs4_label * +nfs4_label_init_security (struct inode *dir,struct dentry *dentry, +struct iattr *sattr,struct nfs4_label *l) +{return NULL ; } +static inline void +nfs4_label_release_security (struct nfs4_label *label) +{return ; } +static inline u32 * +nfs4_bitmask (struct nfs_server *server,struct nfs4_label *label) +{return server->attr_bitmask; } +#endif +/* Prevent leaks of NFSv4 errors into userland */ static int nfs4_map_errors (int err) {@@ -133,7 +179,10 @@ const u32 nfs4_fattr_bitmap[3] = { | FATTR4_WORD1_SPACE_USED | FATTR4_WORD1_TIME_ACCESS | FATTR4_WORD1_TIME_METADATA - | FATTR4_WORD1_TIME_MODIFY + | FATTR4_WORD1_TIME_MODIFY, +#ifdef CONFIG_NFS_V4_SECURITY_LABEL + FATTR4_WORD2_SECURITY_LABEL +#endif };static const u32 nfs4_pnfs_open_bitmap[3 ] = {@@ -817,7 +866,7 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry, p->o_arg.id.uniquifier = sp->so_seqid.owner_id; p->o_arg.name = &dentry->d_name; p->o_arg.server = server; - p->o_arg.bitmask = server->attr_bitmask; + p->o_arg.bitmask =nfs4_bitmask (server, label); p->o_arg.open_bitmap = &nfs4_fattr_bitmap[0 ]; p->o_arg.claim =NFS4_OPEN_CLAIM_NULL ; p->o_arg.label = label;@@ -1973,6 +2022,7 @@ static int _nfs4_do_open(struct inode *dir,if (status ==0 ) {nfs_setattr_update_inode (state->inode, sattr);nfs_post_op_update_inode (state->inode, opendata->o_res.f_attr, olabel); +nfs_setsecurity (state->inode, opendata->o_res.f_attr, olabel); } }@@ -2086,6 +2136,10 @@ static int _nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,unsigned long timestamp = jiffies;int status; + arg.bitmask =nfs4_bitmask (server, ilabel); +if (ilabel) + arg.bitmask =nfs4_bitmask (server, olabel); +nfs_fattr_init (fattr);if (state !=NULL ) {@@ -2315,7 +2369,7 @@ int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait)if (calldata->arg.seqid ==NULL ) goto out_free_calldata; calldata->arg.fmode =0 ; - calldata->arg.bitmask = server->cache_consistency_bitmask; + calldata->arg.bitmask = server->cache_consistency_bitmask_nl; calldata->res.fattr = &calldata->fattr; calldata->res.seqid = calldata->arg.seqid; calldata->res.server = server;@@ -2345,11 +2399,16 @@ static struct inode * nfs4_atomic_open(struct inode *dir, struct nfs_open_context *ctx, int open_flags, struct iattr *attr) { struct nfs4_state *state; -struct nfs4_label *label =NULL ; +struct nfs4_label l = {0 ,0 ,0 ,NULL }, *label =NULL ; + + label =nfs4_label_init_security (dir, ctx->dentry, attr, &l);/* Protect against concurrent sillydeletes */ state =nfs4_do_open (dir, ctx->dentry, ctx->mode, open_flags, attr, label, ctx->cred, &ctx->mdsthreshold); + +nfs4_label_release_security (label); +if (IS_ERR (state))return ERR_CAST (state); ctx->state = state;@@ -2409,10 +2468,26 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f server->caps |=NFS_CAP_CTIME ;if (res.attr_bitmask[1 ] &FATTR4_WORD1_TIME_MODIFY ) server->caps |=NFS_CAP_MTIME ; +#ifdef CONFIG_NFS_V4_SECURITY_LABEL +if (res.attr_bitmask[2 ] &FATTR4_WORD2_SECURITY_LABEL ) + server->caps |=NFS_CAP_SECURITY_LABEL ; +#endif +memcpy (server->attr_bitmask_nl, res.attr_bitmask, +sizeof (server->attr_bitmask)); + +if (server->caps &NFS_CAP_SECURITY_LABEL ) + server->attr_bitmask_nl[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ;memcpy (server->cache_consistency_bitmask, res.attr_bitmask,sizeof (server->cache_consistency_bitmask)); server->cache_consistency_bitmask[0 ] &=FATTR4_WORD0_CHANGE |FATTR4_WORD0_SIZE ; - server->cache_consistency_bitmask[1 ] &=FATTR4_WORD1_TIME_METADATA |FATTR4_WORD1_TIME_MODIFY ; + server->cache_consistency_bitmask[1 ] &=FATTR4_WORD1_TIME_METADATA | +FATTR4_WORD1_TIME_MODIFY ; +#ifdef CONFIG_NFS_V4_SECURITY_LABEL + server->cache_consistency_bitmask[2 ] &=FATTR4_WORD2_SECURITY_LABEL ; +#endif +memcpy (server->cache_consistency_bitmask_nl, server->cache_consistency_bitmask, +sizeof (server->cache_consistency_bitmask_nl)); + server->cache_consistency_bitmask_nl[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ; server->acl_bitmask = res.acl_bitmask; server->fh_expire_type = res.fh_expire_type; }@@ -2435,8 +2510,9 @@ int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)static int _nfs4_lookup_root (struct nfs_server *server,struct nfs_fh *fhandle,struct nfs_fsinfo *info) { +u32 bitmask[3 ];struct nfs4_lookup_root_arg args = { - .bitmask = nfs4_fattr_bitmap, + .bitmask = bitmask, };struct nfs4_lookup_res res = { .server = server,@@ -2449,6 +2525,13 @@ static int _nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, .rpc_resp = &res, }; + bitmask[0 ] = nfs4_fattr_bitmap[0 ]; + bitmask[1 ] = nfs4_fattr_bitmap[1 ]; +/* +* Process the label in the upcoming getfattr +*/ + bitmask[2 ] = nfs4_fattr_bitmap[2 ] & ~FATTR4_WORD2_SECURITY_LABEL ; +nfs_fattr_init (info->fattr);return nfs4_call_sync (server->client, server, &msg, &args.seq_args, &res.seq_res,0 ); }@@ -2635,7 +2718,9 @@ static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, .rpc_argp = &args, .rpc_resp = &res, }; - + + args.bitmask =nfs4_bitmask (server, label); +nfs_fattr_init (fattr);return nfs4_call_sync (server->client, server, &msg, &args.seq_args, &res.seq_res,0 ); }@@ -2730,6 +2815,7 @@ static int _nfs4_proc_lookup(struct rpc_clnt *clnt, struct inode *dir,struct nfs4_lookup_res res = { .server = server, .fattr = fattr, + .label = label, .fh = fhandle, };struct rpc_message msg = {@@ -2738,6 +2824,8 @@ static int _nfs4_proc_lookup(struct rpc_clnt *clnt, struct inode *dir, .rpc_resp = &res, }; + args.bitmask =nfs4_bitmask (server, label); +nfs_fattr_init (fattr);dprintk ("NFS call lookup %s\n" , name->name);@@ -2844,7 +2932,7 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry .rpc_cred = entry->cred, };int mode = entry->mask; -int status; +int status =0 ;/* * Determine which access bits we want to ask for... @@ -2873,6 +2961,8 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry goto out; } + args.bitmask =nfs4_cache_bitmask (server, res.label); + status =nfs4_call_sync (server->client, server, &msg, &args.seq_args, &res.seq_res,0 );if (!status) {nfs_access_set_mask (entry, res.access);@@ -2959,7 +3049,7 @@ static int nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, int flags) { - struct nfs4_label *ilabel = NULL; + struct nfs4_label l, *ilabel = NULL;struct nfs_open_context *ctx;struct nfs4_state *state;int status =0 ;@@ -2968,6 +3058,8 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,if (IS_ERR (ctx))return PTR_ERR (ctx); + ilabel =nfs4_label_init_security (dir, dentry, sattr, &l); + sattr->ia_mode &= ~current_umask (); state = nfs4_do_open(dir, dentry, ctx->mode, flags, sattr, ilabel, ctx->cred,@@ -2981,6 +3073,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,nfs_set_verifier (dentry,nfs_save_change_attribute (dir)); ctx->state = state; out: +nfs4_label_release_security (ilabel);put_nfs_open_context (ctx);return status; }@@ -3029,6 +3122,8 @@ static void nfs4_proc_unlink_setup(struct rpc_message *msg, struct inode *dir) res->server = server; msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_REMOVE ];nfs41_init_sequence (&args->seq_args, &res->seq_res,1 ); + +nfs_fattr_init (res->dir_attr); }static void nfs4_proc_unlink_rpc_prepare (struct rpc_task *task,struct nfs_unlinkdata *data)@@ -3179,6 +3274,7 @@ static int _nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr * status =PTR_ERR (res.label); goto out; } + arg.bitmask =nfs4_bitmask (server, res.label); status =nfs4_call_sync (server->client, server, &msg, &arg.seq_args, &res.seq_res,1 );if (!status) {@@ -3236,7 +3332,7 @@ static struct nfs4_createdata *nfs4_alloc_createdata(struct inode *dir, data->arg.name = name; data->arg.attrs = sattr; data->arg.ftype = ftype; - data->arg.bitmask = server->attr_bitmask; + data->arg.bitmask =nfs4_bitmask (server, data->label); data->res.server = server; data->res.fh = &data->fh; data->res.fattr = &data->fattr;@@ -3297,14 +3393,19 @@ static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry, struct page *page, unsigned int len, struct iattr *sattr) { struct nfs4_exception exception = { }; -struct nfs4_label *label =NULL ; +struct nfs4_label l, *label =NULL ;int err; + + label =nfs4_label_init_security (dir, dentry, sattr, &l); +do { err =nfs4_handle_exception (NFS_SERVER (dir),_nfs4_proc_symlink (dir, dentry, page, len, sattr, label), &exception); }while (exception.retry); + +nfs4_label_release_security (label);return err; }@@ -3330,15 +3431,19 @@ static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) {struct nfs4_exception exception = { }; -struct nfs4_label *label =NULL ; +struct nfs4_label l, *label =NULL ;int err; + label =nfs4_label_init_security (dir, dentry, sattr, &l); + sattr->ia_mode &= ~current_umask ();do { err =nfs4_handle_exception (NFS_SERVER (dir),_nfs4_proc_mkdir (dir, dentry, sattr, label), &exception); }while (exception.retry); +nfs4_label_release_security (label); +return err; }@@ -3354,7 +3459,9 @@ static int _nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, .bitmask = NFS_SERVER(dentry->d_inode)->attr_bitmask, .plus = plus, }; -struct nfs4_readdir_res res; +struct nfs4_readdir_res res = { + .pgbase =0 , + };struct rpc_message msg = { .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READDIR ], .rpc_argp = &args,@@ -3434,15 +3541,20 @@ static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr, dev_t rdev) {struct nfs4_exception exception = { }; -struct nfs4_label *label =NULL ; +struct nfs4_label l, *label =NULL ;int err; + label =nfs4_label_init_security (dir, dentry, sattr, &l); + sattr->ia_mode &= ~current_umask ();do { err =nfs4_handle_exception (NFS_SERVER (dir),_nfs4_proc_mknod (dir, dentry, sattr, label, rdev), &exception); }while (exception.retry); + +nfs4_label_release_security (label); +return err; }@@ -3658,7 +3770,8 @@ static void nfs4_proc_write_setup(struct nfs_write_data *data, struct rpc_messag data->args.bitmask =NULL ; data->res.fattr =NULL ; }else - data->args.bitmask = server->cache_consistency_bitmask; + + data->args.bitmask =nfs4_cache_bitmask (server,NULL );if (!data->write_done_cb) data->write_done_cb = nfs4_write_done_cb;@@ -4083,6 +4196,179 @@ static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflenreturn err; } +#ifdef CONFIG_NFS_V4_SECURITY_LABEL +static int _nfs4_get_security_label (struct inode *inode,void *buf, +size_t buflen) +{ +struct nfs_server *server =NFS_SERVER (inode); +struct nfs_fattr fattr; +struct nfs4_label label = {0 ,0 , buflen, buf}; + +u32 bitmask[3 ] = {0 ,0 ,FATTR4_WORD2_SECURITY_LABEL }; +struct nfs4_getattr_arg args = { + .fh =NFS_FH (inode), + .bitmask = bitmask, + }; +struct nfs4_getattr_res res = { + .fattr = &fattr, + .label = &label, + .server = server, + }; +struct rpc_message msg = { + .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_GETATTR ], + .rpc_argp = &args, + .rpc_resp = &res, + }; +int ret; + +nfs_fattr_init (&fattr); + + ret =rpc_call_sync (server->client, &msg,0 ); +if (ret) +return ret; +if (!(fattr.valid &NFS_ATTR_FATTR_V4_SECURITY_LABEL )) +return -ENOENT ; +if (buflen < label.len) +return -ERANGE ; +return 0 ; +} + +static int nfs4_get_security_label (struct inode *inode,void *buf, +size_t buflen) +{ +struct nfs4_exception exception = { }; +int err; + +if (!nfs_server_capable (inode,NFS_CAP_SECURITY_LABEL )) +return -EOPNOTSUPP ; + +do { + err =nfs4_handle_exception (NFS_SERVER (inode), +_nfs4_get_security_label (inode, buf, buflen), + &exception); + }while (exception.retry); +return err; +} + +static int _nfs4_do_set_security_label (struct inode *inode, +struct nfs4_label *ilabel, +struct nfs_fattr *fattr, +struct nfs4_label *olabel, +struct nfs4_state *state) +{ + +struct iattr sattr = {0 }; +struct nfs_server *server =NFS_SERVER (inode); +const u32 bitmask[3 ] = {0 ,0 ,FATTR4_WORD2_SECURITY_LABEL }; +struct nfs_setattrargs args = { + .fh =NFS_FH (inode), + .iap = &sattr, + .server = server, + .bitmask = bitmask, + .label = ilabel, + }; +struct nfs_setattrres res = { + .fattr = fattr, + .label = olabel, + .server = server, + }; +struct rpc_message msg = { + .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETATTR ], + .rpc_argp = &args, + .rpc_resp = &res, + }; +unsigned long timestamp = jiffies; +int status; + +if (state !=NULL ) { +struct nfs_lockowner lockowner = { + .l_owner = current->files, + .l_pid = current->tgid, + }; + + msg.rpc_cred = state->owner->so_cred; +nfs4_select_rw_stateid (&args.stateid, state,FMODE_WRITE , + &lockowner); + }else if (nfs4_copy_delegation_stateid (&args.stateid, inode, +FMODE_WRITE )) { +/* Use that stateid */ + }else +nfs4_stateid_copy (&args.stateid, &zero_stateid); + + status =rpc_call_sync (server->client, &msg,0 ); +if (status ==0 && state !=NULL ) +renew_lease (server, timestamp); +return status; +} + +static int nfs4_do_set_security_label (struct inode *inode, +struct nfs4_label *ilabel, +struct nfs_fattr *fattr, +struct nfs4_label *olabel, +struct nfs4_state *state) +{ +struct nfs4_exception exception = { }; +int err; + +do { + err =nfs4_handle_exception (NFS_SERVER (inode), +_nfs4_do_set_security_label (inode, ilabel, + fattr, olabel, state), + &exception); + }while (exception.retry); +return err; +} + +static int +nfs4_set_security_label (struct dentry *dentry,const void *buf,size_t buflen) +{ +struct nfs4_label ilabel, *olabel =NULL ; +struct nfs_fattr fattr; +struct rpc_cred *cred; +struct nfs_open_context *ctx; +struct nfs4_state *state =NULL ; +struct inode *inode = dentry->d_inode; +int status; + +if (!nfs_server_capable (inode,NFS_CAP_SECURITY_LABEL )) +return -EOPNOTSUPP ; + +nfs_fattr_init (&fattr); + + ilabel.pi =0 ; + ilabel.lfs =0 ; + ilabel.label = (char *)buf; + ilabel.len = buflen; + + cred =rpc_lookup_cred (); +if (IS_ERR (cred)) +return PTR_ERR (cred); + + olabel =nfs4_label_alloc (NFS_SERVER (inode),GFP_KERNEL ); +if (IS_ERR (olabel)) { + status = -PTR_ERR (olabel); + goto out; + } + +/* Search for an existing open(O_WRITE) file */ + ctx =nfs_find_open_context (inode, cred,FMODE_WRITE ); +if (ctx !=NULL ) + state = ctx->state; + + status =nfs4_do_set_security_label (inode, &ilabel, &fattr, olabel, + state); +if (status ==0 ) +nfs_setsecurity (inode, &fattr, olabel); +if (ctx !=NULL ) +put_nfs_open_context (ctx); +nfs4_label_free (olabel); +out: +put_rpccred (cred); +return status; +} +#endif /* CONFIG_NFS_V4_SECURITY_LABEL */ + +static int nfs4_async_handle_error (struct rpc_task *task,const struct nfs_server *server,struct nfs4_state *state) {@@ -4371,7 +4657,7 @@ static int _nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, confs41_init_sequence (&data->args.seq_args, &data->res.seq_res,1 ); data->args.fhandle = &data->fh; data->args.stateid = &data->stateid; - data->args.bitmask = server->cache_consistency_bitmask; + data->args.bitmask = server->cache_consistency_bitmask_nl;nfs_copy_fh (&data->fh,NFS_FH (inode));nfs4_stateid_copy (&data->stateid, stateid); data->res.fattr = &data->fattr;fs/nfs/nfs4xdr.c +131
-37@@ -102,12 +102,23 @@ static int nfs4_stat_to_errno(int);#define nfs4_path_maxsz (1 + ((3 + NFS4_MAXPATHLEN) >> 2))#define nfs4_owner_maxsz (1 + XDR_QUADLEN(IDMAP_NAMESZ))#define nfs4_group_maxsz (1 + XDR_QUADLEN(IDMAP_NAMESZ)) +#ifdef CONFIG_NFS_V4_SECURITY_LABEL +/* PI(4 bytes) + LFS(4 bytes) + 1(for null terminator?) + MAXLABELLEN */ +#define nfs4_label_maxsz (4 + 4 + 1 + XDR_QUADLEN(NFS4_MAXLABELLEN)) +#define encode_readdir_space 24 +#define encode_readdir_bitmask_sz 3 +#else +#define nfs4_label_maxsz 0 +#define encode_readdir_space 20 +#define encode_readdir_bitmask_sz 2 +#endif /* We support only one layout type per file system */ #define decode_mdsthreshold_maxsz (1 + 1 + nfs4_fattr_bitmap_maxsz + 1 + 8)/* This is based on getfattr, which uses the most attributes: */ #define nfs4_fattr_value_maxsz (1 + (1 + 2 + 2 + 4 + 2 + 1 + 1 + 2 + 2 + \ 3 + 3 + 3 + nfs4_owner_maxsz + \ - nfs4_group_maxsz + decode_mdsthreshold_maxsz)) + nfs4_group_maxsz + nfs4_label_maxsz + \ + decode_mdsthreshold_maxsz))#define nfs4_fattr_maxsz (nfs4_fattr_bitmap_maxsz + \ nfs4_fattr_value_maxsz)#define decode_getattr_maxsz (op_decode_hdr_maxsz + nfs4_fattr_maxsz)@@ -115,6 +126,7 @@ static int nfs4_stat_to_errno(int); 1 + 2 + 1 + \ nfs4_owner_maxsz + \ nfs4_group_maxsz + \ + nfs4_label_maxsz + \ 4 + 4)#define encode_savefh_maxsz (op_encode_hdr_maxsz)#define decode_savefh_maxsz (op_decode_hdr_maxsz)@@ -192,9 +204,11 @@ static int nfs4_stat_to_errno(int); encode_stateid_maxsz + 3)#define decode_read_maxsz (op_decode_hdr_maxsz + 2)#define encode_readdir_maxsz (op_encode_hdr_maxsz + \ - 2 + encode_verifier_maxsz + 5) + 2 + encode_verifier_maxsz + 5 + \ + nfs4_label_maxsz)#define decode_readdir_maxsz (op_decode_hdr_maxsz + \ - decode_verifier_maxsz) + decode_verifier_maxsz + \ + nfs4_label_maxsz + nfs4_fattr_maxsz)#define encode_readlink_maxsz (op_encode_hdr_maxsz)#define decode_readlink_maxsz (op_decode_hdr_maxsz + 1)#define encode_write_maxsz (op_encode_hdr_maxsz + \@@ -972,7 +986,9 @@ static void encode_nfs4_verifier(struct xdr_stream *xdr, const nfs4_verifier *veencode_opaque_fixed (xdr, verf->data,NFS4_VERIFIER_SIZE ); } -static void encode_attrs (struct xdr_stream *xdr,const struct iattr *iap,const struct nfs_server *server) +static void encode_attrs (struct xdr_stream *xdr,const struct iattr *iap, +const struct nfs4_label *label, +const struct nfs_server *server) {char owner_name[IDMAP_NAMESZ ];char owner_group[IDMAP_NAMESZ ];@@ -1022,6 +1038,8 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const } len +=4 + (XDR_QUADLEN (owner_grouplen) <<2 ); } +if (label) + len +=4 +4 +4 + (XDR_QUADLEN (label->len) <<2 );if (iap->ia_valid &ATTR_ATIME_SET ) len +=16 ;else if (iap->ia_valid &ATTR_ATIME )@@ -1078,6 +1096,13 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const bmval1 |=FATTR4_WORD1_TIME_MODIFY_SET ; *p++ =cpu_to_be32 (NFS4_SET_TO_SERVER_TIME ); } +if (label) { + bmval2 |=FATTR4_WORD2_SECURITY_LABEL ; + *p++ =cpu_to_be32 (label->lfs); + *p++ =cpu_to_be32 (label->pi); + *p++ =cpu_to_be32 (label->len); + p =xdr_encode_opaque_fixed (p, label->label, label->len); + }/* * Now we backfill the bitmap and the attribute buffer length. @@ -1144,7 +1169,7 @@ static void encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg * }encode_string (xdr, create->name->len, create->name->name); -encode_attrs (xdr, create->attrs, create->server); +encode_attrs (xdr, create->attrs, create->label, create->server); }static void encode_getattr_one (struct xdr_stream *xdr,uint32_t bitmap,struct compound_hdr *hdr)@@ -1377,21 +1402,23 @@ static inline void encode_createmode(struct xdr_stream *xdr, const struct nfs_opswitch (arg->open_flags &O_EXCL ) {case 0 : *p =cpu_to_be32 (NFS4_CREATE_UNCHECKED ); -encode_attrs (xdr, arg->u.attrs, arg->server); +encode_attrs (xdr, arg->u.attrs, arg->label, arg->server);break ;default : clp = arg->server->nfs_client;if (clp->cl_mvops->minor_version >0 ) {if (nfs4_has_persistent_session (clp)) { *p =cpu_to_be32 (NFS4_CREATE_GUARDED ); -encode_attrs (xdr, arg->u.attrs, arg->server); +encode_attrs (xdr, arg->u.attrs, arg->label, + arg->server); }else {struct iattr dummy; *p =cpu_to_be32 (NFS4_CREATE_EXCLUSIVE4_1 );encode_nfs4_verifier (xdr, &arg->u.verifier); dummy.ia_valid =0 ; -encode_attrs (xdr, &dummy, arg->server); +encode_attrs (xdr, &dummy, arg->label, + arg->server); } }else { *p =cpu_to_be32 (NFS4_CREATE_EXCLUSIVE );@@ -1547,7 +1574,7 @@ static void encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args,static void encode_readdir (struct xdr_stream *xdr,const struct nfs4_readdir_arg *readdir,struct rpc_rqst *req,struct compound_hdr *hdr) { -uint32_t attrs[2 ] = { +uint32_t attrs[3 ] = {FATTR4_WORD0_RDATTR_ERROR ,FATTR4_WORD1_MOUNTED_ON_FILEID , };@@ -1570,20 +1597,26 @@ static void encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_argencode_op_hdr (xdr,OP_READDIR , decode_readdir_maxsz, hdr);encode_uint64 (xdr, readdir->cookie);encode_nfs4_verifier (xdr, &readdir->verifier); - p =reserve_space (xdr,20 ); + p =reserve_space (xdr, encode_readdir_space); *p++ =cpu_to_be32 (dircount); *p++ =cpu_to_be32 (readdir->count); - *p++ =cpu_to_be32 (2 ); - + *p++ =cpu_to_be32 (encode_readdir_bitmask_sz); *p++ =cpu_to_be32 (attrs[0 ] & readdir->bitmask[0 ]); - *p =cpu_to_be32 (attrs[1 ] & readdir->bitmask[1 ]); + *p =cpu_to_be32 (attrs[1 ] & readdir->bitmask[1 ]); +if (encode_readdir_bitmask_sz >2 ) { +if (hdr->minorversion >1 ) + attrs[2 ] |=FATTR4_WORD2_SECURITY_LABEL ; + p++, *p++ =cpu_to_be32 (attrs[2 ] & readdir->bitmask[2 ]); + }memcpy (verf, readdir->verifier.data,sizeof (verf)); -dprintk ("%s: cookie = %Lu, verifier = %08x:%08x, bitmap = %08x:%08x\n" , + +dprintk ("%s: cookie = %llu, verifier = %08x:%08x, bitmap = %08x:%08x:%08x\n" , __func__, (unsigned long long )readdir->cookie, verf[0 ], verf[1 ], attrs[0 ] & readdir->bitmask[0 ], - attrs[1 ] & readdir->bitmask[1 ]); + attrs[1 ] & readdir->bitmask[1 ], + attrs[2 ] & readdir->bitmask[2 ]); }static void encode_readlink (struct xdr_stream *xdr,const struct nfs4_readlink *readlink,struct rpc_rqst *req,struct compound_hdr *hdr)@@ -1642,7 +1675,7 @@ static void encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs {encode_op_hdr (xdr,OP_SETATTR , decode_setattr_maxsz, hdr);encode_nfs4_stateid (xdr, &arg->stateid); -encode_attrs (xdr, arg->iap, server); +encode_attrs (xdr, arg->iap, arg->label, server); }static void encode_setclientid (struct xdr_stream *xdr,const struct nfs4_setclientid *setclientid,struct compound_hdr *hdr)@@ -4060,6 +4093,60 @@ static int decode_attr_time_delta(struct xdr_stream *xdr, uint32_t *bitmap,return status; } +static int decode_attr_security_label (struct xdr_stream *xdr,uint32_t *bitmap, +struct nfs4_label *label) +{ +uint32_t pi =0 ; +uint32_t lfs =0 ; +__u32 len; +__be32 *p; +int status =0 ; + +if (unlikely (bitmap[2 ] & (FATTR4_WORD2_SECURITY_LABEL -1U ))) +return -EIO ; +if (likely (bitmap[2 ] &FATTR4_WORD2_SECURITY_LABEL )) { + p =xdr_inline_decode (xdr,4 ); +if (unlikely (!p)) + goto out_overflow; + lfs =be32_to_cpup (p++); + p =xdr_inline_decode (xdr,4 ); +if (unlikely (!p)) + goto out_overflow; + pi =be32_to_cpup (p++); + p =xdr_inline_decode (xdr,4 ); +if (unlikely (!p)) + goto out_overflow; + len =be32_to_cpup (p++); + p =xdr_inline_decode (xdr, len); +if (unlikely (!p)) + goto out_overflow; +if (len <NFS4_MAXLABELLEN ) { +if (label) { +memcpy (label->label, p, len); + label->len = len; + label->pi = pi; + label->lfs = lfs; + status =NFS_ATTR_FATTR_V4_SECURITY_LABEL ; + }else { +printk ("%s(): NULL label.\n" , __func__); +dump_stack (); + goto out_overflow; + } + bitmap[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ; + }else +printk (KERN_WARNING "%s: label too long (%u)!\n" , + __func__, len); + } +if (label && label->label) +dprintk ("%s: label=%s, len=%d, PI=%d, LFS=%d\n" , __func__, + (char *)label->label, label->len, label->pi, label->lfs); +return status; + +out_overflow: +print_overflow_msg (__func__, xdr); +return -EIO ; +} +static int decode_attr_time_modify (struct xdr_stream *xdr,uint32_t *bitmap,struct timespec *time) {int status =0 ;@@ -4402,7 +4489,7 @@ out_overflow:static int decode_getfattr_attrs (struct xdr_stream *xdr,uint32_t *bitmap,struct nfs_fattr *fattr,struct nfs_fh *fh, -struct nfs4_fs_locations *fs_loc, +struct nfs4_fs_locations *fs_loc,struct nfs4_label *label,const struct nfs_server *server) {int status;@@ -4510,6 +4597,11 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap,if (status <0 ) goto xdr_error; + status =decode_attr_security_label (xdr, bitmap, label); +if (status <0 ) + goto xdr_error; + fattr->valid |= status; + xdr_error:dprintk ("%s: xdr returned %d\n" , __func__, -status);return status;@@ -4517,7 +4609,7 @@ xdr_error:static int decode_getfattr_generic (struct xdr_stream *xdr,struct nfs_fattr *fattr,struct nfs_fh *fh,struct nfs4_fs_locations *fs_loc, -const struct nfs_server *server) +struct nfs4_label *label,const struct nfs_server *server) {unsigned int savep; uint32_t attrlen,@@ -4536,7 +4628,8 @@ static int decode_getfattr_generic(struct xdr_stream *xdr, struct nfs_fattr *fatif (status <0 ) goto xdr_error; - status =decode_getfattr_attrs (xdr, bitmap, fattr, fh, fs_loc, server); + status =decode_getfattr_attrs (xdr, bitmap, fattr, fh, fs_loc, + label, server);if (status <0 ) goto xdr_error;@@ -4547,9 +4640,9 @@ xdr_error: }static int decode_getfattr (struct xdr_stream *xdr,struct nfs_fattr *fattr, -const struct nfs_server *server) +struct nfs4_label *label,const struct nfs_server *server) { -return decode_getfattr_generic (xdr, fattr,NULL ,NULL , server); +return decode_getfattr_generic (xdr, fattr,NULL ,NULL , label, server); }/* @@ -5883,7 +5976,7 @@ static int nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp, status =decode_open_downgrade (xdr, res);if (status !=0 ) goto out; -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -5909,7 +6002,7 @@ static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, struct xdr_stream *xdr, status =decode_access (xdr, &res->supported, &res->access);if (status !=0 ) goto out; -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -5938,7 +6031,7 @@ static int nfs4_xdr_dec_lookup(struct rpc_rqst *rqstp, struct xdr_stream *xdr, status =decode_getfh (xdr, res->fh);if (status) goto out; - status =decode_getfattr (xdr, res->fattr, res->server); + status =decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -5964,7 +6057,8 @@ static int nfs4_xdr_dec_lookup_root(struct rpc_rqst *rqstp, goto out; status =decode_getfh (xdr, res->fh);if (status ==0 ) - status =decode_getfattr (xdr, res->fattr, res->server); + status =decode_getfattr (xdr, res->fattr, + res->label, res->server); out:return status; }@@ -6055,7 +6149,7 @@ static int nfs4_xdr_dec_link(struct rpc_rqst *rqstp, struct xdr_stream *xdr, status =decode_restorefh (xdr);if (status) goto out; -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -6084,7 +6178,7 @@ static int nfs4_xdr_dec_create(struct rpc_rqst *rqstp, struct xdr_stream *xdr, status =decode_getfh (xdr, res->fh);if (status) goto out; -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -6116,7 +6210,7 @@ static int nfs4_xdr_dec_getattr(struct rpc_rqst *rqstp, struct xdr_stream *xdr, status =decode_putfh (xdr);if (status) goto out; - status =decode_getfattr (xdr, res->fattr, res->server); + status =decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -6218,7 +6312,7 @@ static int nfs4_xdr_dec_close(struct rpc_rqst *rqstp, struct xdr_stream *xdr,* an ESTALE error. Shouldn't be a problem, * though, since fattr->valid will remain unset. */ -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -6249,7 +6343,7 @@ static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, struct xdr_stream *xdr, goto out;if (res->access_request)decode_access (xdr, &res->access_supported, &res->access_result); -decode_getfattr (xdr, res->f_attr, res->server); +decode_getfattr (xdr, res->f_attr, res->f_label, res->server); out:return status; }@@ -6299,7 +6393,7 @@ static int nfs4_xdr_dec_open_noattr(struct rpc_rqst *rqstp, goto out;if (res->access_request)decode_access (xdr, &res->access_supported, &res->access_result); -decode_getfattr (xdr, res->f_attr, res->server); +decode_getfattr (xdr, res->f_attr,NULL , res->server); out:return status; }@@ -6326,7 +6420,7 @@ static int nfs4_xdr_dec_setattr(struct rpc_rqst *rqstp, status =decode_setattr (xdr);if (status) goto out; -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr, res->label, res->server); out:return status; }@@ -6506,7 +6600,7 @@ static int nfs4_xdr_dec_write(struct rpc_rqst *rqstp, struct xdr_stream *xdr,if (status) goto out;if (res->fattr) -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr,NULL , res->server);if (!status) status = res->count; out:@@ -6687,7 +6781,7 @@ static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp, status =decode_putfh (xdr);if (status !=0 ) goto out; - status =decode_getfattr (xdr, res->fattr, res->server); + status =decode_getfattr (xdr, res->fattr, res->label, res->server);if (status !=0 ) goto out; status =decode_delegreturn (xdr);@@ -6720,7 +6814,7 @@ static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req,xdr_enter_page (xdr,PAGE_SIZE ); status =decode_getfattr_generic (xdr, &res->fs_locations->fattr,NULL , res->fs_locations, - res->fs_locations->server); +NULL , res->fs_locations->server); out:return status; }@@ -7001,7 +7095,7 @@ static int nfs4_xdr_dec_layoutcommit(struct rpc_rqst *rqstp, status =decode_layoutcommit (xdr, rqstp, res);if (status) goto out; -decode_getfattr (xdr, res->fattr, res->server); +decode_getfattr (xdr, res->fattr,NULL , res->server); out:return status; }@@ -7133,7 +7227,7 @@ int nfs4_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, goto out_overflow;if (decode_getfattr_attrs (xdr, bitmap, entry->fattr, entry->fh, -NULL , entry->server) <0 ) +NULL , entry->label, entry->server) <0 ) goto out_overflow;if (entry->fattr->valid &NFS_ATTR_FATTR_MOUNTED_ON_FILEID ) entry->ino = entry->fattr->mounted_on_fileid;fs/nfs/pnfs.c +1
-1@@ -1922,7 +1922,7 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync) data->args.inode = inode; data->cred =get_rpccred (nfsi->layout->plh_lc_cred);nfs_fattr_init (&data->fattr); - data->args.bitmask =NFS_SERVER (inode)->cache_consistency_bitmask; + data->args.bitmask =nfs4_cache_bitmask (NFS_SERVER (inode),NULL ); data->res.fattr = &data->fattr; data->args.lastbytewritten = end_pos -1 ; data->res.server =NFS_SERVER (inode);fs/nfs/super.c +15
-2@@ -2379,8 +2379,21 @@ static int nfs_bdi_register(struct nfs_server *server)int nfs_set_sb_security (struct super_block *s,struct dentry *mntroot,struct nfs_mount_info *mount_info) { -return security_sb_set_mnt_opts (s, &mount_info->parsed->lsm_opts, -0 ,NULL ); +int error; +unsigned long kflags =0 , kflags_out =0 ; +if (NFS_SB (s)->caps &NFS_CAP_SECURITY_LABEL ) + kflags |=SECURITY_LSM_NATIVE_LABELS ; + + error =security_sb_set_mnt_opts (s, &mount_info->parsed->lsm_opts, + kflags, &kflags_out); +if (error) + goto err; + +if (NFS_SB (s)->caps &NFS_CAP_SECURITY_LABEL && + !(kflags_out &SECURITY_LSM_NATIVE_LABELS )) +NFS_SB (s)->caps &= ~NFS_CAP_SECURITY_LABEL ; +err: +return error; }EXPORT_SYMBOL_GPL (nfs_set_sb_security);include/linux/nfs_fs.h +13
-0@@ -199,6 +199,7 @@ struct nfs_inode {#define NFS_INO_INVALID_ACL 0x0010/* cached acls are invalid */ #define NFS_INO_REVAL_PAGECACHE 0x0020/* must revalidate pagecache */ #define NFS_INO_REVAL_FORCED 0x0040/* force revalidation ignoring a delegation */ +#define NFS_INO_INVALID_LABEL 0x0080/* cached label is invalid */ /* * Bit offsets in flags field @@ -344,6 +345,8 @@ extern int __nfs_revalidate_inode(struct nfs_server *, struct inode *);extern int nfs_revalidate_mapping (struct inode *inode,struct address_space *mapping);extern int nfs_setattr (struct dentry *,struct iattr *);extern void nfs_setattr_update_inode (struct inode *inode,struct iattr *attr); +extern void nfs_setsecurity (struct inode *inode,struct nfs_fattr *fattr, +struct nfs4_label *label);extern struct nfs_open_context *get_nfs_open_context (struct nfs_open_context *ctx);extern void put_nfs_open_context (struct nfs_open_context *ctx);extern struct nfs_open_context *nfs_find_open_context (struct inode *inode,struct rpc_cred *cred,fmode_t mode);@@ -502,9 +505,19 @@ static inline void nfs4_label_free(struct nfs4_label *label) }return ; } +static inline u32 *nfs4_cache_bitmask (struct nfs_server *server,struct nfs4_label *label) +{ +if (label) +return server->cache_consistency_bitmask; + +return server->cache_consistency_bitmask_nl; +}#else static inline struct nfs4_label *nfs4_label_alloc (struct nfs_server *server,gfp_t flags) {return NULL ; }static inline void nfs4_label_free (void *label) {} +static inline u32 * +nfs4_cache_bitmask (struct nfs_server *server,struct nfs4_label *label) +{return server->cache_consistency_bitmask; }#endif /* include/linux/nfs_fs_sb.h +7
-0@@ -145,11 +145,18 @@ struct nfs_server {u32 attr_bitmask[3 ];/* V4 bitmask representing the set of attributes supported on this filesystem */ +u32 attr_bitmask_nl[3 ]; +/* V4 bitmask representing the +set of attributes supported +on this filesystem excluding +the label support bit. */ u32 cache_consistency_bitmask[3 ];/* V4 bitmask representing the subset of change attribute, size, ctime and mtime attributes supported by the server */ +u32 cache_consistency_bitmask_nl[3 ]; +/* As above, excluding label. */ u32 acl_bitmask;/* V4 bitmask representing the ACEs that are supported on this filesystem */ security/selinux/hooks.c +4
-0@@ -2877,7 +2877,10 @@ static void selinux_inode_post_setxattr(struct dentry *dentry, const char *name,return ; } + isec->sclass =inode_mode_to_security_class (inode->i_mode); isec->sid = newsid; + isec->initialized =1 ; +return ; }@@ -2965,6 +2968,7 @@ static int selinux_inode_setsecurity(struct inode *inode, const char *name,if (rc)return rc; + isec->sclass =inode_mode_to_security_class (inode->i_mode); isec->sid = newsid; isec->initialized =1 ;return 0 ;Signature · 6 lines
1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
James Morris <[email protected]>
PATCH 14/17 NFS: Extend NFS xattr handlers to accept the security namespace
In reply to Steve DicksonFrom: David Quigley <[email protected]>
The existing NFSv4 xattr handlers do not accept xattr calls to the security namespace. This patch extends these handlers to accept xattrs from the security namespace in addition to the default NFSv4 ACL namespace.
--- fs/nfs/nfs4proc.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ security/security.c | 1 + 2 files changed, 51 insertions(+)
fs/nfs/nfs4proc.c +50 -0
@@ -5518,6 +5518,53 @@ static size_t nfs4_xattr_list_nfs4_acl(struct dentry *dentry, char *list,return len; } +#ifdef CONFIG_NFS_V4_SECURITY_LABEL +static inline int nfs4_server_supports_labels (struct nfs_server *server) +{ +return server->caps &NFS_CAP_SECURITY_LABEL ; +} + +static int nfs4_xattr_set_nfs4_label (struct dentry *dentry,const char *key, +const void *buf,size_t buflen, +int flags,int type) +{ +if (security_ismaclabel (key)) +return nfs4_set_security_label (dentry, buf, buflen); + +return -EOPNOTSUPP ; +} + +static int nfs4_xattr_get_nfs4_label (struct dentry *dentry,const char *key, +void *buf,size_t buflen,int type) +{ +if (security_ismaclabel (key)) +return nfs4_get_security_label (dentry->d_inode, buf, buflen); +return -EOPNOTSUPP ; +} + +static size_t nfs4_xattr_list_nfs4_label (struct dentry *dentry,char *list, +size_t list_len,const char *name, +size_t name_len,int type) +{ +size_t len =0 ; + +if (nfs_server_capable (dentry->d_inode,NFS_CAP_SECURITY_LABEL )) { + len =security_inode_listsecurity (dentry->d_inode,NULL ,0 ); +if (list && len <= list_len) +security_inode_listsecurity (dentry->d_inode, list, len); + } +return len; +} + +static const struct xattr_handler nfs4_xattr_nfs4_label_handler = { + .prefix =XATTR_SECURITY_PREFIX , + .list = nfs4_xattr_list_nfs4_label, + .get = nfs4_xattr_get_nfs4_label, + .set = nfs4_xattr_set_nfs4_label, +}; +#endif + +/* * nfs_fhget will use either the mounted_on_fileid or the fileid */
@@ -7270,6 +7317,9 @@ static const struct xattr_handler nfs4_xattr_nfs4_acl_handler = {const struct xattr_handler *nfs4_xattr_handlers[] = { &nfs4_xattr_nfs4_acl_handler, +#ifdef CONFIG_NFS_V4_SECURITY_LABEL + &nfs4_xattr_nfs4_label_handler, +#endifNULL };
security/security.c +1 -0
@@ -660,6 +660,7 @@ int security_inode_listsecurity(struct inode *inode, char *buffer, size_t bufferreturn 0 ;return security_ops->inode_listsecurity (inode, buffer, buffer_size); } +EXPORT_SYMBOL (security_inode_listsecurity);void security_inode_getsecid (const struct inode *inode,u32 *secid) {
Signature · 1 line
1.8.1.4
Re: [PATCH 14/17] NFS: Extend NFS xattr handlers to accept the security namespace
Quoted 10 lines · Steve Dickson
From: David Quigley <[email protected]>
The existing NFSv4 xattr handlers do not accept xattr calls to the security namespace. This patch extends these handlers to accept xattrs from the security namespace in addition to the default NFSv4 ACL namespace.
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]>
Quoted 93 lines
--- fs/nfs/nfs4proc.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ security/security.c | 1 + 2 files changed, 51 insertions(+)fs/nfs/nfs4proc.c +50
-0@@ -5518,6 +5518,53 @@ static size_t nfs4_xattr_list_nfs4_acl(struct dentry *dentry, char *list,return len; } +#ifdef CONFIG_NFS_V4_SECURITY_LABEL +static inline int nfs4_server_supports_labels (struct nfs_server *server) +{ +return server->caps &NFS_CAP_SECURITY_LABEL ; +} + +static int nfs4_xattr_set_nfs4_label (struct dentry *dentry,const char *key, +const void *buf,size_t buflen, +int flags,int type) +{ +if (security_ismaclabel (key)) +return nfs4_set_security_label (dentry, buf, buflen); + +return -EOPNOTSUPP ; +} + +static int nfs4_xattr_get_nfs4_label (struct dentry *dentry,const char *key, +void *buf,size_t buflen,int type) +{ +if (security_ismaclabel (key)) +return nfs4_get_security_label (dentry->d_inode, buf, buflen); +return -EOPNOTSUPP ; +} + +static size_t nfs4_xattr_list_nfs4_label (struct dentry *dentry,char *list, +size_t list_len,const char *name, +size_t name_len,int type) +{ +size_t len =0 ; + +if (nfs_server_capable (dentry->d_inode,NFS_CAP_SECURITY_LABEL )) { + len =security_inode_listsecurity (dentry->d_inode,NULL ,0 ); +if (list && len <= list_len) +security_inode_listsecurity (dentry->d_inode, list, len); + } +return len; +} + +static const struct xattr_handler nfs4_xattr_nfs4_label_handler = { + .prefix =XATTR_SECURITY_PREFIX , + .list = nfs4_xattr_list_nfs4_label, + .get = nfs4_xattr_get_nfs4_label, + .set = nfs4_xattr_set_nfs4_label, +}; +#endif + +/* * nfs_fhget will use either the mounted_on_fileid or the fileid */ @@ -7270,6 +7317,9 @@ static const struct xattr_handler nfs4_xattr_nfs4_acl_handler = {const struct xattr_handler *nfs4_xattr_handlers[] = { &nfs4_xattr_nfs4_acl_handler, +#ifdef CONFIG_NFS_V4_SECURITY_LABEL + &nfs4_xattr_nfs4_label_handler, +#endifNULL };security/security.c +1
-0@@ -660,6 +660,7 @@ int security_inode_listsecurity(struct inode *inode, char *buffer, size_t bufferreturn 0 ;return security_ops->inode_listsecurity (inode, buffer, buffer_size); } +EXPORT_SYMBOL (security_inode_listsecurity);void security_inode_getsecid (const struct inode *inode,u32 *secid) {Signature · 6 lines
1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
James Morris <[email protected]>
PATCH 15/17 Kconfig: Add Kconfig entry for Labeled NFS V4 client
In reply to Steve DicksonFrom: Steve Dickson <[email protected]>
This patch adds the NFS_V4_SECURITY_LABEL entry which enables security label support for the NFSv4 client
--- fs/nfs/Kconfig | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
fs/nfs/Kconfig +19 -0
@@ -107,6 +107,7 @@ config NFS_V4_1 config NFS_V4_2 bool "NFS client support for NFSv4.2" depends on NFS_V4_1 + select NFS_V4_SECURITY_LABEL help This option enables support for minor version 1 of the NFSv4 protocol in the kernel's NFS client.
@@ -140,6 +141,24 @@ config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN If the NFS client is unchanged from the upstream kernel, this option should be set to the default "kernel.org". +config NFS_V4_SECURITY_LABEL + bool "Provide Security Label support for NFSv4 client" + depends on NFS_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." + + If unsure, say N. + config ROOT_NFS bool "Root file system on NFS" depends on NFS_FS=y && IP_PNP
Signature · 1 line
1.8.1.4
PATCH 16/17 NFSD: Server implementation of MAC Labeling
In reply to Steve DicksonFrom: David Quigley <[email protected]>
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.
--- fs/nfsd/nfs4proc.c | 41 ++++++++++++++++++ fs/nfsd/nfs4xdr.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++---- fs/nfsd/nfsd.h | 14 ++++++ fs/nfsd/vfs.c | 28 ++++++++++++ fs/nfsd/vfs.h | 2 + fs/nfsd/xdr4.h | 3 ++ 6 files changed, 203 insertions(+), 8 deletions(-)
fs/nfsd/nfs4proc.c +41 -0
@@ -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_PROCstatic 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:
fs/nfsd/nfs4xdr.c +115 -8
196 lines not on this page · raw message
fs/nfsd/nfsd.h +14 -0
@@ -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,6 +349,9 @@ static inline u32 nfsd_suppattrs1(u32 minorversion)static inline u32 nfsd_suppattrs2 (u32 minorversion) { +if (minorversion ==2 ) +return NFSD4_2_SUPPORTED_ATTRS_WORD2 ; +return minorversion ?NFSD4_1_SUPPORTED_ATTRS_WORD2 :NFSD4_SUPPORTED_ATTRS_WORD2 ; }
@@ -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 nfs4_label *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->label, 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 nfs4_label *label) +{ +return nfserr_notsupp; +} +#endif +#endif /* defined(CONFIG_NFSD_V4) */ #ifdef CONFIG_NFSD_V3
fs/nfsd/vfs.h +2 -0
@@ -56,6 +56,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 nfs4_label *);#endif /* CONFIG_NFSD_V4 */ __be32 nfsd_create(struct svc_rqst *, struct svc_fh *, char *name, int len, struct iattr *attrs,
fs/nfsd/xdr4.h +3 -0
@@ -118,6 +118,7 @@ struct nfsd4_create {struct iattr cr_iattr;/* request */ struct nfsd4_change_info cr_cinfo;/* response */ struct nfs4_acl *cr_acl; +struct nfs4_label *cr_label; };#define cr_linklen u.link.namelen#define cr_linkname u.link.name
@@ -246,6 +247,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 nfs4_label *op_label; };#define op_iattr iattr
@@ -330,6 +332,7 @@ struct nfsd4_setattr {u32 sa_bmval[3 ];/* request */ struct iattr sa_iattr;/* request */ struct nfs4_acl *sa_acl; +struct nfs4_label *sa_label; };struct nfsd4_setclientid {
Signature · 1 line
1.8.1.4
A message that is not in the archive (sent off-list or not yet received): 1367515151-31015-17-git-send-email-SteveD-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Re: [PATCH 16/17] NFSD: Server implementation of MAC Labeling
This also doesn't handle the unsupported case correctly.
Applying the following fix to my tree.
--b.
commit 4438e5f801c43cc0f383fdc85f3ec294a4155df1
Author: J. Bruce Fields <[email protected]> Date: Wed May 8 21:38:00 2013 -0400
nfsd4: fix handling of case when labels are unsupported
Copy the logic in the ACL case to ensure that we just turn off the bitmap in the getattr case instead of erroring out, and to ensure that we get the supported_attributes attribute right.
fs/nfsd/nfs4xdr.c +28 -17
@@ -2010,29 +2010,21 @@ nfsd4_encode_aclname(struct svc_rqst *rqstp, struct nfs4_ace *ace,#ifdef CONFIG_NFSD_V4_SECURITY_LABEL static inline __be32 -nfsd4_encode_security_label (struct svc_rqst *rqstp,struct dentry *dentry,__be32 **pp,int *buflen) +nfsd4_encode_security_label (struct svc_rqst *rqstp,void *context,int len,__be32 **pp,int *buflen) { -void *context; -int host_err; -__be32 err = nfserr_resource; -u32 len;uint32_t pi =0 ;uint32_t lfs =0 ;__be32 *p = *pp; - host_err =security_inode_getsecctx (dentry->d_inode, &context, &len); -if (host_err) -return nfserrno (host_err); -if (*buflen < ((XDR_QUADLEN (len) <<2 ) +4 +4 +4 )) - goto out; +return nfserr_resource;/* * For now we use a 0 here to indicate the null translation; in * the future we may place a call to translation code here. */ if ((*buflen -=8 ) <0 ) - goto out; +return nfserr_resource;WRITE32 (lfs);WRITE32 (pi);
@@ -2040,10 +2032,7 @@ nfsd4_encode_security_label(struct svc_rqst *rqstp, struct dentry *dentry, __be3 *buflen -= (XDR_QUADLEN (len) <<2 ) +4 ; *pp = p; - err =0 ; -out: -security_release_secctx (context, len); -return err; +return 0 ; }#else static inline __be32
@@ -2110,6 +2099,9 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,int err;int aclsupport =0 ;struct nfs4_acl *acl =NULL ; +void *context =NULL ; +int contextlen; +bool contextsupport = false;struct nfsd4_compoundres *resp = rqstp->rq_resp;u32 minorversion = resp->cstate.minorversion;struct path path = {
@@ -2163,6 +2155,21 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, } } +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL +if ((bmval[2 ] &FATTR4_WORD2_SECURITY_LABEL ) || + bmval[0 ] &FATTR4_WORD0_SUPPORTED_ATTRS ) { + err =security_inode_getsecctx (dentry->d_inode, + &context, &contextlen); + contextsupport = (err =0 ); +if (bmval2 &FATTR4_WORD2_SECURITY_LABEL ) { +if (err == -EOPNOTSUPP ) + bmval2 &= ~FATTR4_WORD2_SECURITY_LABEL ; +else if (err) + goto out_nfserr; + } + } +#endif /* CONFIG_NFSD_V4_SECURITY_LABEL */ +if (bmval2) {if ((buflen -=16 ) <0 ) goto out_resource;
@@ -2191,6 +2198,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,if (!aclsupport) word0 &= ~FATTR4_WORD0_ACL ; +if (!contextsupport) + word2 &= ~FATTR4_WORD2_SECURITY_LABEL ;if (!word2) {if ((buflen -=12 ) <0 ) goto out_resource;
@@ -2499,8 +2508,8 @@ out_acl:WRITE64 (stat.ino); }if (bmval2 &FATTR4_WORD2_SECURITY_LABEL ) { - status =nfsd4_encode_security_label (rqstp, dentry, - &p, &buflen); + status =nfsd4_encode_security_label (rqstp, context, + contextlen, &p, &buflen);if (status) goto out; }
@@ -2516,6 +2525,8 @@ out_acl: status = nfs_ok; out: +if (context) +security_release_secctx (context, contextlen);kfree (acl);if (fhp == &tempfh)fh_put (&tempfh);
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 16/17] NFSD: Server implementation of MAC Labeling
Quoted 3 lines · bfields
This also doesn't handle the unsupported case correctly.
Applying the following fix to my tree.
And, one more change: I can't see why we need struct nfs4_label, given that the only fields we're actually using are data and length.
One assumption I'm making here is that a zero-length security label is the same as no security label; correct me if that's wrong.
After this, note that the only patch shared between client and server is one patch that adds protocol constants.
A temporary branch with my current version of the server patches is available from
git://linux-nfs.org/~bfields/linux-topics.git for-3.11-incoming
--b.
commit 1b2b52707bb41229f7fdad0d13c2ae69b142e6dc
Author: J. Bruce Fields <[email protected]> Date: Wed May 8 21:38:00 2013 -0400
nfsd4: fix handling of unsupported SEC_LABEL
Copy the logic in the ACL case to ensure that we just turn off the bitmap in the getattr case instead of erroring out, and to ensure that we get the supported_attributes attribute right.
fs/nfsd/nfs4xdr.c +28 -17
@@ -1989,27 +1989,19 @@ nfsd4_encode_aclname(struct svc_rqst *rqstp, struct nfs4_ace *ace,#ifdef CONFIG_NFSD_V4_SECURITY_LABEL static inline __be32 -nfsd4_encode_security_label (struct svc_rqst *rqstp,struct dentry *dentry,__be32 **pp,int *buflen) +nfsd4_encode_security_label (struct svc_rqst *rqstp,void *context,int len,__be32 **pp,int *buflen) { -void *context; -int host_err; -__be32 err = nfserr_resource; -u32 len;__be32 *p = *pp; - host_err =security_inode_getsecctx (dentry->d_inode, &context, &len); -if (host_err) -return nfserrno (host_err); -if (*buflen < ((XDR_QUADLEN (len) <<2 ) +4 +4 +4 )) - goto out; +return nfserr_resource;/* * For now we use a 0 here to indicate the null translation; in * the future we may place a call to translation code here. */ if ((*buflen -=8 ) <0 ) - goto out; +return nfserr_resource;WRITE32 (0 );/* lfs */ WRITE32 (0 );/* pi */
@@ -2017,10 +2009,7 @@ nfsd4_encode_security_label(struct svc_rqst *rqstp, struct dentry *dentry, __be3 *buflen -= (XDR_QUADLEN (len) <<2 ) +4 ; *pp = p; - err =0 ; -out: -security_release_secctx (context, len); -return err; +return 0 ; }#else static inline __be32
@@ -2087,6 +2076,9 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,int err;int aclsupport =0 ;struct nfs4_acl *acl =NULL ; +void *context =NULL ; +int contextlen; +bool contextsupport = false;struct nfsd4_compoundres *resp = rqstp->rq_resp;u32 minorversion = resp->cstate.minorversion;struct path path = {
@@ -2140,6 +2132,21 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, } } +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL +if ((bmval[2 ] &FATTR4_WORD2_SECURITY_LABEL ) || + bmval[0 ] &FATTR4_WORD0_SUPPORTED_ATTRS ) { + err =security_inode_getsecctx (dentry->d_inode, + &context, &contextlen); + contextsupport = (err =0 ); +if (bmval2 &FATTR4_WORD2_SECURITY_LABEL ) { +if (err == -EOPNOTSUPP ) + bmval2 &= ~FATTR4_WORD2_SECURITY_LABEL ; +else if (err) + goto out_nfserr; + } + } +#endif /* CONFIG_NFSD_V4_SECURITY_LABEL */ +if (bmval2) {if ((buflen -=16 ) <0 ) goto out_resource;
@@ -2168,6 +2175,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,if (!aclsupport) word0 &= ~FATTR4_WORD0_ACL ; +if (!contextsupport) + word2 &= ~FATTR4_WORD2_SECURITY_LABEL ;if (!word2) {if ((buflen -=12 ) <0 ) goto out_resource;
@@ -2476,8 +2485,8 @@ out_acl:WRITE64 (stat.ino); }if (bmval2 &FATTR4_WORD2_SECURITY_LABEL ) { - status =nfsd4_encode_security_label (rqstp, dentry, - &p, &buflen); + status =nfsd4_encode_security_label (rqstp, context, + contextlen, &p, &buflen);if (status) goto out; }
@@ -2493,6 +2502,8 @@ out_acl: status = nfs_ok; out: +if (context) +security_release_secctx (context, contextlen);kfree (acl);if (fhp == &tempfh)fh_put (&tempfh);
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 16/17] NFSD: Server implementation of MAC Labeling
In reply to J. Bruce FieldsQuoted 78 lines · J. Bruce Fields
This also doesn't handle the unsupported case correctly.
Applying the following fix to my tree.
--b.
commit
4438e5f801c43cc0f383fdc85f3ec294a4155df1Author: J. Bruce Fields <[email protected]> Date: Wed May 8 21:38:00 2013 -0400nfsd4: fix handling of case when labels are unsupported
Copy the logic in the ACL case to ensure that we just turn off the bitmap in the getattr case instead of erroring out, and to ensure that we get the
supported_attributesattribute right.Signed-off-by J. Bruce Fields <[email protected]>fs/nfsd/nfs4xdr.c +7
-15@@ -2010,29 +2010,21 @@ nfsd4_encode_aclname(struct svc_rqst *rqstp, struct nfs4_ace *ace,#ifdef CONFIG_NFSD_V4_SECURITY_LABEL static inline __be32 -nfsd4_encode_security_label (struct svc_rqst *rqstp,struct dentry *dentry,__be32 **pp,int *buflen) +nfsd4_encode_security_label (struct svc_rqst *rqstp,void *context,int len,__be32 **pp,int *buflen) { -void *context; -int host_err; -__be32 err = nfserr_resource; -u32 len;uint32_t pi =0 ;uint32_t lfs =0 ;__be32 *p = *pp; - host_err =security_inode_getsecctx (dentry->d_inode, &context, &len); -if (host_err) -return nfserrno (host_err); -if (*buflen < ((XDR_QUADLEN (len) <<2 ) +4 +4 +4 )) - goto out; +return nfserr_resource;/* * For now we use a 0 here to indicate the null translation; in * the future we may place a call to translation code here. */ if ((*buflen -=8 ) <0 ) - goto out; +return nfserr_resource;WRITE32 (lfs);WRITE32 (pi);@@ -2040,10 +2032,7 @@ nfsd4_encode_security_label(struct svc_rqst *rqstp, struct dentry *dentry, __be3 *buflen -= (XDR_QUADLEN (len) <<2 ) +4 ; *pp = p; - err =0 ; -out: -security_release_secctx (context, len); -return err; +return 0 ; }#else static inline __be32@@ -2110,6 +2099,9 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,int err;int aclsupport =0 ;struct nfs4_acl *acl =NULL ; +void *context =NULL ; +int contextlen; +bool contextsupport = false;struct nfsd4_compoundres *resp = rqstp->rq_resp;u32 minorversion = resp->cstate.minorversion;struct path path = {
fs/nfsd/nfs4xdr.c nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, · line 2163
Quoted 9 lines
fs/nfsd/nfs4xdr.c +6
-0@@ -2163,6 +2155,21 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, } } +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL +if ((bmval[2 ] &FATTR4_WORD2_SECURITY_LABEL ) || + bmval[0 ] &FATTR4_WORD0_SUPPORTED_ATTRS ) { + err =security_inode_getsecctx (dentry->d_inode, + &context, &contextlen); + contextsupport = (err =0 );
Don't you really mean "contextsupport = (err == 0);" ? Otherwise contextsupport will never be set to 1.
steved.
Quoted 42 lines
fs/nfsd/nfs4xdr.c +15
-2+if (bmval2 &FATTR4_WORD2_SECURITY_LABEL ) { +if (err == -EOPNOTSUPP ) + bmval2 &= ~FATTR4_WORD2_SECURITY_LABEL ; +else if (err) + goto out_nfserr; + } + } +#endif /* CONFIG_NFSD_V4_SECURITY_LABEL */ +if (bmval2) {if ((buflen -=16 ) <0 ) goto out_resource;@@ -2191,6 +2198,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,if (!aclsupport) word0 &= ~FATTR4_WORD0_ACL ; +if (!contextsupport) + word2 &= ~FATTR4_WORD2_SECURITY_LABEL ;if (!word2) {if ((buflen -=12 ) <0 ) goto out_resource;@@ -2499,8 +2508,8 @@ out_acl:WRITE64 (stat.ino); }if (bmval2 &FATTR4_WORD2_SECURITY_LABEL ) { - status =nfsd4_encode_security_label (rqstp, dentry, - &p, &buflen); + status =nfsd4_encode_security_label (rqstp, context, + contextlen, &p, &buflen);if (status) goto out; }@@ -2516,6 +2525,8 @@ out_acl: status = nfs_ok; out: +if (context) +security_release_secctx (context, contextlen);kfree (acl);if (fhp == &tempfh)fh_put (&tempfh);
Re: [PATCH 16/17] NFSD: Server implementation of MAC Labeling
Quoted 84 lines · Steve Dickson
Quoted 81 lines · J. Bruce Fields
This also doesn't handle the unsupported case correctly.
Applying the following fix to my tree.
--b.
commit
4438e5f801c43cc0f383fdc85f3ec294a4155df1Author: J. Bruce Fields <[email protected]> Date: Wed May 8 21:38:00 2013 -0400nfsd4: fix handling of case when labels are unsupported
Copy the logic in the ACL case to ensure that we just turn off the bitmap in the getattr case instead of erroring out, and to ensure that we get the
supported_attributesattribute right.Signed-off-by J. Bruce Fields <[email protected]>fs/nfsd/nfs4xdr.c +7
-15@@ -2010,29 +2010,21 @@ nfsd4_encode_aclname(struct svc_rqst *rqstp, struct nfs4_ace *ace,#ifdef CONFIG_NFSD_V4_SECURITY_LABEL static inline __be32 -nfsd4_encode_security_label (struct svc_rqst *rqstp,struct dentry *dentry,__be32 **pp,int *buflen) +nfsd4_encode_security_label (struct svc_rqst *rqstp,void *context,int len,__be32 **pp,int *buflen) { -void *context; -int host_err; -__be32 err = nfserr_resource; -u32 len;uint32_t pi =0 ;uint32_t lfs =0 ;__be32 *p = *pp; - host_err =security_inode_getsecctx (dentry->d_inode, &context, &len); -if (host_err) -return nfserrno (host_err); -if (*buflen < ((XDR_QUADLEN (len) <<2 ) +4 +4 +4 )) - goto out; +return nfserr_resource;/* * For now we use a 0 here to indicate the null translation; in * the future we may place a call to translation code here. */ if ((*buflen -=8 ) <0 ) - goto out; +return nfserr_resource;WRITE32 (lfs);WRITE32 (pi);@@ -2040,10 +2032,7 @@ nfsd4_encode_security_label(struct svc_rqst *rqstp, struct dentry *dentry, __be3 *buflen -= (XDR_QUADLEN (len) <<2 ) +4 ; *pp = p; - err =0 ; -out: -security_release_secctx (context, len); -return err; +return 0 ; }#else static inline __be32@@ -2110,6 +2099,9 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,int err;int aclsupport =0 ;struct nfs4_acl *acl =NULL ; +void *context =NULL ; +int contextlen; +bool contextsupport = false;struct nfsd4_compoundres *resp = rqstp->rq_resp;u32 minorversion = resp->cstate.minorversion;struct path path = {@@ -2163,6 +2155,21 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, } }
Quoted 8 lines
fs/nfsd/nfs4xdr.c nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, · line 2163
Quoted 6 lines
fs/nfsd/nfs4xdr.c +6
-0+#ifdef CONFIG_NFSD_V4_SECURITY_LABEL +if ((bmval[2 ] &FATTR4_WORD2_SECURITY_LABEL ) || + bmval[0 ] &FATTR4_WORD0_SUPPORTED_ATTRS ) { + err =security_inode_getsecctx (dentry->d_inode, + &context, &contextlen); + contextsupport = (err =0 );Don't you really mean "contextsupport = (err == 0);" ? Otherwise contextsupport will never be set to 1.
Whoops, thanks! Fixed.--b.
Quoted 45 lines
steved.
Quoted 42 lines
fs/nfsd/nfs4xdr.c +15
-2+if (bmval2 &FATTR4_WORD2_SECURITY_LABEL ) { +if (err == -EOPNOTSUPP ) + bmval2 &= ~FATTR4_WORD2_SECURITY_LABEL ; +else if (err) + goto out_nfserr; + } + } +#endif /* CONFIG_NFSD_V4_SECURITY_LABEL */ +if (bmval2) {if ((buflen -=16 ) <0 ) goto out_resource;@@ -2191,6 +2198,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,if (!aclsupport) word0 &= ~FATTR4_WORD0_ACL ; +if (!contextsupport) + word2 &= ~FATTR4_WORD2_SECURITY_LABEL ;if (!word2) {if ((buflen -=12 ) <0 ) goto out_resource;@@ -2499,8 +2508,8 @@ out_acl:WRITE64 (stat.ino); }if (bmval2 &FATTR4_WORD2_SECURITY_LABEL ) { - status =nfsd4_encode_security_label (rqstp, dentry, - &p, &buflen); + status =nfsd4_encode_security_label (rqstp, context, + contextlen, &p, &buflen);if (status) goto out; }@@ -2516,6 +2525,8 @@ out_acl: status = nfs_ok; out: +if (context) +security_release_secctx (context, contextlen);kfree (acl);if (fhp == &tempfh)fh_put (&tempfh);
Re: [PATCH 16/17] NFSD: Server implementation of MAC Labeling
In reply to J. Bruce FieldsQuoted 3 lines · J. Bruce Fields
This also doesn't handle the unsupported case correctly.
Applying the following fix to my tree.
With in the following commit
commit ad8684190a6eb3913a54eda7838f31ead8a73168
Author: David Quigley <[email protected]> Date: Thu May 2 13:19:10 2013 -0400
NFSD: Server implementation of MAC Labeling
The following chunk of code was committed:
@@ -380,6 +386,33 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bm
goto xdr_error;
}
}+
+ label->len = 0;
+#ifdef CONFIG_NFSD_V4_SECURITY_LABEL
+ if (bmval[2] & FATTR4_WORD2_SECURITY_LABEL) {
+ READ_BUF(4); + len += 4; + READ32(dummy32); /* lfs: we don't use it */ + READ_BUF(4); + len += 4; + READ32(dummy32); /* pi: we don't use it either */ + READ_BUF(4); + len += 4; + READ32(dummy32); + READ_BUF(dummy32); + if (dummy32 > NFSD4_MAX_SEC_LABEL_LEN) + return nfserr_badlabel; + len += (XDR_QUADLEN(dummy32) << 2); + READMEM(buf, dummy32); + label->data = kzalloc(dummy32 + 1, GFP_KERNEL); + if (!label->data) + return nfserr_jukebox; + defer_free(argp, kfree, label->data); + memcpy(label->data, buf, dummy32); + label->data[len] = '\0';
+ }
+#endif
+
which is not quite right....
You really don't need to NULL out label->data since kzalloc(dummy32 + 1) was used and especially with 'len' since only 'dummy32' amount of space was allocated which is significantly less than the 'len' value. But you do want to set label->len to dummy32 otherwise nfsd4_setattr() will never call nfsd4_set_nfs4_label() to process the label.
commit 965ac99ed149eba2f7d2e37abe07919decf8afa5
Author: Steve Dickson <[email protected]> Date: Sat May 11 17:36:21 2013 -0400
nfsd: Fixed memory corruption in the decoding of labels
Commit ad86841 caused a memory corruption in how labels are allocated in nfsd4_decode_fattr() by using 'len' to set the NULL in label->data.
Also label->len was not being set which cause
labels not to be process in nfsd4_setattr()
fs/nfsd/nfs4xdr.c +1 -1
@@ -409,7 +409,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,return nfserr_jukebox;defer_free (argp, kfree, label->data);memcpy (label->data, buf, dummy32); - label->data[len] = '\0'; + label->len = dummy32; }#endif
A message that is not in the archive (sent off-list or not yet received): [email protected]
J. Bruce Fields
AppliedRe: [PATCH 16/17] NFSD: Server implementation of MAC Labeling
Quoted 53 lines · Steve Dickson
tatus: RO
Content-Length: 2809
Lines: 82Quoted 3 lines · J. Bruce Fields
This also doesn't handle the unsupported case correctly.
Applying the following fix to my tree.
With in the following commit
commit
ad8684190a6eb3913a54eda7838f31ead8a73168Author: David Quigley <[email protected]> Date: Thu May 2 13:19:10 2013 -0400NFSD: Server implementation of MAC Labeling
The following chunk of code was committed:
@@ -380,6 +386,33 @@ nfsd4_decode_fattr(struct
nfsd4_compoundargs*argp, u32 *bmgoto xdr_error; } }(quoted diff) +27
-0+ + label->len = 0; +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL + if (bmval[2] & FATTR4_WORD2_SECURITY_LABEL) { + READ_BUF(4); + len += 4; + READ32(dummy32); /* lfs: we don't use it */ + READ_BUF(4); + len += 4; + READ32(dummy32); /* pi: we don't use it either */ + READ_BUF(4); + len += 4; + READ32(dummy32); + READ_BUF(dummy32); + if (dummy32 > NFSD4_MAX_SEC_LABEL_LEN) + return nfserr_badlabel; + len += (XDR_QUADLEN(dummy32) << 2); + READMEM(buf, dummy32); + label->data = kzalloc(dummy32 + 1, GFP_KERNEL); + if (!label->data) + return nfserr_jukebox; + defer_free(argp, kfree, label->data); + memcpy(label->data, buf, dummy32); + label->data[len] = '\0'; + } +#endif +which is not quite right....
Quoted 5 lines
You really don't need to NULL out
label->datasince kzalloc(dummy32 + 1) was used and especially with 'len' since only 'dummy32' amount of space was allocated which is significantly less than the 'len' value. But you do want to setlabel->lento dummy32 otherwisenfsd4_setattr()will never callnfsd4_set_nfs4_label()to process the label.
Ah-hah, thanks!
Quoted 21 lines
commit
965ac99ed149eba2f7d2e37abe07919decf8afa5Author: Steve Dickson <[email protected]> Date: Sat May 11 17:36:21 2013 -0400nfsd: Fixed memory corruption in the decoding of labels
Commit ad86841 caused a memory corruption in how labels are allocated in
nfsd4_decode_fattr()by using 'len' to set the NULL inlabel->data.Also
label->lenwas not being set which cause
labels not to be process innfsd4_setattr()Signed-off-by Steve Dickson <[email protected]>fs/nfsd/nfs4xdr.c +0
-0
fs/nfsd/nfs4xdr.c nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, · line 412
Quoted 4 lines
fs/nfsd/nfs4xdr.c +0
-1@@ -409,7 +409,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,return nfserr_jukebox;defer_free (argp, kfree, label->data);memcpy (label->data, buf, dummy32); - label->data[len] = '
Applied to my tree.
--b.
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 17/17 Kconfig: Add Kconfig entry for Labeled NFS V4 server
In reply to Steve DicksonFrom: Steve Dickson <[email protected]>
This patch adds the NFSd_V4_SECURITY_LABEL entry which enables security label support for the NFSv4 server
--- fs/nfsd/Kconfig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
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
Signature · 1 line
1.8.1.4
Quoted 8 lines · Steve Dickson
From: Steve Dickson <[email protected]>
Here is an the next rlease of the label NFS patches ported to the linux-3.9 release
The following changes were made from the previous release. (Note, only the server patch changed in this release)
Quoted 7 lines
* Remove the buffer overflow in the allocation of labels.
* Removed needless char * casting
* Removed the
-EMSGSIZEtonfs4err_badlabelerrno mapping by changing the return value ofnfsd4_label_alloc()to be a_be32value.
It would be great to see this patch series land in time for 3.10 - seems like a major feature that has had been held in development for years and it does have a very interested user base waiting for this to land.
Are there any existing roadblocks to having this make it this merge window?
Thanks!
Ric
Quoted 63 lines
David Quigley (12):
Security: Add hook to calculate context based on a negative dentry.
Security: Add Hook to test if the particular xattr is part of a MAC
model.
LSM: Add flags field tosecurity_sb_set_mnt_optsfor in kernel mount
data.
SELinux: Add new labeling type native labels
NFSv4: Add label recommended attribute and NFSv4 flags
NFSv4: Introduce new label structure
NFSv4: Extend fattr bitmaps to support all 3 words NFS:Add labels to client function prototypes
NFS: Add label lifecycle management
NFS: Client implementation of Labeled-NFS
NFS: Extend NFS xattr handlers to accept the security namespace
NFSD: Server implementation of MAC LabelingSteve Dickson (5):
NFSv4.2: Added v4.2 error codes
NFSv4.2: Added NFS v4.2 support to the NFS client NFSDv4.2: Added NFS v4.2 support to the NFS server
Kconfig: AddKconfigentry for Labeled NFS V4 client
Kconfig: AddKconfigentry for Labeled NFS V4 serverfs/nfs/Kconfig | 28 ++ fs/nfs/callback.c | 1 + fs/nfs/client.c | 2 +- fs/nfs/dir.c | 46 ++- fs/nfs/getroot.c | 2 +- fs/nfs/inode.c | 133 ++++++-- fs/nfs/namespace.c | 2 +- fs/nfs/nfs3acl.c | 4 +- fs/nfs/nfs3proc.c | 41 +-- fs/nfs/nfs4_fs.h | 8 +- fs/nfs/nfs4client.c | 5 + fs/nfs/nfs4namespace.c | 2 +- fs/nfs/nfs4proc.c | 596 ++++++++++++++++++++++++++++++++---- fs/nfs/nfs4xdr.c | 188 +++++++++--- fs/nfs/pnfs.c | 2 +- fs/nfs/proc.c | 15 +- fs/nfs/super.c | 24 +- fs/nfsd/Kconfig | 16 + fs/nfsd/nfs4proc.c | 41 +++ fs/nfsd/nfs4xdr.c | 124 +++++++- fs/nfsd/nfsd.h | 22 +- fs/nfsd/vfs.c | 28 ++ fs/nfsd/vfs.h | 2 + fs/nfsd/xdr4.h | 3 + include/linux/nfs4.h | 20 ++ include/linux/nfs_fs.h | 40 ++- include/linux/nfs_fs_sb.h | 10 +- include/linux/nfs_xdr.h | 30 +- include/linux/security.h | 57 +++- include/uapi/linux/nfs4.h | 2 +- security/capability.c | 19 +- security/security.c | 24 +- security/selinux/hooks.c | 92 +++++- security/selinux/include/security.h | 2 + security/selinux/ss/policydb.c | 5 +- security/smack/smack_lsm.c | 11 + 36 files changed, 1427 insertions(+), 220 deletions(-)
James Morris
maintainerQuoted 5 lines · Ric Wheeler
It would be great to see this patch series land in time for 3.10 - seems like a major feature that has had been held in development for years and it does have a very interested user base waiting for this to land.
Are there any existing roadblocks to having this make it this merge window?
Not that I'm aware of, but I feel they should all go in via the same tree (an NFS one), rather than being split across subsystems, which has been suggested off list. It's better to keep them all in one place where they can be tested and maintained together.
- James
Signature · 2 lines
James Morris <[email protected]>
A message that is not in the archive (sent off-list or not yet received): alpine.LRH.2.02.1305061817290.28613-CK9fWmtY32x9JUWOpEiw7w@public.gmane.org
Quoted 8 lines · James Morris
Quoted 5 lines · Ric Wheeler
It would be great to see this patch series land in time for 3.10 - seems like a major feature that has had been held in development for years and it does have a very interested user base waiting for this to land.
Are there any existing roadblocks to having this make it this merge window?
Quoted 7 lines
Not that I'm aware of, but I feel they should all go in via the same tree (an NFS one), rather than being split across subsystems, which has been suggested off list. It's better to keep them all in one place where they can be tested and maintained together.
- James
Great - are we using Trond's tree and/or Bruce's tree (or both :))?
Regards,
Ric
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 17 lines · Ric Wheeler
Quoted 8 lines · Steve Dickson
From: Steve Dickson <[email protected]>
Here is an the next rlease of the label NFS patches ported to the linux-3.9 release
The following changes were made from the previous release. (Note, only the server patch changed in this release)
Quoted 7 lines
* Remove the buffer overflow in the allocation of labels.
* Removed needless char * casting
* Removed the
-EMSGSIZEtonfs4err_badlabelerrno mapping by changing the return value ofnfsd4_label_alloc()to be a_be32value.
Quoted 6 lines
It would be great to see this patch series land in time for 3.10 - seems like a major feature that has had been held in development for years and it does have a very interested user base waiting for this to land.
Are there any existing roadblocks to having this make it this merge window?
You mean other than the one Bruce and Trond already mentioned and which you presumably already read? i.e. it's a large feature whose final incarnation landed when the merge window was already open which by process should receive incubation in linux-next before being merged.
It is entirely within the gift of the maintainers to vary the incubation requirements, but if they do and it comes back with a ton of problems from the 0 day project or smatch or even a build failure that would have been picked up by linux-next, they'll be at the wrong end of Linus' flame thrower not you. So it is rather unfair to pressure the maintainers like this.
Kernel processes exist for a reason and almost every maintainer has the scars that remind them of this.
James
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 35 lines · James Bottomley
Quoted 16 lines · Ric Wheeler
Quoted 8 lines · Steve Dickson
From: Steve Dickson <[email protected]>
Here is an the next rlease of the label NFS patches ported to the linux-3.9 release
The following changes were made from the previous release. (Note, only the server patch changed in this release)
Quoted 7 lines
* Remove the buffer overflow in the allocation of labels.
* Removed needless char * casting
* Removed the
-EMSGSIZEtonfs4err_badlabelerrno mapping by changing the return value ofnfsd4_label_alloc()to be a_be32value.Quoted 6 lines
It would be great to see this patch series land in time for 3.10 - seems like a major feature that has had been held in development for years and it does have a very interested user base waiting for this to land.
Are there any existing roadblocks to having this make it this merge window?
You mean other than the one Bruce and Trond already mentioned and which you presumably already read? i.e. it's a large feature whose final incarnation landed when the merge window was already open which by process should receive incubation in linux-next before being merged.
It is entirely within the gift of the maintainers to vary the incubation requirements, but if they do and it comes back with a ton of problems from the 0 day project or smatch or even a build failure that would have been picked up by linux-next, they'll be at the wrong end of Linus' flame thrower not you. So it is rather unfair to pressure the maintainers like this.
Quoted 6 lines
Kernel processes exist for a reason and almost every maintainer has the scars that remind them of this.
James
Don't worry James - this one has had at least as much testing as the average SCSI driver update :)
This is was not meant as pressure, James Morris (not you) had replied that his patches are ready and he expected them to be pulled via the NFS trees.
This was meant to facilitate getting this multi-tree, multi-maintainer series ready to merge and make sure we aren't stuck each waiting for a response from the next person in the loop.
Note that this patch set has been in development for *years*, been tested at connectathon, tested by interested parties who promoted the earliest versions of the patches and tested by RHEL (of course, the series has evolved over time).
Ric
Quoted 43 lines · Ric Wheeler
Quoted 35 lines · James Bottomley
Quoted 16 lines · Ric Wheeler
Quoted 8 lines · Steve Dickson
From: Steve Dickson <[email protected]>
Here is an the next rlease of the label NFS patches ported to the linux-3.9 release
The following changes were made from the previous release. (Note, only the server patch changed in this release)
Quoted 7 lines
* Remove the buffer overflow in the allocation of labels.
* Removed needless char * casting
* Removed the
-EMSGSIZEtonfs4err_badlabelerrno mapping by changing the return value ofnfsd4_label_alloc()to be a_be32value.Quoted 6 lines
It would be great to see this patch series land in time for 3.10 - seems like a major feature that has had been held in development for years and it does have a very interested user base waiting for this to land.
Are there any existing roadblocks to having this make it this merge window?
You mean other than the one Bruce and Trond already mentioned and which you presumably already read? i.e. it's a large feature whose final incarnation landed when the merge window was already open which by process should receive incubation in linux-next before being merged.
It is entirely within the gift of the maintainers to vary the incubation requirements, but if they do and it comes back with a ton of problems from the 0 day project or smatch or even a build failure that would have been picked up by linux-next, they'll be at the wrong end of Linus' flame thrower not you. So it is rather unfair to pressure the maintainers like this.
Quoted 6 lines
Kernel processes exist for a reason and almost every maintainer has the scars that remind them of this.
James
Quoted 5 lines
Don't worry James - this one has had at least as much testing as the average SCSI driver update :)
This is was not meant as pressure, James Morris (not you) had replied that his patches are ready and he expected them to be pulled via the NFS trees.
Yes, I know this ... Trond and Bruce both said definitely 3.11 and probably 3.11 respectively, that's why I was surprised to see a 3.10 request.
Quoted 7 lines
This was meant to facilitate getting this multi-tree, multi-maintainer series ready to merge and make sure we aren't stuck each waiting for a response from the next person in the loop.
Note that this patch set has been in development for *years*, been tested at connectathon, tested by interested parties who promoted the earliest versions of the patches and tested by RHEL (of course, the series has evolved over time).
That's good, but not sufficient. A large number of "well tested" big patch sets have failed integration nastily when they were merged over the years. That wasn't because they weren't actually tested, but because as soon as they hit the tree, they caused side effects, or people tried configurations the submitters hadn't or because they tried tests the submitters hadn't thought of. This is why we have an integration process involving linux-next ... to try and find these types of problems *before* merger and that's why large features tend to spend at least a week in linux-next to try to find the issues.
James
Quoted 72 lines · James Bottomley
Quoted 53 lines · Ric Wheeler
Quoted 10 lines · James Bottomley
Quoted 9 lines · Ric Wheeler
Quoted 8 lines · Steve Dickson
From: Steve Dickson <[email protected]>
Here is an the next rlease of the label NFS patches ported to the linux-3.9 release
The following changes were made from the previous release. (Note, only the server patch changed in this release)
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
* Remove the buffer overflow in the allocation of labels.
* Removed needless char * casting
* Removed the
-EMSGSIZEtonfs4err_badlabelerrno mapping by changing the return value ofnfsd4_label_alloc()to be a_be32value.It would be great to see this patch series land in time for 3.10
- seems like a
Quoted 1 line
Quoted 1 line
major feature that has had been held in development for years and
it does have a
Quoted 3 lines
Quoted 3 lines
very interested user base waiting for this to land.
Are there any existing roadblocks to having this make it this
merge
Quoted 2 lines
Quoted 1 line
window?
You mean other than the one Bruce and Trond already mentioned and
which
Quoted 3 lines
you presumably already read? i.e. it's a large feature whose final incarnation landed when the merge window was already open which by process should receive incubation in linux-next before being
merged.
Quoted 2 lines
It is entirely within the gift of the maintainers to vary the
incubation
Quoted 1 line
requirements, but if they do and it comes back with a ton of
problems
Quoted 1 line
from the 0 day project or smatch or even a build failure that
would have
Quoted 1 line
been picked up by linux-next, they'll be at the wrong end of
Linus'
Quoted 4 lines
flame thrower not you. So it is rather unfair to pressure the maintainers like this.
Kernel processes exist for a reason and almost every maintainer
has the
Quoted 5 lines
scars that remind them of this.
James
Quoted 5 lines
Don't worry James - this one has had at least as much testing as the average SCSI driver update :)
This is was not meant as pressure, James Morris (not you) had replied that his patches are ready and he expected them to be pulled via the NFS trees.
Yes, I know this ... Trond and Bruce both said definitely 3.11 and probably 3.11 respectively, that's why I was surprised to see a 3.10 request.
Quoted 7 lines
This was meant to facilitate getting this multi-tree, multi-maintainer series ready to merge and make sure we aren't stuck each waiting for a response from the next person in the loop.
Note that this patch set has been in development for *years*, been tested at connectathon, tested by interested parties who promoted the earliest versions of the patches and tested by RHEL (of course, the series has evolved over time).
Quoted 10 lines
That's good, but not sufficient. A large number of "well tested" big patch sets have failed integration nastily when they were merged over the years. That wasn't because they weren't actually tested, but because as soon as they hit the tree, they caused side effects, or people tried configurations the submitters hadn't or because they tried tests the submitters hadn't thought of. This is why we have an integration process involving linux-next ... to try and find these types of problems *before* merger and that's why large features tend to spend at least a week in linux-next to try to find the issues.
To be fair I doubt you're going to see any new problems on top of what Bruce has already caught. He has done the work to tweak all the knobs to make sure config wise any LNFS features turned on or off don't break NFSv4 both at compile and run-time. On top of that all the security patches are self contained as LNFS is the only user. Finally based on people's knee-jerk reaction to disable SELinux on most of their systems I doubt you're going to get much more testing out of linux-next than we've already done. We already have a wink and a nod from Casey that SMACK has issues with Labeled NFS and that he has no objections to fixing that problem later. All that said its still the maintainer's decision to take it or not and I'd imagine backporting the patches to 3.10 from 3.11 wouldn't be a tremendous amount of work if someone needed it to fall into that specific version. Personally I can't wait for the patches to get merged since I started this project almost 6 years ago at this point. Steve Dickson has picked up the torch and kept running with it since my time no longer permitted me to champion the patch set and I think its ready for use by quite a few customers.
Dave
Dave
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
David,
Thank you for your great effort in making this capability available.
Joe
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of David Quigley
Sent: Sunday, May 12, 2013 4:56 PM
To: James Bottomley
Cc: Ric Wheeler; Steve Dickson; Trond Myklebust; J. Bruce Fields; David P. Quigley; Linux NFS list; Linux FS devel list; Linux Security List; SELinux List; Jack Rieden
Subject: Re: [PATCH 00/17] lnfs: linux-3.9 release
Quoted 74 lines · James Bottomley
Quoted 53 lines · Ric Wheeler
Quoted 10 lines · James Bottomley
Quoted 9 lines · Ric Wheeler
Quoted 8 lines · Steve Dickson
From: Steve Dickson <[email protected]>
Here is an the next rlease of the label NFS patches ported to the linux-3.9 release
The following changes were made from the previous release. (Note, only the server patch changed in this release)
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
* Remove the buffer overflow in the allocation of labels.
* Removed needless char * casting
* Removed the
-EMSGSIZEtonfs4err_badlabelerrno mapping by changing the return value ofnfsd4_label_alloc()to be a_be32value.It would be great to see this patch series land in time for 3.10
- seems like a
Quoted 1 line
Quoted 1 line
major feature that has had been held in development for years and
it does have a
Quoted 3 lines
Quoted 3 lines
very interested user base waiting for this to land.
Are there any existing roadblocks to having this make it this
merge
Quoted 2 lines
Quoted 1 line
window?
You mean other than the one Bruce and Trond already mentioned and
which
Quoted 3 lines
you presumably already read? i.e. it's a large feature whose final incarnation landed when the merge window was already open which by process should receive incubation in linux-next before being
merged.
Quoted 2 lines
It is entirely within the gift of the maintainers to vary the
incubation
Quoted 1 line
requirements, but if they do and it comes back with a ton of
problems
Quoted 1 line
from the 0 day project or smatch or even a build failure that
would have
Quoted 1 line
been picked up by linux-next, they'll be at the wrong end of
Linus'
Quoted 4 lines
flame thrower not you. So it is rather unfair to pressure the maintainers like this.
Kernel processes exist for a reason and almost every maintainer
has the
Quoted 5 lines
scars that remind them of this.
James
Quoted 6 lines
Don't worry James - this one has had at least as much testing as the average SCSI driver update :)
This is was not meant as pressure, James Morris (not you) had replied that his patches are ready and he expected them to be pulled via the NFS trees.
Yes, I know this ... Trond and Bruce both said definitely 3.11 and probably 3.11 respectively, that's why I was surprised to see a 3.10 request.
Quoted 8 lines
This was meant to facilitate getting this multi-tree, multi-maintainer series ready to merge and make sure we aren't stuck each waiting for a response from the next person in the loop.
Note that this patch set has been in development for *years*, been tested at connectathon, tested by interested parties who promoted the earliest versions of the patches and tested by RHEL (of course, the series has evolved over time).
Quoted 10 lines
That's good, but not sufficient. A large number of "well tested" big patch sets have failed integration nastily when they were merged over the years. That wasn't because they weren't actually tested, but because as soon as they hit the tree, they caused side effects, or people tried configurations the submitters hadn't or because they tried tests the submitters hadn't thought of. This is why we have an integration process involving linux-next ... to try and find these types of problems *before* merger and that's why large features tend to spend at least a week in linux-next to try to find the issues.
To be fair I doubt you're going to see any new problems on top of what Bruce has already caught. He has done the work to tweak all the knobs to make sure config wise any LNFS features turned on or off don't break NFSv4 both at compile and run-time. On top of that all the security patches are self contained as LNFS is the only user. Finally based on people's knee-jerk reaction to disable SELinux on most of their systems I doubt you're going to get much more testing out of linux-next than we've already done. We already have a wink and a nod from Casey that SMACK has issues with Labeled NFS and that he has no objections to fixing that problem later. All that said its still the maintainer's decision to take it or not and I'd imagine backporting the patches to 3.10 from 3.11 wouldn't be a tremendous amount of work if someone needed it to fall into that specific version. Personally I can't wait for the patches to get merged since I started this project almost 6 years ago at this point. Steve Dickson has picked up the torch and kept running with it since my time no longer permitted me to champion the patch set and I think its ready for use by quite a few customers.
Dave
Dave
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.