* Linux 5.1.14
@ 2019-06-22 9:47 Greg KH
2019-06-22 9:47 ` Greg KH
2019-06-22 9:50 ` Bhaskar Chowdhury
0 siblings, 2 replies; 3+ messages in thread
From: Greg KH @ 2019-06-22 9:47 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, torvalds, stable; +Cc: lwn, Jiri Slaby
[-- Attachment #1: Type: text/plain, Size: 635 bytes --]
I'm announcing the release of the 5.1.14 kernel.
All users of the 5.1 kernel series must upgrade.
The updated 5.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.1.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 +-
net/ipv4/tcp_output.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
Eric Dumazet (1):
tcp: refine memory limit test in tcp_fragment()
Greg Kroah-Hartman (1):
Linux 5.1.14
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Linux 5.1.14
2019-06-22 9:47 Linux 5.1.14 Greg KH
@ 2019-06-22 9:47 ` Greg KH
2019-06-22 9:50 ` Bhaskar Chowdhury
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2019-06-22 9:47 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, torvalds, stable; +Cc: lwn, Jiri Slaby
diff --git a/Makefile b/Makefile
index dfcd51a35824..c4b1a345d3f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 1
-SUBLEVEL = 13
+SUBLEVEL = 14
EXTRAVERSION =
NAME = Shy Crocodile
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 2d86e1bc483c..b8b4ae555e34 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;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: Linux 5.1.14
2019-06-22 9:47 Linux 5.1.14 Greg KH
2019-06-22 9:47 ` Greg KH
@ 2019-06-22 9:50 ` Bhaskar Chowdhury
1 sibling, 0 replies; 3+ messages in thread
From: Bhaskar Chowdhury @ 2019-06-22 9:50 UTC (permalink / raw)
To: Greg KH; +Cc: linux-kernel, Andrew Morton, torvalds, stable, lwn, Jiri Slaby
[-- Attachment #1: Type: text/plain, Size: 734 bytes --]
Important fix. Thanks, man! :)
On 11:47 Sat 22 Jun , Greg KH wrote:
>I'm announcing the release of the 5.1.14 kernel.
>
>All users of the 5.1 kernel series must upgrade.
>
>The updated 5.1.y git tree can be found at:
> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.1.y
>and can be browsed at the normal kernel.org git web browser:
> https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
>
>thanks,
>
>greg k-h
>
>------------
>
> Makefile | 2 +-
> net/ipv4/tcp_output.c | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
>Eric Dumazet (1):
> tcp: refine memory limit test in tcp_fragment()
>
>Greg Kroah-Hartman (1):
> Linux 5.1.14
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-06-22 9:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-22 9:47 Linux 5.1.14 Greg KH
2019-06-22 9:47 ` Greg KH
2019-06-22 9:50 ` Bhaskar Chowdhury
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).