Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66efe26b authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

igb: check memory allocation failure 




[ Upstream commit 18eb8636 ]

Check memory allocation failures and return -ENOMEM in such cases, as
already done for other memory allocations in this function.

This avoids NULL pointers dereference.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Acked-by: default avatarPJ Waskiewicz <peter.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 349384cd

drivers/net/ethernet/intel/igb/igb_main.c

+2 −0
Original line number Diff line number Diff line
@@ -3162,6 +3162,8 @@ static int igb_sw_init(struct igb_adapter *adapter) 
	/* Setup and initialize a copy of the hw vlan table array */

	adapter->shadow_vfta = kcalloc(E1000_VLAN_FILTER_TBL_SIZE, sizeof(u32),

				       GFP_ATOMIC);

	if (!adapter->shadow_vfta)

		return -ENOMEM;



	/* This call may decrease the number of queues */

	if (igb_init_interrupt_scheme(adapter, true)) {