Skip to content

Commit 7c504ff

Browse files
V4belgregkh
authored andcommitted
rxrpc: Also unshare DATA/RESPONSE packets when paged frags are present
commit aa54b1d upstream. 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: d0d5c0c ("rxrpc: Use skb_unshare() rather than skb_cow_data()") Cc: stable@vger.kernel.org Signed-off-by: Hyunwoo Kim <imv4bel@gmail.com> Reviewed-by: Jiayuan Chen <jiayuan.chen@linux.dev> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent cfa4267 commit 7c504ff

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

net/rxrpc/call_event.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,9 @@ bool rxrpc_input_call_event(struct rxrpc_call *call, struct sk_buff *skb)
461461

462462
if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA &&
463463
sp->hdr.securityIndex != 0 &&
464-
skb_cloned(skb)) {
464+
(skb_cloned(skb) ||
465+
skb_has_frag_list(skb) ||
466+
skb_has_shared_frag(skb))) {
465467
/* Unshare the packet so that it can be modified by
466468
* in-place decryption.
467469
*/

net/rxrpc/conn_event.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@ static int rxrpc_verify_response(struct rxrpc_connection *conn,
231231
{
232232
int ret;
233233

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

0 commit comments

Comments
 (0)