From ac2902b99b8e4693a9b68f97aeaddc65dfcfb390 Mon Sep 17 00:00:00 2001 From: Stricted Date: Fri, 7 Sep 2018 11:46:22 +0200 Subject: [PATCH] Revert "Handle 'sk' being NULL in UID-based routing." This reverts commit 455b09d66a9ccfc572497ae88375ae343ff9ae66. Change-Id: I1d95864d8b48ae3ca418cfd790cfd62c07f54f66 --- 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 4546e3d1f79..b5b44875543 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -142,8 +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) : - 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 c94cda09614..dd1a3c567af 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) : GLOBAL_ROOT_UID); + sock_i_uid(sk)); } static void build_skb_flow_key(struct flowi4 *fl4, const struct sk_buff *skb, -- 2.20.1