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

Revert "net: core: Handle 'sk' being NULL in UID-based routing"

Browse source 
This reverts commit ad49351038.

Bug: 16355602
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
This commit is contained in:
Amit Pundir 2017-01-02 14:04:56 +05:30
parent 82518b9a3f
commit 3048a60ec7
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/net/route.h
View file

@ -154,8 +154,7 @@ static inline struct rtable *ip_route_output_ports(struct net *net, struct flowi
flowi4_init_output(fl4, oif, sk ? sk->sk_mark : 0, tos, flowi4_init_output(fl4, oif, sk ? sk->sk_mark : 0, tos,
RT_SCOPE_UNIVERSE, proto, RT_SCOPE_UNIVERSE, proto,
sk ? inet_sk_flowi_flags(sk) : 0, sk ? inet_sk_flowi_flags(sk) : 0,
daddr, saddr, dport, sport, daddr, saddr, dport, sport, sock_i_uid(sk));
sk ? sock_i_uid(sk) : GLOBAL_ROOT_UID);
if (sk) if (sk)
security_sk_classify_flow(sk, flowi4_to_flowi(fl4)); security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
return ip_route_output_flow(net, fl4, sk); return ip_route_output_flow(net, fl4, sk);

2
net/ipv4/route.c
View file

@ -518,7 +518,7 @@ static void __build_flow_key(struct flowi4 *fl4, struct sock *sk,
RT_SCOPE_UNIVERSE, prot, RT_SCOPE_UNIVERSE, prot,
flow_flags, flow_flags,
iph->daddr, iph->saddr, 0, 0, iph->daddr, iph->saddr, 0, 0,
sk ? sock_i_uid(sk) : GLOBAL_ROOT_UID); sock_i_uid(sk));
} }
static void build_skb_flow_key(struct flowi4 *fl4, const struct sk_buff *skb, static void build_skb_flow_key(struct flowi4 *fl4, const struct sk_buff *skb,