| Message ID | 1480442207-43618-1-git-send-email-lorenzo@google.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Nov 29, 2016 at 9:56 AM, Lorenzo Colitti <lorenzo@google.com> wrote: > Commit e2d118a1cb5e ("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. Since I missed this in the patch description: this is targeted to net-next (the code it fixes is not in net yet). Also: Fixes: e2d118a1cb5e ("net: inet: Support UID-based routing in IP protocols.")
From: Lorenzo Colitti <lorenzo@google.com> Date: Wed, 30 Nov 2016 02:56:47 +0900 > Commit e2d118a1cb5e ("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. > > Reported-by: Erez Shitrit <erezsh@dev.mellanox.co.il> > Signed-off-by: Lorenzo Colitti <lorenzo@google.com> Applied, thanks.
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index d37fc6f..6402d74 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -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)
Commit e2d118a1cb5e ("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. Reported-by: Erez Shitrit <erezsh@dev.mellanox.co.il> Signed-off-by: Lorenzo Colitti <lorenzo@google.com> --- net/ipv4/route.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)