From: Simon Wunderlich <sw@simonwunderlich.de>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Martin Weinelt <martin@linuxlounge.net>,
Sven Eckelmann <sven@narfation.org>,
Simon Wunderlich <sw@simonwunderlich.de>
Subject: [PATCH 01/21] batman-adv: fix memory leak in in batadv_dat_put_dhcp
Date: Wed, 13 Feb 2019 10:55:04 +0100 [thread overview]
Message-ID: <20190213095524.10147-2-sw@simonwunderlich.de> (raw)
In-Reply-To: <20190213095524.10147-1-sw@simonwunderlich.de>
From: Martin Weinelt <martin@linuxlounge.net>
batadv_dat_put_dhcp is creating a new ARP packet via
batadv_dat_arp_create_reply and tries to forward it via
batadv_dat_send_data to different peers in the DHT. The original skb is not
consumed by batadv_dat_send_data and thus has to be consumed by the caller.
Fixes: b61ec31c8575 ("batman-adv: Snoop DHCPACKs for DAT")
Signed-off-by: Martin Weinelt <martin@linuxlounge.net>
[sven@narfation.org: add commit message]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
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 899ab051ffce..310a4f353008 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -1711,6 +1711,8 @@ static void batadv_dat_put_dhcp(struct batadv_priv *bat_priv, u8 *chaddr,
batadv_dat_send_data(bat_priv, skb, yiaddr, vid, BATADV_P_DAT_DHT_PUT);
batadv_dat_send_data(bat_priv, skb, ip_dst, vid, BATADV_P_DAT_DHT_PUT);
+ consume_skb(skb);
+
batadv_dbg(BATADV_DBG_DAT, bat_priv,
"Snooped from outgoing DHCPACK (server address): %pI4, %pM (vid: %i)\n",
&ip_dst, hw_dst, batadv_print_vid(vid));
--
2.11.0
next prev parent reply other threads:[~2019-02-13 9:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-13 9:55 [PATCH 00/21] pull request for net-next: batman-adv 2019-02-13 Simon Wunderlich
2019-02-13 9:55 ` Simon Wunderlich [this message]
2019-02-13 9:55 ` [PATCH 02/21] batman-adv: Fix typo "reseved" -> "reserved" Simon Wunderlich
2019-02-13 9:55 ` [PATCH 03/21] batman-adv: Move common genl doit code pre/post hooks Simon Wunderlich
2019-02-13 9:55 ` [PATCH 04/21] batman-adv: Prepare framework for mesh genl config Simon Wunderlich
2019-02-13 9:55 ` [PATCH 05/21] batman-adv: Prepare framework for hardif " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 06/21] batman-adv: Prepare framework for vlan " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 07/21] batman-adv: Add aggregated_ogms mesh genl configuration Simon Wunderlich
2019-02-13 9:55 ` [PATCH 08/21] batman-adv: Add ap_isolation mesh/vlan " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 09/21] batman-adv: Add bonding mesh " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 10/21] batman-adv: Add bridge_loop_avoidance " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 11/21] batman-adv: Add distributed_arp_table " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 12/21] batman-adv: Add fragmentation " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 13/21] batman-adv: Add gateway " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 14/21] batman-adv: Add hop_penalty " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 15/21] batman-adv: Add log_level " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 16/21] batman-adv: Add multicast forceflood " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 17/21] batman-adv: Add network_coding " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 18/21] batman-adv: Add orig_interval " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 19/21] batman-adv: Add elp_interval hardif " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 20/21] batman-adv: Add throughput_override " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 21/21] batman-adv: Trigger genl notification on sysfs config change Simon Wunderlich
2019-02-14 6:28 ` [PATCH 00/21] pull request for net-next: batman-adv 2019-02-13 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190213095524.10147-2-sw@simonwunderlich.de \
--to=sw@simonwunderlich.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=martin@linuxlounge.net \
--cc=netdev@vger.kernel.org \
--cc=sven@narfation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox