Author: hselasky
Date: Thu May 21 06:56:35 2015
New Revision: 283175
URL: https://svnweb.freebsd.org/changeset/base/283175
Log:
MFC r282817:
Apply proper locking when iterating the multicast addresses and add a
missing check for NULL from a non-blocking "kzalloc()" function call.
Sponsored by: Mellanox Technologies
Modified:
stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c
==============================================================================
--- stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c Thu May 21 06:53:55
2015 (r283174)
+++ stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c Thu May 21 06:56:35
2015 (r283175)
@@ -650,6 +650,7 @@ static void mlx4_en_cache_mclist(struct
struct mlx4_en_mc_list *tmp;
struct mlx4_en_priv *priv = netdev_priv(dev);
+ if_maddr_rlock(dev);
TAILQ_FOREACH(ifma, &dev->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -658,10 +659,13 @@ static void mlx4_en_cache_mclist(struct
continue;
/* Make sure the list didn't grow. */
tmp = kzalloc(sizeof(struct mlx4_en_mc_list), GFP_ATOMIC);
+ if (tmp == NULL)
+ break;
memcpy(tmp->addr,
LLADDR((struct sockaddr_dl *)ifma->ifma_addr),
ETH_ALEN);
list_add_tail(&tmp->list, &priv->mc_list);
}
+ if_maddr_runlock(dev);
}
static void update_mclist_flags(struct mlx4_en_priv *priv,
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
