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

Commit 84d3454e authored by Yonglong Liu's avatar Yonglong Liu Committed by Greg Kroah-Hartman
Browse files

net: hns3: Check variable is valid before assigning it to another 



[ Upstream commit 676131f7c53ecdd79e29fc8cfcdefe6f9f2485e8 ]

In hnae3_register_ae_dev(), ae_algo->ops is assigned to ae_dev->ops
before check that ae_algo->ops is valid.

And in hnae3_register_ae_algo(), missing check for ae_algo->ops.

This patch fixes them.

Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1f10b277

drivers/net/ethernet/hisilicon/hns3/hnae3.c

+10 −6
Original line number Diff line number Diff line
@@ -173,8 +173,12 @@ void hnae3_register_ae_algo(struct hnae3_ae_algo *ae_algo) 
		if (!id)

			continue;



		/* ae_dev init should set flag */

		if (!ae_algo->ops) {

			dev_err(&ae_dev->pdev->dev, "ae_algo ops are null\n");

			continue;

		}

		ae_dev->ops = ae_algo->ops;



		ret = ae_algo->ops->init_ae_dev(ae_dev);

		if (ret) {

			dev_err(&ae_dev->pdev->dev,
@@ -182,6 +186,7 @@ void hnae3_register_ae_algo(struct hnae3_ae_algo *ae_algo) 
			continue;

		}



		/* ae_dev init should set flag */

		hnae3_set_bit(ae_dev->flag, HNAE3_DEV_INITED_B, 1);



		/* check the client list for the match with this ae_dev type and
@@ -256,15 +261,13 @@ int hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev) 
		if (!id)

			continue;



		ae_dev->ops = ae_algo->ops;



		if (!ae_dev->ops) {

			dev_err(&ae_dev->pdev->dev, "ae_dev ops are null\n");

		if (!ae_algo->ops) {

			dev_err(&ae_dev->pdev->dev, "ae_algo ops are null\n");

			ret = -EOPNOTSUPP;

			goto out_err;

		}

		ae_dev->ops = ae_algo->ops;



		/* ae_dev init should set flag */

		ret = ae_dev->ops->init_ae_dev(ae_dev);

		if (ret) {

			dev_err(&ae_dev->pdev->dev,
@@ -272,6 +275,7 @@ int hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev) 
			goto out_err;

		}



		/* ae_dev init should set flag */

		hnae3_set_bit(ae_dev->flag, HNAE3_DEV_INITED_B, 1);

		break;

	}