Skip to content

Commit

Permalink
Staging: batman-adv: Don't dereference unchecked incoming soft_iface
Browse files Browse the repository at this point in the history
send_packet derefenced forw_packet->if_incoming and checked if
forw_packet->if_incoming is NULL.

This cannot happen, but still makes irritates when reading through the
functions.

Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Sven Eckelmann authored and Greg Kroah-Hartman committed Oct 19, 2010
1 parent 1ee600c commit 9b37bc2
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/staging/batman-adv/send.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ static void send_packet_to_if(struct forw_packet *forw_packet,
static void send_packet(struct forw_packet *forw_packet)
{
struct batman_if *batman_if;
struct net_device *soft_iface = forw_packet->if_incoming->soft_iface;
struct bat_priv *bat_priv = netdev_priv(soft_iface);
struct net_device *soft_iface;
struct bat_priv *bat_priv;
struct batman_packet *batman_packet =
(struct batman_packet *)(forw_packet->skb->data);
unsigned char directlink = (batman_packet->flags & DIRECTLINK ? 1 : 0);
Expand All @@ -172,6 +172,9 @@ static void send_packet(struct forw_packet *forw_packet)
return;
}

soft_iface = forw_packet->if_incoming->soft_iface;
bat_priv = netdev_priv(soft_iface);

if (forw_packet->if_incoming->if_status != IF_ACTIVE)
return;

Expand Down

0 comments on commit 9b37bc2

Please sign in to comment.