net/9p/client.c: fix potential refcnt problem of trans module

When specifying trans_mod multiple times in a mount, it will cause an
inaccurate refcount of the trans module.  Also, in the error case of
option parsing, we should put the trans module if we have already got
it.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Chengguang Xu <[email protected]>
Reviewed-by: Andrew Morton <[email protected]>
Cc: David Miller <[email protected]>
Cc: Eric Van Hensbergen <[email protected]>
Cc: Ron Minnich <[email protected]>
Cc: Latchesar Ionkov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/net/9p/client.c b/net/9p/client.c
index e6cae8332e2eb2402b9a45b46b70fb27317fd7fd..21e6df1cc70f407a85e486d2e26ec7254a6d399b 100644 (file)
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -190,7 +190,9 @@ static int parse_opts(char *opts, struct p9_client *clnt)
                                p9_debug(P9_DEBUG_ERROR,
                                         "problem allocating copy of trans arg\n");
                                goto free_and_return;
-                        }
+                       }
+
+                       v9fs_put_trans(clnt->trans_mod);
                        clnt->trans_mod = v9fs_get_trans_by_name(s);
                        if (clnt->trans_mod == NULL) {
                                pr_info("Could not find request transport: %s\n",
@@ -226,6 +228,7 @@ static int parse_opts(char *opts, struct p9_client *clnt)
        }
 
 free_and_return:
+       v9fs_put_trans(clnt->trans_mod);
        kfree(tmp_options);
        return ret;
 }