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

Commit 7c4c32a2 authored by Pau Espin Pedrol's avatar Pau Espin Pedrol Committed by Greg Kroah-Hartman
Browse files

tcp: fix mark propagation with fwmark_reflect enabled 



commit bf99b4ded5f8a4767dbb9d180626f06c51f9881f upstream.

Otherwise, RST packets generated by the TCP stack for non-existing
sockets always have mark 0.
The mark from the original packet is assigned to the netns_ipv4/6
socket used to send the response so that it can get copied into the
response skb when the socket sends it.

Fixes: e110861f ("net: add a sysctl to reflect the fwmark on replies")
Cc: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: default avatarPau Espin Pedrol <pau.espin@tessares.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 16a3fbe5

net/ipv4/ip_output.c

+1 −0
Original line number Diff line number Diff line
@@ -1606,6 +1606,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, 
	sk->sk_protocol = ip_hdr(skb)->protocol;

	sk->sk_bound_dev_if = arg->bound_dev_if;

	sk->sk_sndbuf = sysctl_wmem_default;

	sk->sk_mark = fl4.flowi4_mark;

	err = ip_append_data(sk, &fl4, ip_reply_glue_bits, arg->iov->iov_base,

			     len, 0, &ipc, &rt, MSG_DONTWAIT);

	if (unlikely(err)) {

net/ipv6/tcp_ipv6.c

+1 −0
Original line number Diff line number Diff line
@@ -837,6 +837,7 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 
	dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL);

	if (!IS_ERR(dst)) {

		skb_dst_set(buff, dst);

		ctl_sk->sk_mark = fl6.flowi6_mark;

		ip6_xmit(ctl_sk, buff, &fl6, NULL, tclass);

		TCP_INC_STATS(net, TCP_MIB_OUTSEGS);

		if (rst)