From patchwork Thu Aug 29 00:49:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Hicks X-Patchwork-Id: 1154947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46JkXq4p10z9sN6; Thu, 29 Aug 2019 10:50:03 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1i38dT-0002JQ-UY; Thu, 29 Aug 2019 00:49:59 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1i38dS-0002J4-LJ for kernel-team@lists.ubuntu.com; Thu, 29 Aug 2019 00:49:58 +0000 Received: from 2.general.tyhicks.us.vpn ([10.172.64.53] helo=sec.work.tihix.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1i38dS-0001tV-4r; Thu, 29 Aug 2019 00:49:58 +0000 From: Tyler Hicks To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/4] UBUNTU: SAUCE: Revert "tcp: refine memory limit test in tcp_fragment()" Date: Thu, 29 Aug 2019 00:49:45 +0000 Message-Id: <20190829004948.1573-2-tyhicks@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190829004948.1573-1-tyhicks@canonical.com> References: <20190829004948.1573-1-tyhicks@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" This reverts commit 92fc18789a3793965588087a1d7860f38f3c65b4. I've received a private report detailing a performance regression in the Xenial 4.4 kernel that is fixed by commit b617158dc096 ("tcp: be more careful in tcp_fragment()"). Before pulling that patch in, it would be best to revert my backport of commit b6653b3629e5 ("tcp: refine memory limit test in tcp_fragment()") and go with the version that Eric Dumazet provided for the upstream linux-stable 4.4 tree. CVE-2019-11478 Signed-off-by: Tyler Hicks --- net/ipv4/tcp_output.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 719d2cc8770c..ede265fbf7ba 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1163,8 +1163,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, if (nsize < 0) nsize = 0; - if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf && - skb != tcp_send_head(sk))) { + if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG); return -ENOMEM; }