GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-30 19:15:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs/9p: Fix invalid mount options/args

Browse source 
Without this fix, if any invalid mount options/args are passed while mouting
the 9p fs, no error (-EINVAL) is returned and default arg value is assigned.

This fix returns -EINVAL when an invalid arguement is found while parsing
mount options.

Signed-off-by: Prem Karat <prem.karat@linux.vnet.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
This commit is contained in:
Prem Karat 2011-05-06 18:24:18 +05:30 • committed by Eric Van Hensbergen
parent fd2421f544
commit a2dd43bb0d
1 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
fs/9p/v9fs.c
View file

@ -78,6 +78,25 @@ static const match_table_t tokens = {
{Opt_err, NULL} {Opt_err, NULL}
}; };
/* Interpret mount options for cache mode */
static int get_cache_mode(char *s)
{
int version = -EINVAL;
if (!strcmp(s, "loose")) {
version = CACHE_LOOSE;
P9_DPRINTK(P9_DEBUG_9P, "Cache mode: loose\n");
} else if (!strcmp(s, "fscache")) {
version = CACHE_FSCACHE;
P9_DPRINTK(P9_DEBUG_9P, "Cache mode: fscache\n");
} else if (!strcmp(s, "none")) {
version = CACHE_NONE;
P9_DPRINTK(P9_DEBUG_9P, "Cache mode: none\n");
} else
printk(KERN_INFO "9p: Unknown Cache mode %s.\n", s);
return version;
}
/** /**
* v9fs_parse_options - parse mount options into session structure * v9fs_parse_options - parse mount options into session structure
* @v9ses: existing v9fs session information * @v9ses: existing v9fs session information
@ -97,7 +116,7 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
/* setup defaults */ /* setup defaults */
v9ses->afid = ~0; v9ses->afid = ~0;
v9ses->debug = 0; v9ses->debug = 0;
v9ses->cache = 0; v9ses->cache = CACHE_NONE;
#ifdef CONFIG_9P_FSCACHE #ifdef CONFIG_9P_FSCACHE
v9ses->cachetag = NULL; v9ses->cachetag = NULL;
#endif #endif
@ -171,13 +190,13 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
"problem allocating copy of cache arg\n"); "problem allocating copy of cache arg\n");
goto free_and_return; goto free_and_return;
} }
ret = get_cache_mode(s);
if (ret == -EINVAL) {
kfree(s);
goto free_and_return;
}
if (strcmp(s, "loose") == 0) v9ses->cache = ret;
v9ses->cache = CACHE_LOOSE;
else if (strcmp(s, "fscache") == 0)
v9ses->cache = CACHE_FSCACHE;
else
v9ses->cache = CACHE_NONE;
kfree(s); kfree(s);
break; break;
@ -200,9 +219,15 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
} else { } else {
v9ses->flags |= V9FS_ACCESS_SINGLE; v9ses->flags |= V9FS_ACCESS_SINGLE;
v9ses->uid = simple_strtoul(s, &e, 10); v9ses->uid = simple_strtoul(s, &e, 10);
if (*e != '\0') if (*e != '\0') {
v9ses->uid = ~0; ret = -EINVAL;
printk(KERN_INFO "9p: Unknown access "
"argument %s.\n", s);
kfree(s);
goto free_and_return;
}
} }
kfree(s); kfree(s);
break; break;