From patchwork Fri Jul 22 17:42:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [lucid/fsl-imx51, CVE, 09/12] tipc: use limited socket backlog CVE-2010-4251 Date: Fri, 22 Jul 2011 07:42:38 -0000 From: Andy Whitcroft X-Patchwork-Id: 106349 Message-Id: <1311356561-11988-10-git-send-email-apw@canonical.com> To: kernel-team@lists.ubuntu.com From: Zhu Yi BugLink: http://bugs.launchpad.net/bugs/807462 Make tipc adapt to the limited socket backlog change. 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 (cherry picked from commit 53eecb1be5ae499d399d2923933937a9ea1a284f) Signed-off-by: Paolo Pisati Signed-off-by: Tim Gardner Signed-off-by: Andy Whitcroft --- 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 71036fb..93c97a0 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);