From patchwork Mon Jul 11 08:17:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 104181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id DFBA0B71C4 for ; Mon, 11 Jul 2011 18:18:19 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QgBgv-0007lO-TO; Mon, 11 Jul 2011 08:18:09 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QgBgq-0007f8-NB for kernel-team@lists.ubuntu.com; Mon, 11 Jul 2011 08:18:04 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QgBgq-0000Ih-Jj for ; Mon, 11 Jul 2011 08:18:04 +0000 Received: from dynamic-adsl-94-36-117-159.clienti.tiscali.it ([94.36.117.159] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1QgBgq-0000hm-Ej for kernel-team@lists.ubuntu.com; Mon, 11 Jul 2011 08:18:04 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 10/11] x25: use limited socket backlog CVE-2010-4251 Date: Mon, 11 Jul 2011 10:17:47 +0200 Message-Id: <1310372268-3840-11-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1310372268-3840-1-git-send-email-paolo.pisati@canonical.com> References: <1310372268-3840-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Zhu Yi x25: use limited socket backlog BugLink: http://bugs.launchpad.net/bugs/807462 commit upstream 2499849ee8f513e795b9f2c19a42d6356e4943a4 Make x25 adapt to the limited socket backlog change. CVE-2010-4251 Cc: Andrew Hendry Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Paolo Pisati --- 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);