]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
net: hns3: Fix get_vector ops in hclgevf_main module
authorYunsheng Lin <linyunsheng@huawei.com>
Fri, 6 Jul 2018 10:28:02 +0000 (11:28 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Oct 2018 23:59:04 +0000 (16:59 -0700)
[ Upstream commit 03718db97bfb57535f3aa8110f0cbe0c616a67c0 ]

The hclgevf_free_vector function expects the caller to pass
the vector_id to it, and hclgevf_put_vector pass vector to
it now, which will cause vector allocation problem.

This patch fixes it by converting vector into vector_id before
calling hclgevf_free_vector.

Fixes: e2cb1dec9779 ("net: hns3: Add HNS3 VF HCL(Hardware Compatibility Layer) Support")
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

index a17872aab168112e637ba64747d09ee343712e8c..12aa1f1b99efc68843d305bf6921a068d25b4acb 100644 (file)
@@ -648,8 +648,17 @@ static int hclgevf_unmap_ring_from_vector(
 static int hclgevf_put_vector(struct hnae3_handle *handle, int vector)
 {
        struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);
+       int vector_id;
 
-       hclgevf_free_vector(hdev, vector);
+       vector_id = hclgevf_get_vector_index(hdev, vector);
+       if (vector_id < 0) {
+               dev_err(&handle->pdev->dev,
+                       "hclgevf_put_vector get vector index fail. ret =%d\n",
+                       vector_id);
+               return vector_id;
+       }
+
+       hclgevf_free_vector(hdev, vector_id);
 
        return 0;
 }