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

This reverts commit 455b09d66a9ccfc572497ae88375ae343ff9ae66.

Change-Id: I1d95864d8b48ae3ca418cfd790cfd62c07f54f66

diff --git a/include/net/route.h b/include/net/route.h
index 647bb2adbffd55608afe36e365a90c7c39a9a48f..b5b44875543e86768a7fe110520157077b0c9d22 100644 (file)
--- 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 52e43a21156fd4af08a45f64e5d68ae28cb0bf7a..dd1a3c567af670a577d9da5f2fe28706e3610598 100644 (file)
--- 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,