Skip to content

Commit

Permalink
mlxsw: spectrum_router: Only handle IPv4 and IPv6 events
Browse files Browse the repository at this point in the history
The driver doesn't support events from address families other than IPv4
and IPv6, so ignore them. Otherwise, we risk queueing a work item before
it's initialized.

This can happen in case a VRF is configured when MROUTE_MULTIPLE_TABLES
is enabled, as the VRF driver will try to add an l3mdev rule for the
IPMR family.

Fixes: 65e65ec ("mlxsw: spectrum_router: Don't ignore IPv6 notifications")
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reported-by: Andreas Rammhold <andreas@rammhold.de>
Reported-by: Florian Klink <flokli@flokli.de>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
idosch authored and davem330 committed Sep 16, 2017
1 parent 2130c02 commit 8e29f97
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
Original file line number Diff line number Diff line change
Expand Up @@ -4868,7 +4868,8 @@ static int mlxsw_sp_router_fib_event(struct notifier_block *nb,
struct fib_notifier_info *info = ptr;
struct mlxsw_sp_router *router;

if (!net_eq(info->net, &init_net))
if (!net_eq(info->net, &init_net) ||
(info->family != AF_INET && info->family != AF_INET6))
return NOTIFY_DONE;

fib_work = kzalloc(sizeof(*fib_work), GFP_ATOMIC);
Expand Down

0 comments on commit 8e29f97

Please sign in to comment.