diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-05 08:41:04 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-05 08:41:04 +0300 |
| commit | 2076b2a4a6b7e36a33dad178ff6f7c45657b00cc (patch) | |
| tree | f02d8a54bf3b6c27777baa7f9c6a349cbc2bfc56 /net/handshake/request.c | |
| parent | 49c80922ff8115bc86c82e5fc9e6842cd87db689 (diff) | |
| parent | 9561de3a55bed6bdd44a12820ba81ec416e705a7 (diff) | |
| download | linux-2076b2a4a6b7e36a33dad178ff6f7c45657b00cc.tar.xz | |
Merge 6.4-rc5 into tty-next
We need the tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/handshake/request.c')
| -rw-r--r-- | net/handshake/request.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/handshake/request.c b/net/handshake/request.c index 94d5cef3e048..d78d41abb3d9 100644 --- a/net/handshake/request.c +++ b/net/handshake/request.c @@ -239,6 +239,7 @@ int handshake_req_submit(struct socket *sock, struct handshake_req *req, } req->hr_odestruct = req->hr_sk->sk_destruct; req->hr_sk->sk_destruct = handshake_sk_destruct; + req->hr_file = sock->file; ret = -EOPNOTSUPP; net = sock_net(req->hr_sk); @@ -334,6 +335,9 @@ bool handshake_req_cancel(struct sock *sk) return false; } + /* Request accepted and waiting for DONE */ + fput(req->hr_file); + out_true: trace_handshake_cancel(net, req, sk); |