]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
net: hns3: add some error checking in hclge_tm module
authorYunsheng Lin <linyunsheng@huawei.com>
Fri, 28 Jun 2019 11:50:10 +0000 (19:50 +0800)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 14 Aug 2019 09:18:49 +0000 (11:18 +0200)
BugLink: https://bugs.launchpad.net/bugs/1839036
[ Upstream commit 04f25edb48c441fc278ecc154c270f16966cbb90 ]

When hdev->tx_sch_mode is HCLGE_FLAG_VNET_BASE_SCH_MODE, the
hclge_tm_schd_mode_vnet_base_cfg calls hclge_tm_pri_schd_mode_cfg
with vport->vport_id as pri_id, which is used as index for
hdev->tm_info.tc_info, it will cause out of bound access issue
if vport_id is equal to or larger than HNAE3_MAX_TC.

Also hardware only support maximum speed of HCLGE_ETHER_MAX_RATE.

So this patch adds two checks for above cases.

Fixes: 848440544b41 ("net: hns3: Add support of TX Scheduler & Shaper to HNS3 driver")
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c

index 00458da67503d9f70facabf3f21fdfac99e53e8d..80dfaccc6df8954260f7fad5aacb829263e29f42 100644 (file)
@@ -54,7 +54,8 @@ static int hclge_shaper_para_calc(u32 ir, u8 shaper_level,
        u32 tick;
 
        /* Calc tick */
-       if (shaper_level >= HCLGE_SHAPER_LVL_CNT)
+       if (shaper_level >= HCLGE_SHAPER_LVL_CNT ||
+           ir > HCLGE_ETHER_MAX_RATE)
                return -EINVAL;
 
        tick = tick_array[shaper_level];
@@ -1058,6 +1059,9 @@ static int hclge_tm_schd_mode_vnet_base_cfg(struct hclge_vport *vport)
        int ret;
        u8 i;
 
+       if (vport->vport_id >= HNAE3_MAX_TC)
+               return -EINVAL;
+
        ret = hclge_tm_pri_schd_mode_cfg(hdev, vport->vport_id);
        if (ret)
                return ret;