[PATCH 6.12.y v3 1/2] rxrpc: Fix conn-level packet handling to unshare RESPONSE packets

[Harshit Mogalapalli]

Hi,


On 11/05/26 13:11, Wentao Guan wrote:
> [Readd rxrpc_skb_put_response_copy which missed in 016725807ce3 in v6.12.86]
> Stable-dep-of: aa54b1d27fe0 ("rxrpc: Also unshare DATA/RESPONSE packets when
> paged frags are present")

Yes, I noticed this too.

But you got the commit wrong I think: (you probably meant)

the rxrpc_skb_put_response_copy() addition was missed in commit: 
bf20f46d94f1 ("rxrpc: Fix potential UAF after skb_unshare() failure")

Greg: Summary: (it might help)

The stable backport bf20f46d94f1 ("rxrpc: Fix potential UAF after 
skb_unshare() failure") is a backport of commit: 1f2740150f90 ("rxrpc: 
Fix potential UAF after skb_unshare() failure") to 6.12.y:


stable backport bf20f46d94f1 ("rxrpc: Fix potential UAF after 
skb_unshare() failure") adds this which is not part of upstream commit:
+       EM(rxrpc_skb_get_call_rx,               "GET call-rx  ") \

But missed adding: which is added in upstream commit:
+       EM(rxrpc_skb_put_response_copy,         "PUT resp-cpy ") \


Hence Wentao needs to add rxrpc_skb_put_response_copy() in this backport.


Thanks,
Harshit



> Signed-off-by: Wentao Guan<guanwentao at uniontech.com>
> ---
>   include/trace/events/rxrpc.h |  1 +
>   net/rxrpc/conn_event.c       | 29 ++++++++++++++++++++++++++++-
>   2 files changed, 29 insertions(+), 1 deletion(-)
> 
> diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
> index 9377acad0c5f9..63efc9e4e4102 100644
> --- a/include/trace/events/rxrpc.h
> +++ b/include/trace/events/rxrpc.h
> @@ -146,6 +146,7 @@
>   	EM(rxrpc_skb_put_jumbo_subpacket,	"PUT jumbo-sub") \
>   	EM(rxrpc_skb_put_last_nack,		"PUT last-nack") \
>   	EM(rxrpc_skb_put_purge,			"PUT purge    ") \
> +	EM(rxrpc_skb_put_response_copy,		"PUT resp-cpy ") \




>   	EM(rxrpc_skb_put_rotate,		"PUT rotate   ") \
>   	EM(rxrpc_skb_put_unknown,		"PUT unknown  ") \
>   	EM(rxrpc_skb_see_conn_work,		"SEE conn-work") \
> diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c
> index 82cc72123c9c9..6dcfaed1f7485 100644
> --- a/net/rxrpc/conn_event.c
> +++ b/net/rxrpc/conn_event.c
> @@ -226,6 +226,33 @@ static void rxrpc_call_is_secure(struct rxrpc_call *call)
>   		rxrpc_notify_socket(call);
>   }