evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Linux Build Service Account 2017-10-05 16:09:57 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0d13390c0a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/netfilter/xt_socket.c
View file

@ -237,7 +237,7 @@ socket_match(const struct sk_buff *skb, struct xt_action_param *par,
transparent = xt_socket_sk_is_transparent(sk); transparent = xt_socket_sk_is_transparent(sk);
if (info->flags & XT_SOCKET_RESTORESKMARK && !wildcard && if (info->flags & XT_SOCKET_RESTORESKMARK && !wildcard &&
transparent) transparent && sk_fullsock(sk))
pskb->mark = sk->sk_mark; pskb->mark = sk->sk_mark;
sock_gen_put(sk); sock_gen_put(sk);
@ -419,7 +419,7 @@ socket_mt6_v1_v2_v3(const struct sk_buff *skb, struct xt_action_param *par)
transparent = xt_socket_sk_is_transparent(sk); transparent = xt_socket_sk_is_transparent(sk);
if (info->flags & XT_SOCKET_RESTORESKMARK && !wildcard && if (info->flags & XT_SOCKET_RESTORESKMARK && !wildcard &&
transparent) transparent && sk_fullsock(sk))
pskb->mark = sk->sk_mark; pskb->mark = sk->sk_mark;
if (sk != skb->sk) if (sk != skb->sk)