Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb996edb authored by Colin Ian King's avatar Colin Ian King Committed by David S. Miller
Browse files

netvsc: fix dereference before null check errors 



ndev is being checked to see if it is a null pointer however before
the null check ndev is being dereferenced; hence there is a potential
null pointer dereference bug that needs fixing. Fix this by only
dereferencing ndev after the null check.

Detected by CoverityScan, CID#1420760, CID#140761 ("Dereference
before null check")

Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Reviewed-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 86573f61

drivers/net/hyperv/netvsc_drv.c

+4 −2
Original line number Diff line number Diff line
@@ -1135,7 +1135,7 @@ static int netvsc_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, 
{

	struct net_device_context *ndc = netdev_priv(dev);

	struct netvsc_device *ndev = rcu_dereference(ndc->nvdev);

	struct rndis_device *rndis_dev = ndev->extension;

	struct rndis_device *rndis_dev;

	int i;



	if (!ndev)
@@ -1144,6 +1144,7 @@ static int netvsc_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, 
	if (hfunc)

		*hfunc = ETH_RSS_HASH_TOP;	/* Toeplitz */



	rndis_dev = ndev->extension;

	if (indir) {

		for (i = 0; i < ITAB_NUM; i++)

			indir[i] = rndis_dev->ind_table[i];
@@ -1160,7 +1161,7 @@ static int netvsc_set_rxfh(struct net_device *dev, const u32 *indir, 
{

	struct net_device_context *ndc = netdev_priv(dev);

	struct netvsc_device *ndev = rtnl_dereference(ndc->nvdev);

	struct rndis_device *rndis_dev = ndev->extension;

	struct rndis_device *rndis_dev;

	int i;



	if (!ndev)
@@ -1169,6 +1170,7 @@ static int netvsc_set_rxfh(struct net_device *dev, const u32 *indir, 
	if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)

		return -EOPNOTSUPP;



	rndis_dev = ndev->extension;

	if (indir) {

		for (i = 0; i < ITAB_NUM; i++)

			if (indir[i] >= dev->num_rx_queues)