diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-05-09 09:59:29 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-05-09 10:01:01 -0700 |
| commit | e7073830cc8b52ef3df7dd150e4dac7706e0e104 (patch) | |
| tree | e257cb163ac414e82acf319ab8cdd98ad4434036 /net/ipv4/tcp_ipv4.c | |
| parent | 628bc3e5a1beae395b5b515998396c60559ed3a9 (diff) | |
| parent | 8c3b7565f81e030ef448378acd1b35dabb493e3b (diff) | |
| download | linux-stable-e7073830cc8b52ef3df7dd150e4dac7706e0e104.tar.gz linux-stable-e7073830cc8b52ef3df7dd150e4dac7706e0e104.tar.bz2 linux-stable-e7073830cc8b52ef3df7dd150e4dac7706e0e104.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
35d92abfbad8 ("net: hns3: fix kernel crash when devlink reload during initialization")
2a1a1a7b5fd7 ("net: hns3: add command queue trace for hns3")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 0427deca3e0e..95e3d28b83b8 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -155,6 +155,12 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp) if (tcptw->tw_ts_recent_stamp && (!twp || (reuse && time_after32(ktime_get_seconds(), tcptw->tw_ts_recent_stamp)))) { + /* inet_twsk_hashdance() sets sk_refcnt after putting twsk + * and releasing the bucket lock. + */ + if (unlikely(!refcount_inc_not_zero(&sktw->sk_refcnt))) + return 0; + /* In case of repair and re-using TIME-WAIT sockets we still * want to be sure that it is safe as above but honor the * sequence numbers and time stamps set as part of the repair @@ -175,7 +181,7 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp) tp->rx_opt.ts_recent = tcptw->tw_ts_recent; tp->rx_opt.ts_recent_stamp = tcptw->tw_ts_recent_stamp; } - sock_hold(sktw); + return 1; } |