Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83511cc4 authored Sep 30, 2015 by Amit Pundir

net: core: fix UID-based routing build



Use kuid_t GLOBAL_ROOT_UID instead of "0"
otherwise we run into following build failure:

include/net/route.h: In function 'ip_route_output_ports':
include/net/route.h:143:55: error: type mismatch in conditional expression
       daddr, saddr, dport, sport, sk ? sock_i_uid(sk) : 0);
                                                       ^

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

parent 1229881e

include/net/route.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,8 @@ 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,
		sk ? sock_i_uid(sk) : GLOBAL_ROOT_UID);
		if (sk)
		security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
		return ip_route_output_flow(net, fl4, sk);

net/ipv4/route.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -516,7 +516,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);
		sk ? sock_i_uid(sk) : GLOBAL_ROOT_UID);
		}

		static void build_skb_flow_key(struct flowi4 fl4, const struct sk_buff skb,