From patchwork Mon Jul 11 08:17:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [09/11] tipc: use limited socket backlog CVE-2010-4251 Date: Sun, 10 Jul 2011 22:17:46 -0000 From: Paolo Pisati X-Patchwork-Id: 104180 Message-Id: <1310372268-3840-10-git-send-email-paolo.pisati@canonical.com> To: kernel-team@lists.ubuntu.com From: Zhu Yi tipc: use limited socket backlog BugLink: http://bugs.launchpad.net/bugs/807462 commit upstream 53eecb1be5ae499d399d2923933937a9ea1a284f Make tipc adapt to the limited socket backlog change. CVE-2010-4251 Cc: Jon Maloy Cc: Allan Stephens Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Acked-by: Allan Stephens Signed-off-by: David S. Miller Signed-off-by: Paolo Pisati --- net/tipc/socket.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 8ebf4975..bf4b320 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -1323,8 +1323,10 @@ static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf) if (!sock_owned_by_user(sk)) { res = filter_rcv(sk, buf); } else { - sk_add_backlog(sk, buf); - res = TIPC_OK; + if (sk_add_backlog_limited(sk, buf)) + res = TIPC_ERR_OVERLOAD; + else + res = TIPC_OK; } bh_unlock_sock(sk);