diff options
| author | Abhishek Kulkarni <adkulkar@umail.iu.edu> | 2009-07-01 08:50:54 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-02 13:17:01 -0700 |
| commit | 15da4b1612d608a47e095439b3dd1d77ffe20e0c (patch) | |
| tree | bc698a7851c73e86e2ac8ef8bfe32c14aff6c71c /net/9p | |
| parent | 887b5ea3683ce04966e35fa2e5fe215bedcde73c (diff) | |
| download | linux-3.10-15da4b1612d608a47e095439b3dd1d77ffe20e0c.tar.gz linux-3.10-15da4b1612d608a47e095439b3dd1d77ffe20e0c.tar.bz2 linux-3.10-15da4b1612d608a47e095439b3dd1d77ffe20e0c.zip | |
net/9p: Fix crash due to bad mount parameters.
It is not safe to use match_int without checking the token type returned
by match_token (especially when the token type returned is Opt_err and
args is empty). Fix it.
Signed-off-by: Abhishek Kulkarni <adkulkar@umail.iu.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/trans_fd.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index a2a1814c7a8..8c2588e4edc 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c @@ -735,12 +735,14 @@ static int parse_opts(char *params, struct p9_fd_opts *opts) if (!*p) continue; token = match_token(p, tokens, args); - r = match_int(&args[0], &option); - if (r < 0) { - P9_DPRINTK(P9_DEBUG_ERROR, - "integer field, but no integer?\n"); - ret = r; - continue; + if (token != Opt_err) { + r = match_int(&args[0], &option); + if (r < 0) { + P9_DPRINTK(P9_DEBUG_ERROR, + "integer field, but no integer?\n"); + ret = r; + continue; + } } switch (token) { case Opt_port: |