Commit f9718630 authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by Treehugger Robot
Browse files

UPSTREAM: esp: limit skb_page_frag_refill use to a single page



[ Upstream commit 5bd8baab ]

Commit ebe48d36 ("esp: Fix possible buffer overflow in ESP
transformation") tried to fix skb_page_frag_refill usage in ESP by
capping allocsize to 32k, but that doesn't completely solve the issue,
as skb_page_frag_refill may return a single page. If that happens, we
will write out of bounds, despite the check introduced in the previous
patch.

This patch forces COW in cases where we would end up calling
skb_page_frag_refill with a size larger than a page (first in
esp_output_head with tailen, then in esp_output_tail with
skb->data_len).

Fixes: cac2661c ("esp4: Avoid skb_cow_data whenever possible")
Fixes: 03e2a30f ("esp6: Avoid skb_cow_data whenever possible")
Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
(cherry picked from commit c075c3ea)
[ resolves a merge conflict mistake in 5.10.113 as pointed out by
  Daniel that was noticed by watching the compiler warnings.]
Reported-by: default avatarDaniel Micay <danielmicay@gmail.com>
Bug: 261841282
Reported-by: default avatarRobin Peng <robinpeng@google.com>
Reported-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic0c3b752b552a20aa35a9b262ee356e56b264695
parent 9cab3b60
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment