NFS: Add support for multiple sec= mount options
Subsystems (2)
cover NFS: Add support for multiple sec= mount options
I split up this patchset into multiple patches as Trond requested.
This also has a few changes:
- stop using NFS_MOUNT_SECFLAVOUR server flag
- This flag was now redundant (auth_info stored on nfs_server).
- more consistent use of selected_flavor
- It didn't need to be set in nfs_parse_security_flavors
- NFSv4 wasn't setting is as it just picked the first flavor in nfs4_init_server then depends on SECINFO. nfs4_init_server now sets it for consistency. The reason we need selected_flavor is for the mount client to be able to save it's selection (for nfs < 4.0).
Again, I created a script to test mount options which has been posted to the list as a patch to nfs-ordeal.
-dros
Weston Andros Adamson (5):
NFSv4: make nfs_find_best_sec static
NFS: separate passed security flavs from selected
NFS: cache parsed auth_info in nfs_server
NFS: stop using NFS_MOUNT_SECFLAVOUR server flag
NFS: add support for multiple sec= mount options
fs/nfs/client.c | 5 +- fs/nfs/internal.h | 5 +- fs/nfs/nfs4_fs.h | 1 - fs/nfs/nfs4client.c | 26 ++++-- fs/nfs/nfs4namespace.c | 17 +++- fs/nfs/nfs4proc.c | 32 ++++--- fs/nfs/super.c | 189 +++++++++++++++++++++++++---------------- include/linux/nfs_fs_sb.h | 1 + include/linux/nfs_xdr.h | 7 ++ include/uapi/linux/nfs_mount.h | 2 +- 10 files changed, 184 insertions(+), 101 deletions(-)
Signature · 1 line
1.7.12.4 (Apple Git-37)
PATCH 1/5 NFSv4: make nfs_find_best_sec static
It's not used outside of nfs4namespace.c anymore.
--- fs/nfs/nfs4_fs.h | 1 - fs/nfs/nfs4namespace.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
fs/nfs/nfs4_fs.h +0 -1
@@ -213,7 +213,6 @@ int nfs_atomic_open(struct inode *, struct dentry *, struct file *,extern struct file_system_type nfs4_fs_type;/* nfs4namespace.c */ -rpc_authflavor_t nfs_find_best_sec (struct nfs4_secinfo_flavors *);struct rpc_clnt *nfs4_create_sec_client (struct rpc_clnt *,struct inode *,struct qstr *);struct vfsmount *nfs4_submount (struct nfs_server *,struct dentry *,struct nfs_fh *,struct nfs_fattr *);
fs/nfs/nfs4namespace.c +1 -1
@@ -145,7 +145,7 @@ static size_t nfs_parse_server_name(char *string, size_t len,* is searched in the order returned from the server, per RFC 3530 * recommendation. */ -rpc_authflavor_t nfs_find_best_sec (struct nfs4_secinfo_flavors *flavors) +static rpc_authflavor_t nfs_find_best_sec (struct nfs4_secinfo_flavors *flavors) {rpc_authflavor_t pseudoflavor;struct nfs4_secinfo4 *secinfo;
Signature · 1 line
1.7.12.4 (Apple Git-37)
PATCH 2/5 NFS: separate passed security flavs from selected
In reply to Weston Andros AdamsonWhen filling parsed_mount_data, store the parsed sec= mount option in the new struct nfs_auth_info and the chosen flavor in selected_flavor.
This patch lays the groundwork for supporting multiple sec= options.
--- fs/nfs/client.c | 3 ++- fs/nfs/internal.h | 4 ++-- fs/nfs/nfs4client.c | 16 +++++++++------- fs/nfs/super.c | 47 ++++++++++++++++++++++------------------------- include/linux/nfs_xdr.h | 6 ++++++ 5 files changed, 41 insertions(+), 35 deletions(-)
fs/nfs/client.c +2 -1
@@ -787,7 +787,8 @@ static int nfs_init_server(struct nfs_server *server, server->port = data->nfs_server.port; - error =nfs_init_server_rpcclient (server, &timeparms, data->auth_flavors[0 ]); + error =nfs_init_server_rpcclient (server, &timeparms, + data->selected_flavor);if (error <0 ) goto error;
fs/nfs/internal.h +2 -2
@@ -88,8 +88,8 @@ struct nfs_parsed_mount_data {unsigned int namlen;unsigned int options;unsigned int bsize; -unsigned int auth_flavor_len; -rpc_authflavor_t auth_flavors[1 ]; +struct nfs_auth_info auth_info; +rpc_authflavor_t selected_flavor;char *client_address;unsigned int version;unsigned int minorversion;
fs/nfs/nfs4client.c +9 -7
@@ -948,9 +948,8 @@ out:* Create a version 4 volume record */ static int nfs4_init_server (struct nfs_server *server, -const struct nfs_parsed_mount_data *data) +struct nfs_parsed_mount_data *data) { -rpc_authflavor_t pseudoflavor =RPC_AUTH_UNIX ;struct rpc_timeout timeparms;int error;
@@ -963,8 +962,10 @@ static int nfs4_init_server(struct nfs_server *server, server->flags = data->flags; server->options = data->options; -if (data->auth_flavor_len >=1 ) - pseudoflavor = data->auth_flavors[0 ]; +if (data->auth_info.flavor_len >=1 ) + data->selected_flavor = data->auth_info.flavors[0 ]; +else + data->selected_flavor =RPC_AUTH_UNIX ;/* Get a client record */ error = nfs4_set_client(server,
@@ -972,7 +973,7 @@ static int nfs4_init_server(struct nfs_server *server, (const struct sockaddr *)&data->nfs_server.address, data->nfs_server.addrlen, data->client_address, - pseudoflavor, + data->selected_flavor, data->nfs_server.protocol, &timeparms, data->minorversion,
@@ -992,7 +993,8 @@ static int nfs4_init_server(struct nfs_server *server, server->port = data->nfs_server.port; - error =nfs_init_server_rpcclient (server, &timeparms, pseudoflavor); + error =nfs_init_server_rpcclient (server, &timeparms, + data->selected_flavor); error:/* Done */
@@ -1019,7 +1021,7 @@ struct nfs_server *nfs4_create_server(struct nfs_mount_info *mount_info,if (!server)return ERR_PTR (-ENOMEM ); - auth_probe = mount_info->parsed->auth_flavor_len <1 ; + auth_probe = mount_info->parsed->auth_info.flavor_len <1 ;/* set up the general RPC client */ error =nfs4_init_server (server, mount_info->parsed);
fs/nfs/super.c +22 -25
136 lines not on this page · raw message
include/linux/nfs_xdr.h +6 -0
@@ -591,6 +591,12 @@ struct nfs_renameres {struct nfs_fattr *new_fattr; }; +/* parsed sec= options */ +struct nfs_auth_info { +unsigned int flavor_len; +rpc_authflavor_t flavors[1 ]; +}; +/* * Argument struct for decode_entry function */
Signature · 1 line
1.7.12.4 (Apple Git-37)
PATCH 3/5 NFS: cache parsed auth_info in nfs_server
In reply to Weston Andros AdamsonCache the auth_info structure in nfs_server and pass these values to submounts.
This lays the groundwork for supporting multiple sec= options.
--- fs/nfs/client.c | 2 ++ fs/nfs/nfs4client.c | 1 + fs/nfs/super.c | 3 +-- include/linux/nfs_fs_sb.h | 1 + 4 files changed, 5 insertions(+), 2 deletions(-)
fs/nfs/client.c +2 -0
@@ -786,6 +786,7 @@ static int nfs_init_server(struct nfs_server *server, goto error; server->port = data->nfs_server.port; + server->auth_info = data->auth_info; error =nfs_init_server_rpcclient (server, &timeparms, data->selected_flavor);
@@ -929,6 +930,7 @@ void nfs_server_copy_userdata(struct nfs_server *target, struct nfs_server *sour target->acdirmax = source->acdirmax; target->caps = source->caps; target->options = source->options; + target->auth_info = source->auth_info; }EXPORT_SYMBOL_GPL (nfs_server_copy_userdata);
fs/nfs/nfs4client.c +1 -0
@@ -961,6 +961,7 @@ static int nfs4_init_server(struct nfs_server *server,/* Initialise the client representation from the mount data */ server->flags = data->flags; server->options = data->options; + server->auth_info = data->auth_info;if (data->auth_info.flavor_len >=1 ) data->selected_flavor = data->auth_info.flavors[0 ];
fs/nfs/super.c +1 -2
@@ -2185,8 +2185,7 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data) data->wsize = nfss->wsize; data->retrans = nfss->client->cl_timeout->to_retries; data->selected_flavor = nfss->client->cl_auth->au_flavor; - data->auth_info.flavors[0 ] = nfss->client->cl_auth->au_flavor; - data->auth_info.flavor_len =1 ; + data->auth_info = nfss->auth_info; data->acregmin = nfss->acregmin /HZ ; data->acregmax = nfss->acregmax /HZ ; data->acdirmin = nfss->acdirmin /HZ ;
include/linux/nfs_fs_sb.h +1 -0
@@ -149,6 +149,7 @@ struct nfs_server {struct timespec time_delta;/* smallest time granularity */ unsigned long mount_time;/* when this fs was mounted */ dev_t s_dev;/* superblock dev numbers */ +struct nfs_auth_info auth_info;/* parsed auth flavors */ #ifdef CONFIG_NFS_FSCACHE struct nfs_fscache_key *fscache_key;/* unique key for superblock */
Signature · 1 line
1.7.12.4 (Apple Git-37)
PATCH 4/5 NFS: stop using NFS_MOUNT_SECFLAVOUR server flag
In reply to Weston Andros AdamsonSince the parsed sec= flavor is now stored in nfs_server->auth_info, we no longer need an nfs_server flag to determine if a sec= option was used.
This flag has not been completely removed because it is still needed for the (old but still supported) non-text parsed mount options ABI compatability.
--- fs/nfs/nfs4client.c | 6 ++++-- fs/nfs/nfs4namespace.c | 2 +- fs/nfs/nfs4proc.c | 4 ++-- fs/nfs/super.c | 3 +-- include/uapi/linux/nfs_mount.h | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-)
fs/nfs/nfs4client.c +4 -2
@@ -1050,6 +1050,7 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data, {struct nfs_client *parent_client;struct nfs_server *server, *parent_server; +bool auth_probe;int error;dprintk ("--> nfs4_create_referral_server()\n" );
@@ -1082,8 +1083,9 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data,if (error <0 ) goto error; - error =nfs4_server_common_setup (server, mntfh, - !(parent_server->flags &NFS_MOUNT_SECFLAVOUR )); + auth_probe = parent_server->auth_info.flavor_len <1 ; + + error =nfs4_server_common_setup (server, mntfh, auth_probe);if (error <0 ) goto error;
fs/nfs/nfs4namespace.c +1 -1
@@ -390,7 +390,7 @@ struct vfsmount *nfs4_submount(struct nfs_server *server, struct dentry *dentry,if (client->cl_auth->au_flavor != flavor) flavor = client->cl_auth->au_flavor; -else if (!(server->flags &NFS_MOUNT_SECFLAVOUR )) { +else if (server->auth_info.flavor_len ==0 ) {rpc_authflavor_t new =nfs4_negotiate_security (dir, name);if ((int )new >=0 ) flavor = new;
fs/nfs/nfs4proc.c +2 -2
@@ -2911,7 +2911,7 @@ int nfs4_proc_get_rootfh(struct nfs_server *server, struct nfs_fh *fhandle,if (status != -NFS4ERR_WRONGSEC )break ;/* Did user force a 'sec=' mount option? */ -if (server->flags &NFS_MOUNT_SECFLAVOUR ) +if (server->auth_info.flavor_len >0 )break ;default : status =nfs4_do_find_root_sec (server, fhandle, info);
@@ -3166,7 +3166,7 @@ static int nfs4_proc_lookup_common(struct rpc_clnt **clnt, struct inode *dir,if (client != *clnt) goto out;/* No security negotiation if the user specified 'sec=' */ -if (NFS_SERVER (dir)->flags &NFS_MOUNT_SECFLAVOUR ) +if (NFS_SERVER (dir)->auth_info.flavor_len >0 ) goto out; client =nfs4_create_sec_client (client, dir, name);if (IS_ERR (client))
fs/nfs/super.c +1 -2
@@ -1067,7 +1067,6 @@ static int nfs_parse_security_flavors(char *value,return 0 ; } - mnt->flags |=NFS_MOUNT_SECFLAVOUR ; mnt->auth_info.flavors[0 ] = pseudoflavor; mnt->auth_info.flavor_len =1 ;return 1 ;
@@ -2328,7 +2327,7 @@ static int nfs_compare_mount_options(const struct super_block *s, const struct n goto Ebusy;if (a->acdirmax != b->acdirmax) goto Ebusy; -if (b->flags &NFS_MOUNT_SECFLAVOUR && +if (b->auth_info.flavor_len >0 && clnt_a->cl_auth->au_flavor != clnt_b->cl_auth->au_flavor) goto Ebusy;return 1 ;
include/uapi/linux/nfs_mount.h +1 -1
@@ -60,7 +60,7 @@ struct nfs_mount_data {#define NFS_MOUNT_BROKEN_SUID 0x0400/* 4 */ #define NFS_MOUNT_NOACL 0x0800/* 4 */ #define NFS_MOUNT_STRICTLOCK 0x1000/* reserved for NFSv4 */ -#define NFS_MOUNT_SECFLAVOUR 0x2000/* 5 */ +#define NFS_MOUNT_SECFLAVOUR 0x2000/* 5 non-text parsed mount data only */ #define NFS_MOUNT_NORDIRPLUS 0x4000/* 5 */ #define NFS_MOUNT_UNSHARED 0x8000/* 5 */ #define NFS_MOUNT_FLAGMASK 0xFFFF
Signature · 1 line
1.7.12.4 (Apple Git-37)
PATCH 5/5 NFS: add support for multiple sec= mount options
In reply to Weston Andros AdamsonThis patch adds support for multiple security options which can be specified using a colon-delimited list of security flavors (the same syntax as nfsd's exports file).
This is useful, for instance, when NFSv4.x mounts cross SECINFO boundaries. With this patch a user can use "sec=krb5i,krb5p" to mount a remote filesystem using krb5i, but can still cross into krb5p-only exports.
New mounts will try all security options before failing. NFSv4.x SECINFO results will be compared against the sec= flavors to find the first flavor in both lists or if no match is found will return -EPERM.
--- fs/nfs/internal.h | 1 + fs/nfs/nfs4client.c | 3 + fs/nfs/nfs4namespace.c | 17 +++-- fs/nfs/nfs4proc.c | 32 ++++++---- fs/nfs/super.c | 160 +++++++++++++++++++++++++++++++----------------- include/linux/nfs_xdr.h | 3 +- 6 files changed, 145 insertions(+), 71 deletions(-)
fs/nfs/internal.h +1 -0
@@ -323,6 +323,7 @@ extern struct file_system_type nfs_xdev_fs_type;extern struct file_system_type nfs4_xdev_fs_type;extern struct file_system_type nfs4_referral_fs_type;#endif +bool nfs_auth_info_match (const struct nfs_auth_info *,rpc_authflavor_t );struct dentry *nfs_try_mount (int ,const char *,struct nfs_mount_info *,struct nfs_subversion *);void nfs_initialise_sb (struct super_block *);
fs/nfs/nfs4client.c +3 -0
@@ -963,6 +963,9 @@ static int nfs4_init_server(struct nfs_server *server, server->options = data->options; server->auth_info = data->auth_info; +/* Use the first specified auth flavor. If this flavor isn't +* allowed by the server, use the SECINFO path to try the +* other specified flavors */ if (data->auth_info.flavor_len >=1 ) data->selected_flavor = data->auth_info.flavors[0 ];else
fs/nfs/nfs4namespace.c +13 -4
@@ -137,6 +137,7 @@ static size_t nfs_parse_server_name(char *string, size_t len,/** * nfs_find_best_sec - Find a security mechanism supported locally +* @server: NFS server struct * @flavors: List of security tuples returned by SECINFO procedure * * Return the pseudoflavor of the first security mechanism in
@@ -145,7 +146,8 @@ static size_t nfs_parse_server_name(char *string, size_t len,* is searched in the order returned from the server, per RFC 3530 * recommendation. */ -static rpc_authflavor_t nfs_find_best_sec (struct nfs4_secinfo_flavors *flavors) +static rpc_authflavor_t nfs_find_best_sec (struct nfs_server *server, +struct nfs4_secinfo_flavors *flavors) {rpc_authflavor_t pseudoflavor;struct nfs4_secinfo4 *secinfo;
@@ -160,12 +162,19 @@ static rpc_authflavor_t nfs_find_best_sec(struct nfs4_secinfo_flavors *flavors)case RPC_AUTH_GSS : pseudoflavor =rpcauth_get_pseudoflavor (secinfo->flavor, &secinfo->flavor_info); -if (pseudoflavor !=RPC_AUTH_MAXFLAVOR ) +/* make sure pseudoflavor matches sec= mount opt */ +if (pseudoflavor !=RPC_AUTH_MAXFLAVOR && +nfs_auth_info_match (&server->auth_info, + pseudoflavor))return pseudoflavor;break ; } } +/* if there were any sec= options then nothing matched */ +if (server->auth_info.flavor_len >0 ) +return -EPERM ; +return RPC_AUTH_UNIX ; }
@@ -187,7 +196,7 @@ static rpc_authflavor_t nfs4_negotiate_security(struct inode *inode, struct qstr goto out; } - flavor =nfs_find_best_sec (flavors); + flavor =nfs_find_best_sec (NFS_SERVER (inode), flavors); out:put_page (page);
@@ -390,7 +399,7 @@ struct vfsmount *nfs4_submount(struct nfs_server *server, struct dentry *dentry,if (client->cl_auth->au_flavor != flavor) flavor = client->cl_auth->au_flavor; -else if (server->auth_info.flavor_len ==0 ) { +else {rpc_authflavor_t new =nfs4_negotiate_security (dir, name);if ((int )new >=0 ) flavor = new;
fs/nfs/nfs4proc.c +21 -11
@@ -2864,11 +2864,24 @@ static int nfs4_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,int status = -EPERM ;size_t i; -for (i =0 ; i <ARRAY_SIZE (flav_array); i++) { - status =nfs4_lookup_root_sec (server, fhandle, info, flav_array[i]); -if (status == -NFS4ERR_WRONGSEC || status == -EACCES ) -continue ; -break ; +if (server->auth_info.flavor_len >0 ) { +/* try each flavor specified by user */ +for (i =0 ; i < server->auth_info.flavor_len; i++) { + status =nfs4_lookup_root_sec (server, fhandle, info, + server->auth_info.flavors[i]); +if (status == -NFS4ERR_WRONGSEC || status == -EACCES ) +continue ; +break ; + } + }else { +/* no flavors specified by user, try default list */ +for (i =0 ; i <ARRAY_SIZE (flav_array); i++) { + status =nfs4_lookup_root_sec (server, fhandle, info, + flav_array[i]); +if (status == -NFS4ERR_WRONGSEC || status == -EACCES ) +continue ; +break ; + } }/*
@@ -2910,9 +2923,6 @@ int nfs4_proc_get_rootfh(struct nfs_server *server, struct nfs_fh *fhandle, status =nfs4_lookup_root (server, fhandle, info);if (status != -NFS4ERR_WRONGSEC )break ; -/* Did user force a 'sec=' mount option? */ -if (server->auth_info.flavor_len >0 ) -break ;default : status =nfs4_do_find_root_sec (server, fhandle, info); }
@@ -3165,9 +3175,6 @@ static int nfs4_proc_lookup_common(struct rpc_clnt **clnt, struct inode *dir, err = -EPERM ;if (client != *clnt) goto out; -/* No security negotiation if the user specified 'sec=' */ -if (NFS_SERVER (dir)->auth_info.flavor_len >0 ) - goto out; client =nfs4_create_sec_client (client, dir, name);if (IS_ERR (client))return PTR_ERR (client);
@@ -7617,6 +7624,9 @@ nfs41_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,break ; } +if (!nfs_auth_info_match (&server->auth_info, flavor)) + flavor =RPC_AUTH_MAXFLAVOR ; +if (flavor !=RPC_AUTH_MAXFLAVOR ) { err =nfs4_lookup_root_sec (server, fhandle, info, flavor);
fs/nfs/super.c +105 -55
222 lines not on this page · raw message
include/linux/nfs_xdr.h +2 -1
@@ -592,9 +592,10 @@ struct nfs_renameres { };/* parsed sec= options */ +#define NFS_AUTH_INFO_MAX_FLAVORS 12/* see fs/nfs/super.c */ struct nfs_auth_info {unsigned int flavor_len; -rpc_authflavor_t flavors[1 ]; +rpc_authflavor_t flavors[NFS_AUTH_INFO_MAX_FLAVORS ]; };/*
Signature · 1 line
1.7.12.4 (Apple Git-37)