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

Commit 8ba25fbc authored Jul 08, 2014 by Sreeram Ramachandran Committed by Amit Pundir Aug 08, 2016

net: core: Handle 'sk' being NULL in UID-based routing



It has Amit Pundir <amit.pundir@linaro.org> fix:
net: core: fix UID-based routing build

Bug: 15413527
Change-Id: Iab1fae9da6053b284591628ef1de878761b137b1
Signed-off-by: Sreeram Ramachandran <sreeram@google.com>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

parent 8dc318f4

include/net/route.h

+2 −1

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

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