Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
[sfrench/cifs-2.6.git] / net / ipv4 / udp.c
index 58585748bdac7cc7be011c090409e37f492573a4..50678f9a27632dec479288a394f37b5f77a49ac5 100644 (file)
@@ -634,7 +634,9 @@ void __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable)
                if (!harderr || sk->sk_state != TCP_ESTABLISHED)
                        goto out;
        } else {
+               bh_lock_sock(sk);
                ip_icmp_error(sk, skb, err, uh->dest, info, (u8 *)(uh+1));
+               bh_unlock_sock(sk);
        }
        sk->sk_err = err;
        sk->sk_error_report(sk);