mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [V9fs-developer][PATCH v3 1/2] net/9p: detecting invalid options as much as possible
@ 2018-05-03  9:44 Chengguang Xu
  2018-05-03  9:44 ` [V9fs-developer][PATCH v3 2/2] fs/9p: " Chengguang Xu
  2018-05-10 22:31 ` [V9fs-developer][PATCH v3 1/2] net/9p: " Andrew Morton
  0 siblings, 2 replies; 3+ messages in thread
From: Chengguang Xu @ 2018-05-03  9:44 UTC (permalink / raw)
  To: akpm, ericvh, rminnich, lucho; +Cc: v9fs-developer, linux-kernel, Chengguang Xu

Currently when detecting invalid options in option parsing,
some options(e.g. msize) just set errno and allow to continuously
validate other options so that it can detect invalid options
as much as possible and give proper error messages together.

This patch applies same rule to option 'trans' and 'version'
when detecting -EINVAL.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
---
Changes since v2:
- Introduce a new temporary variable to avoid overriding error code.

Changes since v1:
- Do not change behavior when detecting ENOMEM or unrecognized options.

 net/9p/client.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/net/9p/client.c b/net/9p/client.c
index 21e6df1..18c5271 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -198,8 +198,6 @@ static int parse_opts(char *opts, struct p9_client *clnt)
 				pr_info("Could not find request transport: %s\n",
 					s);
 				ret = -EINVAL;
-				kfree(s);
-				goto free_and_return;
 			}
 			kfree(s);
 			break;
@@ -214,13 +212,12 @@ static int parse_opts(char *opts, struct p9_client *clnt)
 					 "problem allocating copy of version arg\n");
 				goto free_and_return;
 			}
-			ret = get_protocol_version(s);
-			if (ret == -EINVAL) {
-				kfree(s);
-				goto free_and_return;
-			}
+			r = get_protocol_version(s);
+			if (r < 0)
+				ret = r;
+			else
+				clnt->proto_version = r;
 			kfree(s);
-			clnt->proto_version = ret;
 			break;
 		default:
 			continue;
-- 
1.8.3.1

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-05-10 22:31 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-03  9:44 [V9fs-developer][PATCH v3 1/2] net/9p: detecting invalid options as much as possible Chengguang Xu
2018-05-03  9:44 ` [V9fs-developer][PATCH v3 2/2] fs/9p: " Chengguang Xu
2018-05-10 22:31 ` [V9fs-developer][PATCH v3 1/2] net/9p: " Andrew Morton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®