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

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

Merge "netfilter: xt_socket: Restore mark from full sockets only"

parents 2e302134 9969206d

net/netfilter/xt_socket.c

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ socket_match(const struct sk_buff *skb, struct xt_action_param *par, 
					inet_twsk(sk)->tw_transparent));



		if (info->flags & XT_SOCKET_RESTORESKMARK && !wildcard &&

			transparent)

		    transparent && sk_fullsock(sk))

			pskb->mark = sk->sk_mark;



		sock_gen_put(sk);
@@ -414,7 +414,7 @@ socket_mt6_v1_v2_v3(const struct sk_buff *skb, struct xt_action_param *par) 
					inet_twsk(sk)->tw_transparent));



		if (info->flags & XT_SOCKET_RESTORESKMARK && !wildcard &&

		    transparent)

		    transparent && sk_fullsock(sk))

			pskb->mark = sk->sk_mark;



		if (sk != skb->sk)