forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Revert "tcp: fix possible sk_priority leak in tcp_v4_send_reset()"

Browse source 
This reverts commit e7fd68abbb which is
commit 1e306ec49a 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 <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-06-27 10:08:16 +00:00
commit c86beaeed1
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
net/ipv4/tcp_ipv4.c
View file

@ -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();