Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6-omap-h63xx.git] / net / ipv4 / inet_diag.c

diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index dbeacd8b0f9059c1b738c820e2bcd10aa32bd9e2..def007ec1d6f85b3f1f9830554c8a4c0be70a905 100644 (file)
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -836,12 +836,16 @@ static int inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
        return inet_diag_get_exact(skb, nlh);
 }
 
+static DEFINE_MUTEX(inet_diag_mutex);
+
 static void inet_diag_rcv(struct sock *sk, int len)
 {
        unsigned int qlen = 0;
 
        do {
+               mutex_lock(&inet_diag_mutex);
                netlink_run_queue(sk, &qlen, &inet_diag_rcv_msg);
+               mutex_unlock(&inet_diag_mutex);
        } while (qlen);
 }