net: hns3: fix vf id check issue when add flow director rule

BugLink: https://bugs.launchpad.net/bugs/1810457
When add flow director fule for vf, the vf id is used as array
subscript before valid checking, which may cause memory overflow.

Fixes: dd74f815dd41 ("net: hns3: Add support for rule add/delete for flow director")
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 0285dbae5db842862d49f148cdcedad986447f34)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index a6ea7c8c082febb66448490160de89fc7677ae9d..af3963176cdc22056459fe0f46fb4daf748ebcd4 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -4683,6 +4683,13 @@ static int hclge_add_fd_entry(struct hnae3_handle *handle,
                u8 vf = ethtool_get_flow_spec_ring_vf(fs->ring_cookie);
                u16 tqps;
 
+               if (vf > hdev->num_req_vfs) {
+                       dev_err(&hdev->pdev->dev,
+                               "Error: vf id (%d) > max vf num (%d)\n",
+                               vf, hdev->num_req_vfs);
+                       return -EINVAL;
+               }
+
                dst_vport_id = vf ? hdev->vport[vf].vport_id : vport->vport_id;
                tqps = vf ? hdev->vport[vf].alloc_tqps : vport->alloc_tqps;
 
@@ -4693,13 +4700,6 @@ static int hclge_add_fd_entry(struct hnae3_handle *handle,
                        return -EINVAL;
                }
 
-               if (vf > hdev->num_req_vfs) {
-                       dev_err(&hdev->pdev->dev,
-                               "Error: vf id (%d) > max vf num (%d)\n",
-                               vf, hdev->num_req_vfs);
-                       return -EINVAL;
-               }
-
                action = HCLGE_FD_ACTION_ACCEPT_PACKET;
                q_index = ring;
        }