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

Commit d109e61b authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by David S. Miller
Browse files

net: ipv4: Don't crash if passing a null sk to ip_rt_update_pmtu. 



Commit e2d118a1 ("net: inet: Support UID-based routing in IP
protocols.") made __build_flow_key call sock_net(sk) to determine
the network namespace of the passed-in socket. This crashes if sk
is NULL.

Fix this by getting the network namespace from the skb instead.

Fixes: e2d118a1 ("net: inet: Support UID-based routing in IP protocols.")
Reported-by: default avatarErez Shitrit <erezsh@dev.mellanox.co.il>
Signed-off-by: default avatarLorenzo Colitti <lorenzo@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e9548901

net/ipv4/route.c

+2 −1
Original line number Diff line number Diff line
@@ -531,13 +531,14 @@ static void __build_flow_key(const struct net *net, struct flowi4 *fl4, 
static void build_skb_flow_key(struct flowi4 *fl4, const struct sk_buff *skb,

			       const struct sock *sk)

{

	const struct net *net = dev_net(skb->dev);

	const struct iphdr *iph = ip_hdr(skb);

	int oif = skb->dev->ifindex;

	u8 tos = RT_TOS(iph->tos);

	u8 prot = iph->protocol;

	u32 mark = skb->mark;



	__build_flow_key(sock_net(sk), fl4, sk, iph, oif, tos, prot, mark, 0);

	__build_flow_key(net, fl4, sk, iph, oif, tos, prot, mark, 0);

}



static void build_sk_flow_key(struct flowi4 *fl4, const struct sock *sk)