From patchwork Sun Jan 27 19:43:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 216058 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4522C2C0091 for ; Mon, 28 Jan 2013 06:45:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755467Ab3A0To5 (ORCPT ); Sun, 27 Jan 2013 14:44:57 -0500 Received: from contumacia.investici.org ([178.255.144.35]:37025 "EHLO contumacia.investici.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755395Ab3A0Toz (ORCPT ); Sun, 27 Jan 2013 14:44:55 -0500 Received: from [178.255.144.35] (contumacia [178.255.144.35]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id AC511E8C42; Sun, 27 Jan 2013 19:44:51 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 contumacia.investici.org AC511E8C42 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1359315894; bh=ZGqZxHeSNkGinWBnyUEtaQ6f4PLTq4zFsBq4UR4J4cg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=J18qGJhylIwtvmMG1zEj/wBW/3cwHroi8+/CScb48sLLinWAxPNJUrOXp12fL+8fz eKy0GOaPxKrCzfNgsptGIwTHutYFJ1YRiUKy7uVolpfHqnIQyfkCBDQRn58gu5Xdbm i0aEgcPrqLXs3vWd4IZQMF+dZxM9GFytNgPiMERo= From: Antonio Quartulli To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Matthias Schiffer , Marek Lindner , Antonio Quartulli Subject: [PATCH 1/3] batman-adv: fix skb leak in batadv_dat_snoop_incoming_arp_reply() Date: Sun, 27 Jan 2013 20:43:57 +0100 Message-Id: <1359315839-24136-2-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.8.1.1 In-Reply-To: <1359315839-24136-1-git-send-email-ordex@autistici.org> References: <1359315839-24136-1-git-send-email-ordex@autistici.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Matthias Schiffer The callers of batadv_dat_snoop_incoming_arp_reply() assume the skb has been freed when it returns true; fix this by calling kfree_skb before returning as it is done in batadv_dat_snoop_incoming_arp_request(). Signed-off-by: Matthias Schiffer Signed-off-by: Marek Lindner Acked-by: Antonio Quartulli Signed-off-by: Antonio Quartulli --- net/batman-adv/distributed-arp-table.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 7485a78..9f4cff3 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -1012,6 +1012,8 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, */ ret = !batadv_is_my_client(bat_priv, hw_dst); out: + if (ret) + kfree_skb(skb); /* if ret == false -> packet has to be delivered to the interface */ return ret; }