diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 10:48:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 10:48:49 +0100 |
| commit | f6b2ce79b5fbbb330f56262f0f4373d6af60b602 (patch) | |
| tree | 1228dd9989b03011b9c5b5bd193283dfa8321ec4 /net/netrom/nr_timer.c | |
| parent | serial: 8250: Fix mismerge regarding serial_lsr_in() (diff) | |
| parent | Linux 6.2-rc7 (diff) | |
| download | linux-f6b2ce79b5fbbb330f56262f0f4373d6af60b602.tar.xz linux-f6b2ce79b5fbbb330f56262f0f4373d6af60b602.zip | |
Merge 6.2-rc7 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/netrom/nr_timer.c')
| -rw-r--r-- | net/netrom/nr_timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c index a8da88db7893..4e7c968cde2d 100644 --- a/net/netrom/nr_timer.c +++ b/net/netrom/nr_timer.c @@ -121,6 +121,7 @@ static void nr_heartbeat_expiry(struct timer_list *t) is accepted() it isn't 'dead' so doesn't get removed. */ if (sock_flag(sk, SOCK_DESTROY) || (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) { + sock_hold(sk); bh_unlock_sock(sk); nr_destroy_socket(sk); goto out; |