ceph: don't crash when passed bad mount options

This only happened when parse_extra_token was not passed to ceph_parse_option() (hence, only happened in rbd). Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
mariux64 · Oct 20, 2010 · 010e3b4 · 010e3b4
1 parent 6f453ed
commit 010e3b4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
@@ -249,7 +249,7 @@ int ceph_parse_options(struct ceph_options **popt, char *options,
 			continue;
 		err = -EINVAL;
 		token = match_token((char *)c, opt_tokens, argstr);
-		if (token < 0) {
+		if (token < 0 && parse_extra_token) {
 			/* extra? */
 			err = parse_extra_token((char *)c, private);
 			if (err < 0) {