diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2016-12-12 21:32:47 +0900 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-05-23 13:49:44 +0200 |
| commit | b954b39e597615744e6e8d45215bccf1bdfdb034 (patch) | |
| tree | 151ffe3ce49d1cb5705ee2b7f9788f2057efb9b7 | |
| parent | 823e62397cdf738209db1a40d16996ae154fe8df (diff) | |
| download | android_kernel_m2note-b954b39e597615744e6e8d45215bccf1bdfdb034.tar.gz | |
Revert "Handle 'sk' being NULL in UID-based routing."
This reverts commit 455b09d66a9ccfc572497ae88375ae343ff9ae66.
Bug: 16355602
Change-Id: I54fb9232343d93c115a529be9ce2104bc836d88d
Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
| -rw-r--r-- | include/net/route.h | 2 | ||||
| -rw-r--r-- | net/ipv4/route.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/route.h b/include/net/route.h index 647bb2adb..b5b448755 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -142,7 +142,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, RT_SCOPE_UNIVERSE, proto, 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) security_sk_classify_flow(sk, flowi4_to_flowi(fl4)); return ip_route_output_flow(net, fl4, sk); diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 70edc339f..7b80efde9 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -532,7 +532,7 @@ static void __build_flow_key(struct flowi4 *fl4, struct sock *sk, RT_SCOPE_UNIVERSE, prot, flow_flags, iph->daddr, iph->saddr, 0, 0, - sk ? sock_i_uid(sk) : 0); + sock_i_uid(sk)); } static void build_skb_flow_key(struct flowi4 *fl4, const struct sk_buff *skb, |