Skip to content

Commit

Permalink
NFS: Do some tidying of the parsing code
Browse files Browse the repository at this point in the history 
Do some tidying of the parsing code, including:

 (*) Returning 0/error rather than true/false.

 (*) Putting the nfs_fs_context pointer first in some arg lists.

 (*) Unwrap some lines that will now fit on one line.

 (*) Provide unioned sockaddr/sockaddr_storage fields to avoid casts.

 (*) nfs_parse_devname() can paste its return values directly into the
     nfs_fs_context struct as that's where the caller puts them.

Signed-off-by: David Howells <[email protected]>
Signed-off-by: Al Viro <[email protected]>
Signed-off-by: Anna Schumaker <[email protected]>
  • Loading branch information
@dhowells @amschuma-ntap
dhowells authored and amschuma-ntap committed Jan 15, 2020
1 parent 48be8a6 commit e558100
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 78 deletions.
126 changes: 54 additions & 72 deletions fs/nfs/fs_context.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,35 +343,37 @@ static void nfs_set_mount_transport_protocol(struct nfs_fs_context *ctx)
* Add 'flavor' to 'auth_info' if not already present.
* Returns true if 'flavor' ends up in the list, false otherwise
*/
static bool nfs_auth_info_add(struct nfs_auth_info *auth_info,
rpc_authflavor_t flavor)
static int nfs_auth_info_add(struct nfs_fs_context *ctx,
struct nfs_auth_info *auth_info,
rpc_authflavor_t flavor)
{
unsigned int i;
unsigned int max_flavor_len = ARRAY_SIZE(auth_info->flavors);

/* make sure this flavor isn't already in the list */
for (i = 0; i < auth_info->flavor_len; i++) {
if (flavor == auth_info->flavors[i])
return true;
return 0;
}

if (auth_info->flavor_len + 1 >= max_flavor_len) {
dfprintk(MOUNT, "NFS: too many sec= flavors\n");
return false;
return -EINVAL;
}

auth_info->flavors[auth_info->flavor_len++] = flavor;
return true;
return 0;
}

/*
* Parse the value of the 'sec=' option.
*/
static int nfs_parse_security_flavors(char *value, struct nfs_fs_context *ctx)
static int nfs_parse_security_flavors(struct nfs_fs_context *ctx, char *value)
{
substring_t args[MAX_OPT_ARGS];
rpc_authflavor_t pseudoflavor;
char *p;
int ret;

dfprintk(MOUNT, "NFS: parsing sec=%s option\n", value);

Expand Down Expand Up @@ -413,19 +415,20 @@ static int nfs_parse_security_flavors(char *value, struct nfs_fs_context *ctx)
default:
dfprintk(MOUNT,
"NFS: sec= option '%s' not recognized\n", p);
return 0;
return -EINVAL;
}

if (!nfs_auth_info_add(&ctx->auth_info, pseudoflavor))
return 0;
ret = nfs_auth_info_add(ctx, &ctx->auth_info, pseudoflavor);
if (ret < 0)
return ret;
}

return 1;
return 0;
}

static int nfs_parse_version_string(char *string,
struct nfs_fs_context *ctx,
substring_t *args)
static int nfs_parse_version_string(struct nfs_fs_context *ctx,
char *string,
substring_t *args)
{
ctx->flags &= ~NFS_MOUNT_VER3;
switch (match_token(string, nfs_vers_tokens, args)) {
Expand Down Expand Up @@ -456,9 +459,10 @@ static int nfs_parse_version_string(char *string,
ctx->minorversion = 2;
break;
default:
return 0;
dfprintk(MOUNT, "NFS: Unsupported NFS version\n");
return -EINVAL;
}
return 1;
return 0;
}

static int nfs_get_option_str(substring_t args[], char **option)
Expand Down Expand Up @@ -513,7 +517,7 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
{
substring_t args[MAX_OPT_ARGS];
char *string;
int token, rc;
int token, ret;

dfprintk(MOUNT, "NFS: parsing nfs mount option '%s'\n", p);

Expand Down Expand Up @@ -553,13 +557,11 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
break;
case Opt_lock:
ctx->flags &= ~NFS_MOUNT_NONLM;
ctx->flags &= ~(NFS_MOUNT_LOCAL_FLOCK |
NFS_MOUNT_LOCAL_FCNTL);
ctx->flags &= ~(NFS_MOUNT_LOCAL_FLOCK | NFS_MOUNT_LOCAL_FCNTL);
break;
case Opt_nolock:
ctx->flags |= NFS_MOUNT_NONLM;
ctx->flags |= (NFS_MOUNT_LOCAL_FLOCK |
NFS_MOUNT_LOCAL_FCNTL);
ctx->flags |= (NFS_MOUNT_LOCAL_FLOCK | NFS_MOUNT_LOCAL_FCNTL);
break;
case Opt_udp:
ctx->flags &= ~NFS_MOUNT_TCP;
Expand Down Expand Up @@ -692,29 +694,25 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
string = match_strdup(args);
if (string == NULL)
goto out_nomem;
rc = nfs_parse_version_string(string, ctx, args);
ret = nfs_parse_version_string(ctx, string, args);
kfree(string);
if (!rc)
goto out_invalid_value;
if (ret < 0)
return ret;
break;
case Opt_sec:
string = match_strdup(args);
if (string == NULL)
goto out_nomem;
rc = nfs_parse_security_flavors(string, ctx);
ret = nfs_parse_security_flavors(ctx, string);
kfree(string);
if (!rc) {
dfprintk(MOUNT, "NFS: unrecognized "
"security flavor\n");
return -EINVAL;
}
if (ret < 0)
return ret;
break;
case Opt_proto:
string = match_strdup(args);
if (string == NULL)
goto out_nomem;
token = match_token(string,
nfs_xprt_protocol_tokens, args);
token = match_token(string, nfs_xprt_protocol_tokens, args);

ctx->protofamily = AF_INET;
switch (token) {
Expand Down Expand Up @@ -742,9 +740,8 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
xprt_load_transport(string);
break;
default:
dfprintk(MOUNT, "NFS: unrecognized "
"transport protocol\n");
kfree(string);
dfprintk(MOUNT, "NFS: unrecognized transport protocol\n");
return -EINVAL;
}
kfree(string);
Expand All @@ -753,8 +750,7 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
string = match_strdup(args);
if (string == NULL)
goto out_nomem;
token = match_token(string,
nfs_xprt_protocol_tokens, args);
token = match_token(string, nfs_xprt_protocol_tokens, args);
kfree(string);

ctx->mountfamily = AF_INET;
Expand All @@ -773,8 +769,7 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
break;
case Opt_xprt_rdma: /* not used for side protocols */
default:
dfprintk(MOUNT, "NFS: unrecognized "
"transport protocol\n");
dfprintk(MOUNT, "NFS: unrecognized transport protocol\n");
return -EINVAL;
}
break;
Expand All @@ -784,9 +779,8 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
goto out_nomem;
ctx->nfs_server.addrlen =
rpc_pton(ctx->net, string, strlen(string),
(struct sockaddr *)
&ctx->nfs_server.address,
sizeof(ctx->nfs_server.address));
sizeof(ctx->nfs_server._address));
kfree(string);
if (ctx->nfs_server.addrlen == 0)
goto out_invalid_address;
Expand All @@ -796,8 +790,7 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
goto out_nomem;
break;
case Opt_mounthost:
if (nfs_get_option_str(args,
&ctx->mount_server.hostname))
if (nfs_get_option_str(args, &ctx->mount_server.hostname))
goto out_nomem;
break;
case Opt_mountaddr:
Expand All @@ -806,9 +799,8 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
goto out_nomem;
ctx->mount_server.addrlen =
rpc_pton(ctx->net, string, strlen(string),
(struct sockaddr *)
&ctx->mount_server.address,
sizeof(ctx->mount_server.address));
sizeof(ctx->mount_server._address));
kfree(string);
if (ctx->mount_server.addrlen == 0)
goto out_invalid_address;
Expand All @@ -822,8 +814,7 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
string = match_strdup(args);
if (string == NULL)
goto out_nomem;
token = match_token(string,
nfs_lookupcache_tokens, args);
token = match_token(string, nfs_lookupcache_tokens, args);
kfree(string);
switch (token) {
case Opt_lookupcache_all:
Expand All @@ -837,8 +828,7 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
ctx->flags |= NFS_MOUNT_LOOKUP_CACHE_NONEG|NFS_MOUNT_LOOKUP_CACHE_NONE;
break;
default:
dfprintk(MOUNT, "NFS: invalid "
"lookupcache argument\n");
dfprintk(MOUNT, "NFS: invalid lookupcache argument\n");
return -EINVAL;
}
break;
Expand All @@ -851,8 +841,7 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
string = match_strdup(args);
if (string == NULL)
goto out_nomem;
token = match_token(string, nfs_local_lock_tokens,
args);
token = match_token(string, nfs_local_lock_tokens, args);
kfree(string);
switch (token) {
case Opt_local_lock_all:
Expand All @@ -870,8 +859,7 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
NFS_MOUNT_LOCAL_FCNTL);
break;
default:
dfprintk(MOUNT, "NFS: invalid "
"local_lock argument\n");
dfprintk(MOUNT, "NFS: invalid local_lock argument\n");
return -EINVAL;
}
break;
Expand All @@ -885,13 +873,11 @@ static int nfs_fs_context_parse_option(struct nfs_fs_context *ctx, char *p)
break;
case Opt_userspace:
case Opt_deprecated:
dfprintk(MOUNT, "NFS: ignoring mount option "
"'%s'\n", p);
dfprintk(MOUNT, "NFS: ignoring mount option '%s'\n", p);
break;

default:
dfprintk(MOUNT, "NFS: unrecognized mount option "
"'%s'\n", p);
dfprintk(MOUNT, "NFS: unrecognized mount option '%s'\n", p);
return -EINVAL;
}

Expand Down Expand Up @@ -951,15 +937,15 @@ int nfs_parse_mount_options(char *raw, struct nfs_fs_context *ctx)
* families in the addr=/mountaddr= options.
*/
if (ctx->protofamily != AF_UNSPEC &&
ctx->protofamily != ctx->nfs_server.address.ss_family)
ctx->protofamily != ctx->nfs_server.address.sa_family)
goto out_proto_mismatch;

if (ctx->mountfamily != AF_UNSPEC) {
if (ctx->mount_server.addrlen) {
if (ctx->mountfamily != ctx->mount_server.address.ss_family)
if (ctx->mountfamily != ctx->mount_server.address.sa_family)
goto out_mountproto_mismatch;
} else {
if (ctx->mountfamily != ctx->nfs_server.address.ss_family)
if (ctx->mountfamily != ctx->nfs_server.address.sa_family)
goto out_mountproto_mismatch;
}
}
Expand Down Expand Up @@ -995,9 +981,9 @@ int nfs_parse_mount_options(char *raw, struct nfs_fs_context *ctx)
*
* Note: caller frees hostname and export path, even on error.
*/
static int nfs_parse_devname(const char *dev_name,
char **hostname, size_t maxnamlen,
char **export_path, size_t maxpathlen)
static int nfs_parse_devname(struct nfs_fs_context *ctx,
const char *dev_name,
size_t maxnamlen, size_t maxpathlen)
{
size_t len;
char *end;
Expand Down Expand Up @@ -1033,17 +1019,17 @@ static int nfs_parse_devname(const char *dev_name,
goto out_hostname;

/* N.B. caller will free nfs_server.hostname in all cases */
*hostname = kstrndup(dev_name, len, GFP_KERNEL);
if (*hostname == NULL)
ctx->nfs_server.hostname = kmemdup_nul(dev_name, len, GFP_KERNEL);
if (!ctx->nfs_server.hostname)
goto out_nomem;
len = strlen(++end);
if (len > maxpathlen)
goto out_path;
*export_path = kstrndup(end, len, GFP_KERNEL);
if (!*export_path)
ctx->nfs_server.export_path = kmemdup_nul(end, len, GFP_KERNEL);
if (!ctx->nfs_server.export_path)
goto out_nomem;

dfprintk(MOUNT, "NFS: MNTPATH: '%s'\n", *export_path);
dfprintk(MOUNT, "NFS: MNTPATH: '%s'\n", ctx->nfs_server.export_path);
return 0;

out_bad_devname:
Expand All @@ -1064,7 +1050,7 @@ static int nfs_parse_devname(const char *dev_name,
}

/*
* Validate the NFS2/NFS3 mount data
* Parse monolithic NFS2/NFS3 mount data
* - fills in the mount root filehandle
*
* For option strings, user space handles the following behaviors:
Expand Down Expand Up @@ -1393,11 +1379,7 @@ int nfs_validate_text_mount_data(void *options,

nfs_set_port(sap, &ctx->nfs_server.port, port);

return nfs_parse_devname(dev_name,
&ctx->nfs_server.hostname,
max_namelen,
&ctx->nfs_server.export_path,
max_pathlen);
return nfs_parse_devname(ctx, dev_name, max_namelen, max_pathlen);

#if !IS_ENABLED(CONFIG_NFS_V4)
out_v4_not_compiled:
Expand Down
16 changes: 11 additions & 5 deletions fs/nfs/internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ struct nfs_client_initdata {
* In-kernel mount arguments
*/
struct nfs_fs_context {
int flags;
unsigned int flags; /* NFS{,4}_MOUNT_* flags */
unsigned int rsize, wsize;
unsigned int timeo, retrans;
unsigned int acregmin, acregmax,
acdirmin, acdirmax;
unsigned int acregmin, acregmax;
unsigned int acdirmin, acdirmax;
unsigned int namlen;
unsigned int options;
unsigned int bsize;
Expand All @@ -102,7 +102,10 @@ struct nfs_fs_context {
bool sloppy;

struct {
struct sockaddr_storage address;
union {
struct sockaddr address;
struct sockaddr_storage _address;
};
size_t addrlen;
char *hostname;
u32 version;
Expand All @@ -111,7 +114,10 @@ struct nfs_fs_context {
} mount_server;

struct {
struct sockaddr_storage address;
union {
struct sockaddr address;
struct sockaddr_storage _address;
};
size_t addrlen;
char *hostname;
char *export_path;
Expand Down
2 changes: 1 addition & 1 deletion fs/nfs/super.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ static int nfs_request_mount(struct nfs_fs_context *cfg,
/*
* Construct the mount server's address.
*/
if (cfg->mount_server.address.ss_family == AF_UNSPEC) {
if (cfg->mount_server.address.sa_family == AF_UNSPEC) {
memcpy(request.sap, &cfg->nfs_server.address,
cfg->nfs_server.addrlen);
cfg->mount_server.addrlen = cfg->nfs_server.addrlen;
Expand Down

0 comments on commit e558100

Please sign in to comment.