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=unavailable 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 33DECC48BE8 for ; Sat, 22 Jun 2019 09:47:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F3D122089C for ; Sat, 22 Jun 2019 09:47:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561196826; bh=G1ozgte4xHm62Ls6xJ72+iAnWeHOdUhZJ/jiTj4t4EI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=U+c3gU11z0seZYej5810Ksb9iO1JT+q5niycbfOfTFW5Fz4tJZBoNPnXbvRPL9bNt DP7XV+vnwV0/EmRnP8p/i+I/vVzP+av7mqtQqy+pmq/hTaNwcmp/aIZiA36urvltFn HOm4UF9fCSNbQzxjaKB5j/98qES/QePxBNgaRJoU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726466AbfFVJrF (ORCPT ); Sat, 22 Jun 2019 05:47:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:34214 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726272AbfFVJrE (ORCPT ); Sat, 22 Jun 2019 05:47:04 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 B2A0F2084E; Sat, 22 Jun 2019 09:47:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561196824; bh=G1ozgte4xHm62Ls6xJ72+iAnWeHOdUhZJ/jiTj4t4EI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=0cxu1rDVa4bFwItScvxUjTrTa60MCL66lLav5+Hpc/WvYzcmbBgfQsyai8+M1zX3l q/lD+kliEk2mIFTni/rTtsxqcj63P9u3Nk0SKvL6cDRxFQCTFV+5/1Oxmy2UTin+Zt dpYiNSV4/nAgMIAYk0j75APAyxogunReyv7sFAZs= Date: Sat, 22 Jun 2019 11:47:01 +0200 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.19.55 Message-ID: <20190622094701.GB12459@kroah.com> References: <20190622094654.GA12459@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190622094654.GA12459@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 b234837e4d07..3addd4c286fa 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 19 -SUBLEVEL = 54 +SUBLEVEL = 55 EXTRAVERSION = NAME = "People's Front" diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 147ed82b73d3..221d9b72423b 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1299,7 +1299,8 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue, 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 && + tcp_queue != TCP_FRAG_IN_WRITE_QUEUE)) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG); return -ENOMEM; }