nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvethernet: check return value form interface function

Browse Source 
Issue:
1) OSI interface function return value are not validated
2) MTL Q and DMA channel 1:1 mapping check missing

Fix:
1) check for valid return value for such API before proceed
2) check for 1:1 mapping between MTLQs and DMA channels

Bug 200512422

Change-Id: Ib61e6099d2dcdd64cb40a58718b0552fc08efa8e
Signed-off-by: Rakesh Goyal <rgoyal@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2161185
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Rakesh Goyal
2019-07-25 16:18:53 +05:30
committed by Revanth Kumar Uppala
parent 134a4c1057
commit 65a4e04daf
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
View File

@@ -3004,6 +3004,29 @@ static int ether_parse_dt(struct ether_priv_data *pdata)
} }
} }
if (osi_dma->num_dma_chans != osi_core->num_mtl_queues) {
dev_err(dev, "mismatch in numbers of DMA channel and MTL Q\n");
return -EINVAL;
}
ret = -1;
for (i = 0; i < osi_dma->num_dma_chans; i++) {
if (osi_dma->dma_chans[i] != osi_core->mtl_queues[i]) {
dev_err(dev,
"mismatch in DMA channel and MTL Q number at index %d\n",
i);
return -EINVAL;
}
if (osi_dma->dma_chans[i] == 0) {
ret = 0;
}
}
if (ret != 0) {
dev_err(dev, "Q0 Must be enabled for rx path\n");
return -EINVAL;
}
ret = of_property_read_u32_array(np, "nvidia,rxq_enable_ctrl", ret = of_property_read_u32_array(np, "nvidia,rxq_enable_ctrl",
tmp_value, tmp_value,
osi_core->num_mtl_queues); osi_core->num_mtl_queues);
@@ -3363,8 +3386,15 @@ static int ether_probe(struct platform_device *pdev)
sizeof(struct osi_xtra_dma_stat_counters)); sizeof(struct osi_xtra_dma_stat_counters));
/* Initialize core and DMA ops based on MAC type */ /* Initialize core and DMA ops based on MAC type */
osi_init_core_ops(osi_core); if (osi_init_core_ops(osi_core) != 0) {
osi_init_dma_ops(osi_dma); dev_err(&pdev->dev, "failed to get osi_init_core_ops\n");
goto err_core_ops;
}
if (osi_init_dma_ops(osi_dma) != 0) {
dev_err(&pdev->dev, "failed to get osi_init_dma_ops\n");
goto err_dma_ops;
}
/* Parse the ethernet DT node */ /* Parse the ethernet DT node */
ret = ether_parse_dt(pdata); ret = ether_parse_dt(pdata);
@@ -3467,6 +3497,8 @@ err_dma_mask:
} }
err_init_res: err_init_res:
err_parse_dt: err_parse_dt:
err_core_ops:
err_dma_ops:
free_netdev(ndev); free_netdev(ndev);
return ret; return ret;
} }