From: Sven Eckelmann Date: Sat, 22 May 2010 15:48:47 +0000 (+0200) Subject: Staging: batman-adv: Don't allocate icmp packet with GFP_KERNEL X-Git-Tag: v2.6.35-rc2~14^2~11 X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=0375fc4d2748b7c7064d481b36e32ef19e43d8db Staging: batman-adv: Don't allocate icmp packet with GFP_KERNEL A new buffer for a packet is created when a icmp packet is received. This happens in a context with disabled irq. Thus we are not allowed to sleep or call function which might sleep. kmalloc must be called with GFP_ATOMIC instead of GFP_KERNEL to ensure that it does not sleep. Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/batman-adv/device.c b/drivers/staging/batman-adv/device.c index ad82ec4..7eb6559 100644 --- a/drivers/staging/batman-adv/device.c +++ b/drivers/staging/batman-adv/device.c @@ -309,7 +309,7 @@ void bat_device_add_packet(struct device_client *device_client, struct device_packet *device_packet; unsigned long flags; - device_packet = kmalloc(sizeof(struct device_packet), GFP_KERNEL); + device_packet = kmalloc(sizeof(struct device_packet), GFP_ATOMIC); if (!device_packet) return;