summaryrefslogtreecommitdiffstats
path: root/net/phonet
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-12-20 10:00:30 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-12-20 10:00:30 +0100
commit35eaa42c4a1017c08d0572008db375becb621744 (patch)
tree8185b6d18acfc63285e3132c9039c7d6c9a90527 /net/phonet
parent4b95391c8ef0f270ed58234597aef58976abe01c (diff)
parenta7904a538933c525096ca2ccde1e60d0ee62c08e (diff)
downloadlinux-stable-35eaa42c4a1017c08d0572008db375becb621744.tar.gz
linux-stable-35eaa42c4a1017c08d0572008db375becb621744.tar.bz2
linux-stable-35eaa42c4a1017c08d0572008db375becb621744.zip
Merge 5.16-rc6 into tty-next
We need the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/phonet')
-rw-r--r--net/phonet/pep.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/phonet/pep.c b/net/phonet/pep.c
index a1525916885a..b4f90afb0638 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -868,6 +868,7 @@ static struct sock *pep_sock_accept(struct sock *sk, int flags, int *errp,
err = pep_accept_conn(newsk, skb);
if (err) {
+ __sock_put(sk);
sock_put(newsk);
newsk = NULL;
goto drop;