[PATCH 10/11] x25: use limited socket backlog CVE-2010-4251
Paolo Pisati
paolo.pisati at canonical.com
Mon Jul 11 14:20:19 UTC 2011
From: Zhu Yi <yi.zhu at intel.com>
BugLink: http://bugs.launchpad.net/bugs/807462
Make x25 adapt to the limited socket backlog change.
Cc: Andrew Hendry <andrew.hendry at gmail.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Acked-by: Eric Dumazet <eric.dumazet at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
(cherry picked from commit 2499849ee8f513e795b9f2c19a42d6356e4943a4)
Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
net/x25/x25_dev.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index 3e1efe5..a9da0dc 100644
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -53,7 +53,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
if (!sock_owned_by_user(sk)) {
queued = x25_process_rx_frame(sk, skb);
} else {
- sk_add_backlog(sk, skb);
+ queued = !sk_add_backlog_limited(sk, skb);
}
bh_unlock_sock(sk);
sock_put(sk);
--
1.7.5.4
More information about the kernel-team
mailing list