net: hinic: fix null pointer dereference on pointer hwdev
authorColin Ian King <colin.king@canonical.com>
Thu, 22 Nov 2018 10:05:01 +0000 (10:05 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 24 Nov 2018 01:22:02 +0000 (17:22 -0800)
Pointer hwdev is being dereferenced when declaring hwif , however, later
on hwdev is being null checked, hence we have dereference before null
check error. Fix this by assigning hwif and pdef only once hwdev has
been null checked.

Detected by CoverityScan, CID#1485581 ("Dereference before null check")

Fixes: 4a61abb100c8 ("net-next/hinic:add rx checksum offload for HiNIC")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/huawei/hinic/hinic_port.c

index e9f76e9046109c806277b88804ef69d13965b4d6..122c9359726824a6ada424927beec99dcdf538a9 100644 (file)
@@ -414,14 +414,16 @@ int hinic_set_rx_csum_offload(struct hinic_dev *nic_dev, u32 en)
 {
        struct hinic_checksum_offload rx_csum_cfg = {0};
        struct hinic_hwdev *hwdev = nic_dev->hwdev;
-       struct hinic_hwif *hwif = hwdev->hwif;
-       struct pci_dev *pdev = hwif->pdev;
+       struct hinic_hwif *hwif;
+       struct pci_dev *pdev;
        u16 out_size;
        int err;
 
        if (!hwdev)
                return -EINVAL;
 
+       hwif = hwdev->hwif;
+       pdev = hwif->pdev;
        rx_csum_cfg.func_id = HINIC_HWIF_FUNC_IDX(hwif);
        rx_csum_cfg.rx_csum_offload = en;