The patch titled
     netlink: don't reinitialize callback mutex
has been added to the -mm tree.  Its filename is
     netlink-dont-reinitialize-callback-mutex.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: netlink: don't reinitialize callback mutex
From: Patrick McHardy <[EMAIL PROTECTED]>

Don't reinitialize the callback mutex the netlink_kernel_create caller
handed in, it is supposed to already be initialized and could already be
held by someone.

Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 net/netlink/af_netlink.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff -puN net/netlink/af_netlink.c~netlink-dont-reinitialize-callback-mutex 
net/netlink/af_netlink.c
--- a/net/netlink/af_netlink.c~netlink-dont-reinitialize-callback-mutex
+++ a/net/netlink/af_netlink.c
@@ -388,8 +388,12 @@ static int __netlink_create(struct socke
        sock_init_data(sock, sk);
 
        nlk = nlk_sk(sk);
-       nlk->cb_mutex = cb_mutex ? : &nlk->cb_def_mutex;
-       mutex_init(nlk->cb_mutex);
+       if (cb_mutex)
+               nlk->cb_mutex = cb_mutex;
+       else {
+               nlk->cb_mutex = &nlk->cb_def_mutex;
+               mutex_init(nlk->cb_mutex);
+       }
        init_waitqueue_head(&nlk->wait);
 
        sk->sk_destruct = netlink_sock_destruct;
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
networking-fix-sending-netlink-message-when-replace-route.patch
git-net.patch
netlink-dont-reinitialize-callback-mutex.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to