Commit 8ba2c459 authored by Jiawen Wu's avatar Jiawen Wu Committed by David S. Miller

net: wangxun: fix kernel panic due to null pointer

When the device uses a custom subsystem vendor ID, the function
wx_sw_init() returns before the memory of 'wx->mac_table' is allocated.
The null pointer will causes the kernel panic.

Fixes: 79625f45 ("net: wangxun: Move MAC address handling to libwx")
Signed-off-by: default avatarJiawen Wu <jiawenwu@trustnetic.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 76df934c
...@@ -1769,12 +1769,14 @@ int wx_sw_init(struct wx *wx) ...@@ -1769,12 +1769,14 @@ int wx_sw_init(struct wx *wx)
wx->subsystem_device_id = pdev->subsystem_device; wx->subsystem_device_id = pdev->subsystem_device;
} else { } else {
err = wx_flash_read_dword(wx, 0xfffdc, &ssid); err = wx_flash_read_dword(wx, 0xfffdc, &ssid);
if (!err) if (err < 0) {
wx->subsystem_device_id = swab16((u16)ssid); wx_err(wx, "read of internal subsystem device id failed\n");
return err; return err;
} }
wx->subsystem_device_id = swab16((u16)ssid);
}
wx->mac_table = kcalloc(wx->mac.num_rar_entries, wx->mac_table = kcalloc(wx->mac.num_rar_entries,
sizeof(struct wx_mac_addr), sizeof(struct wx_mac_addr),
GFP_KERNEL); GFP_KERNEL);
......
...@@ -121,10 +121,8 @@ static int ngbe_sw_init(struct wx *wx) ...@@ -121,10 +121,8 @@ static int ngbe_sw_init(struct wx *wx)
/* PCI config space info */ /* PCI config space info */
err = wx_sw_init(wx); err = wx_sw_init(wx);
if (err < 0) { if (err < 0)
wx_err(wx, "read of internal subsystem device id failed\n");
return err; return err;
}
/* mac type, phy type , oem type */ /* mac type, phy type , oem type */
ngbe_init_type_code(wx); ngbe_init_type_code(wx);
......
...@@ -364,10 +364,8 @@ static int txgbe_sw_init(struct wx *wx) ...@@ -364,10 +364,8 @@ static int txgbe_sw_init(struct wx *wx)
/* PCI config space info */ /* PCI config space info */
err = wx_sw_init(wx); err = wx_sw_init(wx);
if (err < 0) { if (err < 0)
wx_err(wx, "read of internal subsystem device id failed\n");
return err; return err;
}
txgbe_init_type_code(wx); txgbe_init_type_code(wx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment