diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-07-04 09:43:32 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-07-08 05:36:43 -0400 |
commit | 4fbeb19d53cc3ef2da4bd1fd89a5dc9ac04add3a (patch) | |
tree | bdb18f740589b8add1bd56b54fe349857d97da8b /fs/ncpfs | |
parent | 7012b02a2b2c42bb1e1d95040a6e3bb59c7284f7 (diff) |
ncpfs: fix error return code in ncp_parse_options()
Fix to return -EINVAL from the option parse error handling
case instead of 0, as done elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ncpfs')
-rw-r--r-- | fs/ncpfs/inode.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index 0765ad12c382..4659da67e7f6 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c | |||
@@ -403,18 +403,24 @@ static int ncp_parse_options(struct ncp_mount_data_kernel *data, char *options) | |||
403 | switch (optval) { | 403 | switch (optval) { |
404 | case 'u': | 404 | case 'u': |
405 | data->uid = make_kuid(current_user_ns(), optint); | 405 | data->uid = make_kuid(current_user_ns(), optint); |
406 | if (!uid_valid(data->uid)) | 406 | if (!uid_valid(data->uid)) { |
407 | ret = -EINVAL; | ||
407 | goto err; | 408 | goto err; |
409 | } | ||
408 | break; | 410 | break; |
409 | case 'g': | 411 | case 'g': |
410 | data->gid = make_kgid(current_user_ns(), optint); | 412 | data->gid = make_kgid(current_user_ns(), optint); |
411 | if (!gid_valid(data->gid)) | 413 | if (!gid_valid(data->gid)) { |
414 | ret = -EINVAL; | ||
412 | goto err; | 415 | goto err; |
416 | } | ||
413 | break; | 417 | break; |
414 | case 'o': | 418 | case 'o': |
415 | data->mounted_uid = make_kuid(current_user_ns(), optint); | 419 | data->mounted_uid = make_kuid(current_user_ns(), optint); |
416 | if (!uid_valid(data->mounted_uid)) | 420 | if (!uid_valid(data->mounted_uid)) { |
421 | ret = -EINVAL; | ||
417 | goto err; | 422 | goto err; |
423 | } | ||
418 | break; | 424 | break; |
419 | case 'm': | 425 | case 'm': |
420 | data->file_mode = optint; | 426 | data->file_mode = optint; |