From 3048a60ec721f64d09906295ec6f11b0b063d737 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Mon, 2 Jan 2017 14:04:56 +0530 Subject: [PATCH] Revert "net: core: Handle 'sk' being NULL in UID-based routing" This reverts commit ad493510385ee040516bf83a60e6c4921fcdfdac. Bug: 16355602 Signed-off-by: Amit Pundir --- include/net/route.h | 3 +-- net/ipv4/route.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/net/route.h b/include/net/route.h index d016a8cb45cf..bf6fe1a6527e 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -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, RT_SCOPE_UNIVERSE, proto, sk ? inet_sk_flowi_flags(sk) : 0, - daddr, saddr, dport, sport, - sk ? sock_i_uid(sk) : GLOBAL_ROOT_UID); + 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 f75b5658a3a0..de51d32d6af8 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -518,7 +518,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) : GLOBAL_ROOT_UID); + sock_i_uid(sk)); } static void build_skb_flow_key(struct flowi4 *fl4, const struct sk_buff *skb, -- 2.34.1