diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2026-04-30 12:49:56 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-05-14 10:08:06 -0700 |
| commit | 878492af7d503f4b093ea903173500be00e9cbe7 (patch) | |
| tree | 26412462d1162889abc11de52696faa1cfaa78c7 /net/rxrpc | |
| parent | f3f7760afe65292e83f182696130efb983278d04 (diff) | |
| parent | 66182ca873a4e87b3496eca79d57f86b76d7f52d (diff) | |
| download | linux-878492af7d503f4b093ea903173500be00e9cbe7.tar.gz linux-878492af7d503f4b093ea903173500be00e9cbe7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-7.1-rc4).
No conflicts, or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/rxrpc')
| -rw-r--r-- | net/rxrpc/call_event.c | 4 | ||||
| -rw-r--r-- | net/rxrpc/conn_event.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c index fdd683261226..2b19b252225e 100644 --- a/net/rxrpc/call_event.c +++ b/net/rxrpc/call_event.c @@ -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. */ diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c index a2130d25aaa9..442414d90ba1 100644 --- a/net/rxrpc/conn_event.c +++ b/net/rxrpc/conn_event.c @@ -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. */ |