]> git.baikalelectronics.ru Git - kernel.git/commit
esp: limit skb_page_frag_refill use to a single page
authorSabrina Dubroca <sd@queasysnail.net>
Wed, 13 Apr 2022 08:10:50 +0000 (10:10 +0200)
committerSteffen Klassert <steffen.klassert@secunet.com>
Wed, 13 Apr 2022 08:16:11 +0000 (10:16 +0200)
commit252296e70d7a220a6fa5c2167aba835ed4b2d2bf
treecffe80b54f0a32dad75e14c66b981b482d1027a2
parentc0722691abd2b25441668bc917f849b01f9709dc
esp: limit skb_page_frag_refill use to a single page

Commit 4fef6a73fa70 ("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: 656a76ddd6dc ("esp4: Avoid skb_cow_data whenever possible")
Fixes: 8c55169a2a32 ("esp6: Avoid skb_cow_data whenever possible")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
include/net/esp.h
net/ipv4/esp4.c
net/ipv6/esp6.c