forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: batman-adv: don't lock while sending packets

Browse source 
As in other parts of batman-adv, we should not lock while sending a packet but
keep the lock held for as short as possible. Additionally, we should check
whether the interface is active, otherwise batman_if->net_dev might not be
available ...

Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Acked-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Simon Wunderlich 2010-02-19 16:18:05 +01:00 • committed by Greg Kroah-Hartman
parent 0fce64362d
commit eb50081d8f
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/staging/batman-adv/device.c
View file

@ -25,6 +25,7 @@
#include "send.h" #include "send.h"
#include "types.h" #include "types.h"
#include "hash.h" #include "hash.h"
#include "hard-interface.h"
static struct class *batman_class; static struct class *batman_class;
@ -206,6 +207,7 @@ ssize_t bat_device_write(struct file *file, const char __user *buff,
struct icmp_packet icmp_packet; struct icmp_packet icmp_packet;
struct orig_node *orig_node; struct orig_node *orig_node;
struct batman_if *batman_if; struct batman_if *batman_if;
uint8_t dstaddr[ETH_ALEN];
unsigned long flags; unsigned long flags;
if (len < sizeof(struct icmp_packet)) { if (len < sizeof(struct icmp_packet)) {
@ -251,9 +253,15 @@ ssize_t bat_device_write(struct file *file, const char __user *buff,
goto unlock; goto unlock;
batman_if = orig_node->batman_if; batman_if = orig_node->batman_if;
memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
spin_unlock_irqrestore(&orig_hash_lock, flags);
if (!batman_if) if (!batman_if)
goto unlock; goto dst_unreach;
if (batman_if->if_active != IF_ACTIVE)
goto dst_unreach;
memcpy(icmp_packet.orig, memcpy(icmp_packet.orig,
batman_if->net_dev->dev_addr, batman_if->net_dev->dev_addr,
@ -261,9 +269,8 @@ ssize_t bat_device_write(struct file *file, const char __user *buff,
send_raw_packet((unsigned char *)&icmp_packet, send_raw_packet((unsigned char *)&icmp_packet,
sizeof(struct icmp_packet), sizeof(struct icmp_packet),
batman_if, orig_node->router->addr); batman_if, dstaddr);
spin_unlock_irqrestore(&orig_hash_lock, flags);
goto out; goto out;
unlock: unlock: