lkml.org 
[lkml]   [2018]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/2] net/9p: detecting invalid options as much as possible
Date
Currently when detecting invalid options in option parsing,
some options(e.g. msize) just set errno and allow to continusly
validate other options so that it can detect invalid options
as much as possible and give proper error messages together.

This patch apply this policy to all options and the case of memory
allocation error in option parsing.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
---
net/9p/client.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/net/9p/client.c b/net/9p/client.c
index 21e6df1..066f136 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -186,10 +186,11 @@ static int parse_opts(char *opts, struct p9_client *clnt)
case Opt_trans:
s = match_strdup(&args[0]);
if (!s) {
- ret = -ENOMEM;
+ if (!ret)
+ ret = -ENOMEM;
p9_debug(P9_DEBUG_ERROR,
"problem allocating copy of trans arg\n");
- goto free_and_return;
+ continue;
}

v9fs_put_trans(clnt->trans_mod);
@@ -199,7 +200,7 @@ static int parse_opts(char *opts, struct p9_client *clnt)
s);
ret = -EINVAL;
kfree(s);
- goto free_and_return;
+ continue;
}
kfree(s);
break;
@@ -209,25 +210,28 @@ static int parse_opts(char *opts, struct p9_client *clnt)
case Opt_version:
s = match_strdup(&args[0]);
if (!s) {
- ret = -ENOMEM;
+ if (!ret)
+ ret = -ENOMEM;
p9_debug(P9_DEBUG_ERROR,
"problem allocating copy of version arg\n");
- goto free_and_return;
+ continue;
}
ret = get_protocol_version(s);
if (ret == -EINVAL) {
kfree(s);
- goto free_and_return;
+ continue;
}
kfree(s);
clnt->proto_version = ret;
break;
default:
+ p9_debug(P9_DEBUG_ERROR,
+ "unrecognized option \"%s\" or missing value\n",
+ p);
continue;
}
}

-free_and_return:
v9fs_put_trans(clnt->trans_mod);
kfree(tmp_options);
return ret;
--
1.8.3.1
\
 
 \ /
  Last update: 2018-04-16 09:49    [W:0.039 / U:4.056 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site