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

Commit 11b49d9b authored by Laura Garcia Liebana's avatar Laura Garcia Liebana Committed by Greg Kroah-Hartman
Browse files

staging: netlogic: Return zero pointer after failed kmalloc 



Return a ZERO_SIZE_PTR in the xlr_config_spill function if the
kmalloc returns an invalid value. This change prevents a possible
segmentation fault as the invalid pointer is fed into PTR_ALIGN macro.

Signed-off-by: default avatarLaura Garcia Liebana <nevola@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf8b2bb6

drivers/staging/netlogic/xlr_net.c

+3 −1
Original line number Diff line number Diff line
@@ -437,8 +437,10 @@ static void *xlr_config_spill(struct xlr_net_priv *priv, int reg_start_0, 
	base = priv->base_addr;

	spill_size = size;

	spill = kmalloc(spill_size + SMP_CACHE_BYTES, GFP_ATOMIC);

	if (!spill)

	if (!spill) {

		pr_err("Unable to allocate memory for spill area!\n");

		return ZERO_SIZE_PTR;

	}



	spill = PTR_ALIGN(spill, SMP_CACHE_BYTES);

	phys_addr = virt_to_phys(spill);