[B.A.T.M.A.N.] [PATCH] batman-adv: Don't allocate icmp packet with GFP_KERNEL

[B.A.T.M.A.N.] [PATCH] batman-adv: Don't allocate icmp packet with GFP_KERNEL

[Sven Eckelmann]

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 <sven.eckelmann@gmx.de>
---
 batman-adv-kernelland/icmp_socket.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/batman-adv-kernelland/icmp_socket.c b/batman-adv-kernelland/icmp_socket.c
index 33d2714..becbb5b 100644
--- a/batman-adv-kernelland/icmp_socket.c
+++ b/batman-adv-kernelland/icmp_socket.c
@@ -292,7 +292,7 @@ static void bat_socket_add_packet(struct socket_client *socket_client,
 	struct socket_packet *socket_packet;
 	unsigned long flags;
 
-	socket_packet = kmalloc(sizeof(struct socket_packet), GFP_KERNEL);
+	socket_packet = kmalloc(sizeof(struct socket_packet), GFP_ATOMIC);
 
 	if (!socket_packet)
 		return;
-- 
1.7.1

[B.A.T.M.A.N.] [PATCH-maint] batman-adv: Don't allocate icmp packet with GFP_KERNEL

[Sven Eckelmann]

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 <sven.eckelmann@gmx.de>
---
This patch is created for maint and should be applied using `git am`.
Following patches should be applied before:
 * batman-adv: Move device for icmp injection to debugfs
 * batman-adv: Move tables from sysfs to debugfs
 * batman-adv: Call unregister_netdev on failures to get rtnl lock
 * batman-adv: Don't call free_netdev twice

 icmp_socket.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/icmp_socket.c b/icmp_socket.c
index eba8aa2..d74e2d6 100644
--- a/icmp_socket.c
+++ b/icmp_socket.c
@@ -284,7 +284,7 @@ static void bat_socket_add_packet(struct socket_client *socket_client,
 	struct socket_packet *socket_packet;
 	unsigned long flags;
 
-	socket_packet = kmalloc(sizeof(struct socket_packet), GFP_KERNEL);
+	socket_packet = kmalloc(sizeof(struct socket_packet), GFP_ATOMIC);
 
 	if (!socket_packet)
 		return;
-- 
1.7.1

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Don't allocate icmp packet with GFP_KERNEL

[Marek Lindner]

On Thursday 20 May 2010 03:00:00 Sven Eckelmann wrote:
> 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.

Applied in rev 1671.

Thanks,
Marek