[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: 3f23f96528e8fcf8619895c4c916c52653892ec1
WARNING: Author mismatch between patch and upstream commit: Backport author: jianqi.ren.cn@windriver.com Commit author: Liu Jianliujian56@huawei.com
Status in newer kernel trees: 6.14.y | Present (exact SHA1) 6.12.y | Present (different SHA1: 61c0a5eac968) 6.6.y | Present (different SHA1: 0ca87e506375)
Note: The patch differs from the upstream commit: --- 1: 3f23f96528e8f ! 1: 96f83a102636d sunrpc: fix one UAF issue caused by sunrpc kernel tcp socket @@ Metadata ## Commit message ## sunrpc: fix one UAF issue caused by sunrpc kernel tcp socket
+ [ Upstream commit 3f23f96528e8fcf8619895c4c916c52653892ec1 ] + BUG: KASAN: slab-use-after-free in tcp_write_timer_handler+0x156/0x3e0 Read of size 1 at addr ffff888111f322cd by task swapper/0/0
@@ Commit message Acked-by: Jeff Layton jlayton@kernel.org Reviewed-by: Kuniyuki Iwashima kuniyu@amazon.com Signed-off-by: Trond Myklebust trond.myklebust@hammerspace.com + [Routine __netns_tracker_free() is not supported in 6.1 and so using + netns_tracker_free() instead.] + Signed-off-by: Jianqi Ren jianqi.ren.cn@windriver.com + Signed-off-by: He Zhe zhe.he@windriver.com
## net/sunrpc/svcsock.c ## @@ net/sunrpc/svcsock.c: static struct svc_xprt *svc_create_socket(struct svc_serv *serv, newlen = error;
if (protocol == IPPROTO_TCP) { -+ __netns_tracker_free(net, &sock->sk->ns_tracker, false); ++ netns_tracker_free(net, &sock->sk->ns_tracker); + sock->sk->sk_net_refcnt = 1; + get_net_track(net, &sock->sk->ns_tracker, GFP_KERNEL); + sock_inuse_add(net, 1); @@ net/sunrpc/xprtsock.c: static struct socket *xs_create_sock(struct rpc_xprt *xpr }
+ if (protocol == IPPROTO_TCP) { -+ __netns_tracker_free(xprt->xprt_net, &sock->sk->ns_tracker, false); ++ netns_tracker_free(xprt->xprt_net, &sock->sk->ns_tracker); + sock->sk->sk_net_refcnt = 1; + get_net_track(xprt->xprt_net, &sock->sk->ns_tracker, GFP_KERNEL); + sock_inuse_add(xprt->xprt_net, 1); ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success |