Patch "esp: Fix GRO when the headers not fully in the linear part of the skb." has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
esp: Fix GRO when the headers not fully in the linear part of the skb.
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
esp-fix-gro-when-the-headers-not-fully-in-the-linear-part-of-the-skb.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
374d1b5a81f7f9cc5e7f095ac3d5aff3f6600376Mon Sep 17 00:00:00 2001
From: Steffen Klassert <[email protected]>
Date: Fri, 5 Jan 2018 08:35:47 +0100
Subject: esp: Fix GRO when the headers not fully in the linear part of the skb.
From: Steffen Klassert <[email protected]>
commit 374d1b5a81f7f9cc5e7f095ac3d5aff3f6600376 upstream.
The GRO layer does not necessarily pull the complete headers into the linear part of the skb, a part may remain on the first page fragment. This can lead to a crash if we try to pull the headers, so make sure we have them on the linear part before pulling.
--- net/ipv4/esp4_offload.c | 3 ++- net/ipv6/esp6_offload.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
net/ipv4/esp4_offload.c +2 -1
@@ -38,7 +38,8 @@ static struct sk_buff **esp4_gro_receive__be32 spi;int err; -skb_pull (skb, offset); +if (!pskb_pull (skb, offset)) +return NULL ;if ((err =xfrm_parse_spi (skb,IPPROTO_ESP , &spi, &seq)) !=0 ) goto out;
net/ipv6/esp6_offload.c +2 -1
@@ -60,7 +60,8 @@ static struct sk_buff **esp6_gro_receiveint nhoff;int err; -skb_pull (skb, offset); +if (!pskb_pull (skb, offset)) +return NULL ;if ((err =xfrm_parse_spi (skb,IPPROTO_ESP , &spi, &seq)) !=0 ) goto out;
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/xfrm-fix-stack-out-of-bounds-read-on-socket-policy-lookup.patch queue-4.14/xfrm-skip-policies-marked-as-dead-while-rehashing.patch queue-4.14/xfrm-fix-rcu-usage-in-xfrm_get_type_offload.patch queue-4.14/esp-fix-gro-when-the-headers-not-fully-in-the-linear-part-of-the-skb.patch queue-4.14/xfrm-don-t-call-xfrm_policy_cache_flush-while-holding-spinlock.patch queue-4.14/xfrm-check-id-proto-in-validate_tmpl.patch