Commit aa54b1d2 authored by Hyunwoo Kim's avatar Hyunwoo Kim Committed by Linus Torvalds
Browse files

rxrpc: Also unshare DATA/RESPONSE packets when paged frags are present



The DATA-packet handler in rxrpc_input_call_event() and the RESPONSE
handler in rxrpc_verify_response() copy the skb to a linear one before
calling into the security ops only when skb_cloned() is true.  An skb
that is not cloned but still carries externally-owned paged fragments
(e.g. SKBFL_SHARED_FRAG set by splice() into a UDP socket via
__ip_append_data, or a chained skb_has_frag_list()) falls through to
the in-place decryption path, which binds the frag pages directly into
the AEAD/skcipher SGL via skb_to_sgvec().

Extend the gate to also unshare when skb_has_frag_list() or
skb_has_shared_frag() is true.  This catches the splice-loopback vector
and other externally-shared frag sources while preserving the
zero-copy fast path for skbs whose frags are kernel-private (e.g. NIC
page_pool RX, GRO).  The OOM/trace handling already in place is reused.

Fixes: d0d5c0cd ("rxrpc: Use skb_unshare() rather than skb_cow_data()")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarHyunwoo Kim <imv4bel@gmail.com>
Reviewed-by: default avatarJiayuan Chen <jiayuan.chen@linux.dev>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a1a10cdb
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -334,7 +334,9 @@ bool rxrpc_input_call_event(struct rxrpc_call *call)

			if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA &&
			    sp->hdr.securityIndex != 0 &&
			    skb_cloned(skb)) {
			    (skb_cloned(skb) ||
			     skb_has_frag_list(skb) ||
			     skb_has_shared_frag(skb))) {
				/* Unshare the packet so that it can be
				 * modified by in-place decryption.
				 */
+2 −1
Original line number Diff line number Diff line
@@ -245,7 +245,8 @@ static int rxrpc_verify_response(struct rxrpc_connection *conn,
{
	int ret;

	if (skb_cloned(skb)) {
	if (skb_cloned(skb) || skb_has_frag_list(skb) ||
	    skb_has_shared_frag(skb)) {
		/* Copy the packet if shared so that we can do in-place
		 * decryption.
		 */