igb: Fix null pointer dereference
Subsystems (3)
PATCH 1/1 igb: Fix null pointer dereference
The max_vfs= option has always been self limiting to the number of VFs supported by the device. fa44f2f1 added SR-IOV configuration via sysfs, but in the process broke this self correction factor. The failing path is:
igb_probe
igb_sw_init
if (max_vfs > 7) {
adapter->vfs_allocated_count = 7;
...
igb_probe_vfs
igb_enable_sriov(, max_vfs)
if (num_vfs > 7) {
err = -EPERM;
...This leaves vfs_allocated_count = 7 and vf_data = NULL, so we bomb out when igb_probe finally calls igb_reset. It seems like a really bad idea, and somewhat pointless, to set vfs_allocated_count separate from vf_data, but limiting max_vfs is enough to avoid the null pointer.
--- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/igb/igb_main.c +1 -1
@@ -2656,7 +2656,7 @@ static int igb_sw_init(struct igb_adapter *adapter)if (max_vfs >7 ) {dev_warn (&pdev->dev,"Maximum of 7 VFs per PF, using max\n" ); - adapter->vfs_allocated_count =7 ; + max_vfs = adapter->vfs_allocated_count =7 ; }else adapter->vfs_allocated_count = max_vfs;if (adapter->vfs_allocated_count)
Quoted 21 lines · Alex Williamson
The max_vfs= option has always been self limiting to the number of VFs supported by the device.
fa44f2f1added SR-IOV configuration via sysfs, but in the process broke this self correction factor. The failing path is:
igb_probe
igb_sw_initif (max_vfs > 7) { adapter->vfs_allocated_count = 7; ... igb_probe_vfs igb_enable_sriov(, max_vfs) if (num_vfs > 7) { err = -EPERM; ...This leaves
vfs_allocated_count= 7 andvf_data= NULL, so we bomb out whenigb_probefinally callsigb_reset. It seems like a really bad idea, and somewhat pointless, to setvfs_allocated_countseparate fromvf_data, but limitingmax_vfsis enough to avoid the null pointer.
Quoted 4 lines
Signed-off-by Alex Williamson <[email protected]>--- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
I have added the patch to my igb queue, thanks!