Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75ad5237 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: tcp: check for SOCK_DEAD again in tcp_nuke_addr"

parents ef41cfa5 5ec2eeea
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
@@ -3255,14 +3255,20 @@ restart:
			sock_hold(sk);
			spin_unlock_bh(lock);

			lock_sock(sk);
			local_bh_disable();
			bh_lock_sock(sk);

			if (!sock_flag(sk, SOCK_DEAD)) {
				smp_wmb();  /* be consistent with tcp_reset */
				sk->sk_err = ETIMEDOUT;
				sk->sk_error_report(sk);

				tcp_done(sk);
			}

			bh_unlock_sock(sk);
			local_bh_enable();
			release_sock(sk);
			sock_put(sk);

			goto restart;