From 010e3b48fca57920557d2b80b83f8b2899fb5d1e Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 30 Sep 2010 11:58:31 -0700 Subject: 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 --- net/ceph/ceph_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net') diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c index f6f2eeb..f3e4a13 100644 --- 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) { -- cgit v1.1