From c86beaeed18b07dd66a3c299b00bed6b524f3973 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 27 Jun 2023 10:08:16 +0000 Subject: [PATCH] Revert "tcp: fix possible sk_priority leak in tcp_v4_send_reset()" This reverts commit e7fd68abbba3409b1c365fe04e7b2c37298954a1 which is commit 1e306ec49a1f206fd2cc89a42fac6e6f592a8cc1 uptream. It breaks the Android kernel abi, so revert it for now. If it is needed in the future it can be brought back in an ABI-safe way. Bug: 161946584 Change-Id: I1c86735875631e9fc0031bab4e87e487298c45e4 Signed-off-by: Greg Kroah-Hartman --- net/ipv4/tcp_ipv4.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 270b20e0907c..1995d46afb21 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -805,9 +805,6 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb) inet_twsk(sk)->tw_priority : sk->sk_priority; transmit_time = tcp_transmit_time(sk); xfrm_sk_clone_policy(ctl_sk, sk); - } else { - ctl_sk->sk_mark = 0; - ctl_sk->sk_priority = 0; } ip_send_unicast_reply(ctl_sk, skb, &TCP_SKB_CB(skb)->header.h4.opt, @@ -815,6 +812,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb) &arg, arg.iov[0].iov_len, transmit_time); + ctl_sk->sk_mark = 0; xfrm_sk_free_policy(ctl_sk); sock_net_set(ctl_sk, &init_net); __TCP_INC_STATS(net, TCP_MIB_OUTSEGS); @@ -913,6 +911,7 @@ static void tcp_v4_send_ack(const struct sock *sk, &arg, arg.iov[0].iov_len, transmit_time); + ctl_sk->sk_mark = 0; sock_net_set(ctl_sk, &init_net); __TCP_INC_STATS(net, TCP_MIB_OUTSEGS); local_bh_enable();