joel16/android_kernel_sony_msm8994
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994.git synced 2024-11-27 06:01:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Handle 'sk' being NULL in UID-based routing."

Browse Source 
This reverts commit 455b09d66a9ccfc572497ae88375ae343ff9ae66.

Bug: 16355602
Change-Id: I54fb9232343d93c115a529be9ce2104bc836d88d
This commit is contained in:
Lorenzo Colitti 2016-12-12 21:32:47 +09:00 committed by Joel16
parent c06728e62d
commit 991f6fbb21
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/route.h
View File

@ -143,7 +143,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, sk ? sock_i_uid(sk) : 0); daddr, saddr, dport, sport, sock_i_uid(sk));
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);

3
net/ipv4/route.c
View File

@ -531,8 +531,7 @@ static void __build_flow_key(struct flowi4 *fl4, struct sock *sk,
flowi4_init_output(fl4, oif, mark, tos, flowi4_init_output(fl4, oif, mark, tos,
RT_SCOPE_UNIVERSE, prot, RT_SCOPE_UNIVERSE, prot,
flow_flags, flow_flags,
iph->daddr, iph->saddr, 0, 0, iph->daddr, iph->saddr, 0, 0, sock_i_uid(sk));
sk ? sock_i_uid(sk) : 0);
} }
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,