diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-01-17 09:51:46 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-17 09:51:46 +0100 |
| commit | 6eadf1075c6f923fece419e38cf05bff559aefcd (patch) | |
| tree | b743ce0a3743d6f1b915b19b077a6d5bad980ea1 /net/packet/af_packet.c | |
| parent | a1c611745c8c4e8996c1877d4e5d0fc95f227c38 (diff) | |
| parent | c10076c4304083af15a41f6bc5e657e781c1f9a6 (diff) | |
| download | op-kernel-dev-6eadf1075c6f923fece419e38cf05bff559aefcd.zip op-kernel-dev-6eadf1075c6f923fece419e38cf05bff559aefcd.tar.gz | |
Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
Diffstat (limited to 'net/packet/af_packet.c')
| -rw-r--r-- | net/packet/af_packet.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 82a6f34..d9d4970 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1630,8 +1630,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, if (snaplen > res) snaplen = res; - if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >= - (unsigned)sk->sk_rcvbuf) + if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) goto drop_n_acct; if (skb_shared(skb)) { @@ -1762,8 +1761,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, if (po->tp_version <= TPACKET_V2) { if (macoff + snaplen > po->rx_ring.frame_size) { if (po->copy_thresh && - atomic_read(&sk->sk_rmem_alloc) + skb->truesize - < (unsigned)sk->sk_rcvbuf) { + atomic_read(&sk->sk_rmem_alloc) < sk->sk_rcvbuf) { if (skb_shared(skb)) { copy_skb = skb_clone(skb, GFP_ATOMIC); } else { @@ -2450,8 +2448,12 @@ static int packet_do_bind(struct sock *sk, struct net_device *dev, __be16 protoc { struct packet_sock *po = pkt_sk(sk); - if (po->fanout) + if (po->fanout) { + if (dev) + dev_put(dev); + return -EINVAL; + } lock_sock(sk); |
