Skip to contentSkip to conversation

Patch "batman-adv: Fix broadcast/ogm queue limit on a removed interface" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message May 6, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

batman-adv: Fix broadcast/ogm queue limit on a removed interface

to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Linus=20L=C3=BCssing?= <[email protected]>
Date: Fri, 11 Mar 2016 14:04:49 +0100
Subject: batman-adv: Fix broadcast/ogm queue limit on a removed interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Linus Lüssing <[email protected]>

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")
[[email protected]: fix conflicts with current version]
---
 net/batman-adv/send.c |    6 ++++++
 1 file changed, 6 insertions(+)
net/batman-adv/send.c +6 -0
@@ -656,6 +656,12 @@ batadv_purge_outstanding_packets(struct
 
 		if (pending) {
 			hlist_del(&forw_packet->list);
+			if (!forw_packet->own)
+				atomic_inc(&bat_priv->bcast_queue_left);
+
+			if (!forw_packet->own)
+				atomic_inc(&bat_priv->batman_queue_left);
+
 			batadv_forw_packet_free(forw_packet);
 		}
 	}

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch