diff mbox

batman-adv: Don't dereference unchecked incoming soft_iface

Message ID 1286583582-13275-1-git-send-email-sven.eckelmann@gmx.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Sven Eckelmann Oct. 9, 2010, 12:19 a.m. UTC 
  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>
---
 batman-adv/send.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

Comments

Marek Lindner Oct. 9, 2010, 11:51 a.m. UTC | #1 
On Saturday 09 October 2010 02:19:42 Sven Eckelmann wrote:
> 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.

Applied in revision 1822.

Thanks,
Marek
diff mbox

Patch

diff --git a/batman-adv/send.c b/batman-adv/send.c
index 625a3ba..7097ff0 100644
--- a/batman-adv/send.c
+++ b/batman-adv/send.c
@@ -163,8 +163,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);
@@ -175,6 +175,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;