The patch titled net/9p: fix crash due to bad mount parameters has been added to the -mm tree. Its filename is net-9p-fix-crash-due-to-bad-mount-parameters.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: net/9p: fix crash due to bad mount parameters From: Abhishek Kulkarni <adkulkar@xxxxxxxxxxxx> 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@xxxxxxxxxxxx> Cc: Eric Van Hensbergen <ericvh@xxxxxxxxx> Cc: Ron Minnich <rminnich@xxxxxxxxxx> Cc: Latchesar Ionkov <lucho@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- net/9p/trans_fd.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff -puN net/9p/trans_fd.c~net-9p-fix-crash-due-to-bad-mount-parameters net/9p/trans_fd.c --- a/net/9p/trans_fd.c~net-9p-fix-crash-due-to-bad-mount-parameters +++ a/net/9p/trans_fd.c @@ -735,12 +735,14 @@ static int parse_opts(char *params, stru 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: _ Patches currently in -mm which might be from adkulkar@xxxxxxxxxxxx are 9p-fix-incorrect-parameters-to-v9fs_file_readn.patch net-9p-fix-crash-due-to-bad-mount-parameters.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html