net/handshake: restore destructor on submit failure

commit 6af2a01d65f89e73c1cbb9267f8880d83a88cee4 upstream.

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")
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Cc: stable@vger.kernel.org
Signed-off-by: caoping <caoping@cmss.chinamobile.com>
Link: https://patch.msgid.link/20251204091058.1545151-1-caoping@cmss.chinamobile.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/handshake/request.c b/net/handshake/request.c
index f78091680bca522ce34910c158fe0060df0f544e..6b7e3e0bf3996effe4af4419cbb6bd8cd0e7a8db 100644 (file)
--- 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;