From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D02AFC48BD6 for ; Thu, 27 Jun 2019 00:33:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A3C1721738 for ; Thu, 27 Jun 2019 00:33:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561595597; bh=ChKygnyJz3NYfiOLgx37QC1NIsuRhXL2oP3ET6c50jg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=d5U9dSvLb1hFNqnu663G06HjWYf0KH0Qcv7HqcvQh9IVxuQ4JO6aMdDqe8v7yidzT xuupmGSgLZZDHYFMqQkUlFQmDqcunILCtyt9JPhLJp/jgSSsOquncnHSZrrAEq6QMl TRXg/PQjkgI7EcwjmbeRAPBLyfP7ufWgP2EuZbjo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727723AbfF0AdQ (ORCPT ); Wed, 26 Jun 2019 20:33:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:37066 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727691AbfF0AdK (ORCPT ); Wed, 26 Jun 2019 20:33:10 -0400 Received: from localhost (unknown [116.247.127.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 466BF21738; Thu, 27 Jun 2019 00:33:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561595590; bh=ChKygnyJz3NYfiOLgx37QC1NIsuRhXL2oP3ET6c50jg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Nbzc3bd9jmfd2U9jD2VnV6t4p3ygT28gbAStbaxQlZ49Bo719ih0iaSfCOXnvjsh7 GDrQ5s/TEPWK5SnwN6L+sQc7myATaRksirc1JK9jGuNJpsV6Q8kUj60zkLbid9fI9W fEYsJk/7ICzAN5+QxjzrMwF/BcRhAbtnpjVd+QfA= Date: Thu, 27 Jun 2019 08:32:54 +0800 From: Greg KH To: linux-kernel@vger.kernel.org, Andrew Morton , torvalds@linux-foundation.org, stable@vger.kernel.org Cc: lwn@lwn.net, Jiri Slaby Subject: Re: Linux 4.9.184 Message-ID: <20190627003254.GB10794@kroah.com> References: <20190627003245.GA10794@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190627003245.GA10794@kroah.com> User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org diff --git a/Makefile b/Makefile index e63ace93b67b..3b0dd4e90c44 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 183 +SUBLEVEL = 184 EXTRAVERSION = NAME = Roaring Lionus diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index d8c6b833f0ce..0c195b0f4216 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1185,7 +1185,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)) { + if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf + 0x20000)) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG); return -ENOMEM; }