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

Commit b5851418 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

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

This reverts commit 2de7009b.

Bug: 16355602
Change-Id: Icb4ccc9c35b1fefc92894c9046d79c1af7b66186
parent 5115ab75

include/net/route.h

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,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);

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);

			   sock_i_uid(sk));

}



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