Browse Source

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>
Yehuda Sadeh 14 years ago
parent
commit
010e3b48fc
1 changed files with 1 additions and 1 deletions
  1. 1 1
      net/ceph/ceph_common.c

+ 1 - 1
net/ceph/ceph_common.c

@@ -249,7 +249,7 @@ int ceph_parse_options(struct ceph_options **popt, char *options,
 			continue;
 			continue;
 		err = -EINVAL;
 		err = -EINVAL;
 		token = match_token((char *)c, opt_tokens, argstr);
 		token = match_token((char *)c, opt_tokens, argstr);
-		if (token < 0) {
+		if (token < 0 && parse_extra_token) {
 			/* extra? */
 			/* extra? */
 			err = parse_extra_token((char *)c, private);
 			err = parse_extra_token((char *)c, private);
 			if (err < 0) {
 			if (err < 0) {