Re: [PATCH] net/handshake: restore destructor on submit failure

On Tue, Dec 2, 2025, at 11:12 PM, caoping wrote:
> handshake_req_submit() replaces sk->sk_destruct but never restores it when
> submission fails before the request is hashed. handshake_sk_destruct() then
> returns early and the original destructor never runs, leaking the socket.
> Restore sk_destruct on the error path.
>
> Fixes: 3b3009ea8abb ("net/handshake: Create a NETLINK service for 
> handling handshake requests")
>
> Signed-off-by: caoping <[email protected]>
> ---
>  net/handshake/request.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/net/handshake/request.c b/net/handshake/request.c
> index 274d2c89b6b2..89435ed755cd 100644
> --- a/net/handshake/request.c
> +++ b/net/handshake/request.c
> @@ -276,6 +276,8 @@ int handshake_req_submit(struct socket *sock, 
> struct handshake_req *req,
>  out_unlock:
>  	spin_unlock(&hn->hn_lock);
>  out_err:
> +	/* Restore original destructor so socket teardown still runs on 
> failure */
> +	req->hr_sk->sk_destruct = req->hr_odestruct;
>  	trace_handshake_submit_err(net, req, req->hr_sk, ret);
>  	handshake_req_destroy(req);
>  	return ret;
>
> base-commit: 4a26e7032d7d57c998598c08a034872d6f0d3945
> -- 
> 2.47.3

Reviewed-by: Chuck Lever <[email protected]>

Consider adding a Cc: [email protected] when applying.


-- 
Chuck Lever