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

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
...@@ -531,13 +531,14 @@ static void __build_flow_key(const struct net *net, struct flowi4 *fl4, ...@@ -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, static void build_skb_flow_key(struct flowi4 *fl4, const struct sk_buff *skb,
const struct sock *sk) const struct sock *sk)
{ {
const struct net *net = dev_net(skb->dev);
const struct iphdr *iph = ip_hdr(skb); const struct iphdr *iph = ip_hdr(skb);
int oif = skb->dev->ifindex; int oif = skb->dev->ifindex;
u8 tos = RT_TOS(iph->tos); u8 tos = RT_TOS(iph->tos);
u8 prot = iph->protocol; u8 prot = iph->protocol;
u32 mark = skb->mark; 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) static void build_sk_flow_key(struct flowi4 *fl4, const struct sock *sk)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment