infiniband: call ipv6 route lookup via the stub interface
authorPaolo Abeni <pabeni@redhat.com>
Fri, 28 Apr 2017 09:20:01 +0000 (11:20 +0200)
committerDoug Ledford <dledford@redhat.com>
Fri, 28 Apr 2017 16:55:17 +0000 (12:55 -0400)
The infiniband address handle can be triggered to resolve an ipv6
address in response to MAD packets, regardless of the ipv6
module being disabled via the kernel command line argument.

That will cause a call into the ipv6 routing code, which is not
initialized, and a conseguent oops.

This commit addresses the above issue replacing the direct lookup
call with an indirect one via the ipv6 stub, which is properly
initialized according to the ipv6 status (e.g. if ipv6 is
disabled, the routing lookup fails gracefully)

Cc: stable@vger.kernel.org # 3.12+
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/core/addr.c

index 329d08c884f66b3aa7647cf5b3266b4e053e7ebc..523d243201007dacd181d49b3ccf78b7fea96742 100644 (file)
@@ -444,8 +444,8 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
        fl6.saddr = src_in->sin6_addr;
        fl6.flowi6_oif = addr->bound_dev_if;
 
-       dst = ip6_route_output(addr->net, NULL, &fl6);
-       if ((ret = dst->error))
+       ret = ipv6_stub->ipv6_dst_lookup(addr->net, NULL, &dst, &fl6);
+       if (ret < 0)
                goto put;
 
        rt = (struct rt6_info *)dst;