lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 13 Nov 2011 23:17:35 +0300 From: Dan Carpenter <dan.carpenter@...cle.com> To: stable@...r.kernel.org Cc: Greg Kroah-Hartman <greg@...ah.com>, Zhu Yi <yi.zhu@...el.com>, netdev@...r.kernel.org, Eric Dumazet <eric.dumazet@...il.com> Subject: [patch 2/8 2.6.32] udp: use limited socket backlog I had to make some changes to the first chunk in net/ipv6/udp.c to make this to apply. >From 55349790d7cbf0d381873a7ece1dcafcffd4aaa9 Mon Sep 17 00:00:00 2001 From: Zhu Yi <yi.zhu@...el.com> Date: Thu, 4 Mar 2010 18:01:42 +0000 Subject: [PATCH] udp: use limited socket backlog Make udp adapt to the limited socket backlog change. Cc: "David S. Miller" <davem@...emloft.net> Cc: Alexey Kuznetsov <kuznet@....inr.ac.ru> Cc: "Pekka Savola (ipv6)" <pekkas@...core.fi> Cc: Patrick McHardy <kaber@...sh.net> Signed-off-by: Zhu Yi <yi.zhu@...el.com> Acked-by: Eric Dumazet <eric.dumazet@...il.com> Signed-off-by: David S. Miller <davem@...emloft.net> Signed-off-by: Dan Carpenter <dan.carpenter@...cle.com> --- diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 0ac8833..2eaeaf1 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1177,8 +1177,10 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) bh_lock_sock(sk); if (!sock_owned_by_user(sk)) rc = __udp_queue_rcv_skb(sk, skb); - else - sk_add_backlog(sk, skb); + else if (sk_add_backlog_limited(sk, skb)) { + bh_unlock_sock(sk); + goto drop; + } bh_unlock_sock(sk); return rc; diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index ca520d4..4400eb0 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -473,16 +473,19 @@ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb, bh_lock_sock(sk2); if (!sock_owned_by_user(sk2)) udpv6_queue_rcv_skb(sk2, buff); - else - sk_add_backlog(sk2, buff); + else if (sk_add_backlog_limited(sk2, buff)) { + kfree_skb(buff); + bh_unlock_sock(sk2); + goto out; + } bh_unlock_sock(sk2); } } bh_lock_sock(sk); if (!sock_owned_by_user(sk)) udpv6_queue_rcv_skb(sk, skb); - else - sk_add_backlog(sk, skb); + else if (sk_add_backlog_limited(sk, skb)) + kfree_skb(skb); bh_unlock_sock(sk); out: spin_unlock(&hslot->lock); @@ -601,8 +604,12 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, bh_lock_sock(sk); if (!sock_owned_by_user(sk)) udpv6_queue_rcv_skb(sk, skb); - else - sk_add_backlog(sk, skb); + else if (sk_add_backlog_limited(sk, skb)) { + atomic_inc(&sk->sk_drops); + bh_unlock_sock(sk); + sock_put(sk); + goto discard; + } bh_unlock_sock(sk); sock_put(sk); return 0; -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists