From patchwork Sat Oct 9 00:19:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 509 Return-Path: Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.22]) by open-mesh.org (Postfix) with SMTP id 1D97D1541F8 for ; Sat, 9 Oct 2010 02:20:36 +0200 (CEST) Received: (qmail invoked by alias); 09 Oct 2010 00:20:34 -0000 Received: from unknown (EHLO sven-desktop.lazhur.ath.cx) [89.246.210.82] by mail.gmx.net (mp008) with SMTP; 09 Oct 2010 02:20:34 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX19xkbN32ZJxcaTpvJpLRc70Rw0E6X0NLwdo95Q2na CzdQWrz+2LIw86 From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 9 Oct 2010 02:19:42 +0200 Message-Id: <1286583582-13275-1-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <20101008093941.GH11681@bicker> References: <20101008093941.GH11681@bicker> X-Y-GMX-Trusted: 0 Cc: error27@gmail.com Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: Don't dereference unchecked incoming soft_iface X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Oct 2010 00:20:38 -0000 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 Signed-off-by: Sven Eckelmann --- batman-adv/send.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) 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;