From: Linus Lüssing <linus.luess...@c0d3.blue> 3.12-stable review patch. If anyone has any objections, please let me know.
=============== commit c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f upstream. When removing a single interface while a broadcast or ogm packet is still pending then we will free the forward packet without releasing the queue slots again. This patch is supposed to fix this issue. Fixes: 6d5808d4ae1b ("batman-adv: Add missing hardif_free_ref in forw_packet_free") Signed-off-by: Linus Lüssing <linus.luess...@c0d3.blue> [s...@narfation.org: fix conflicts with current version] Signed-off-by: Sven Eckelmann <s...@narfation.org> Signed-off-by: Marek Lindner <mareklind...@neomailbox.ch> Signed-off-by: Antonio Quartulli <a...@unstable.cc> Signed-off-by: Jiri Slaby <jsl...@suse.cz> --- net/batman-adv/send.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 0266edd0fa7f..3e002d3d8765 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -364,6 +364,9 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->batman_queue_left); + batadv_forw_packet_free(forw_packet); } } @@ -390,6 +393,9 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->bcast_queue_left); + batadv_forw_packet_free(forw_packet); } } -- 2.8.2