[merged] net-9p-clientc-put-refcount-of-trans_mod-in-error-case-in-parse_opts.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: net/9p/client.c: put refcount of trans_mod in error case in parse_opts()
has been removed from the -mm tree.  Its filename was
     net-9p-clientc-put-refcount-of-trans_mod-in-error-case-in-parse_opts.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: piaojun <piaojun@xxxxxxxxxx>
Subject: net/9p/client.c: put refcount of trans_mod in error case in parse_opts()

In my testing, the second mount will fail after umounting successfully. 
The reason is that we put refcount of trans_mod in the correct case rather
than the error case in parse_opts() at last.  That will cause the refcount
decrease to -1, and when we try to get trans_mod again in
try_module_get(), we could only increase refcount to 0 which will cause
failure as follows:

parse_opts
  v9fs_get_trans_by_name
    try_module_get : return NULL to caller which cause error

So we should put refcount of trans_mod in error case.

Link: http://lkml.kernel.org/r/5B3F39A0.2030509@xxxxxxxxxx
Fixes: 9421c3e64137ec ("net/9p/client.c: fix potential refcnt problem of trans module")
Signed-off-by: Jun Piao <piaojun@xxxxxxxxxx>
Reviewed-by: Yiwen Jiang <jiangyiwen@xxxxxxxxxx>
Reviewed-by: Greg Kurz <groug@xxxxxxxx>
Reviewed-by: Dominique Martinet <dominique.martinet@xxxxxx>
Tested-by: Dominique Martinet <dominique.martinet@xxxxxx>
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/client.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN net/9p/client.c~net-9p-clientc-put-refcount-of-trans_mod-in-error-case-in-parse_opts net/9p/client.c
--- a/net/9p/client.c~net-9p-clientc-put-refcount-of-trans_mod-in-error-case-in-parse_opts
+++ a/net/9p/client.c
@@ -225,7 +225,8 @@ static int parse_opts(char *opts, struct
 	}
 
 free_and_return:
-	v9fs_put_trans(clnt->trans_mod);
+	if (ret)
+		v9fs_put_trans(clnt->trans_mod);
 	kfree(tmp_options);
 	return ret;
 }
_

Patches currently in -mm which might be from piaojun@xxxxxxxxxx are

ocfs2-return-erofs-when-filesystem-becomes-read-only.patch
net-9p-clientc-add-missing-n-at-the-end-of-p9_debug.patch
9p-net-protocolc-return-enomem-when-kmalloc-failed.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



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux