Repository : ssh://git@open-mesh.org/batman-adv
Branch 'next' now includes:
113f264 batman-adv: fix reference counting imbalance while sending fragment
06566d8 Merge branch 'maint' into next
Repository : ssh://git@open-mesh.org/batman-adv
On branch : maint
>---------------------------------------------------------------
commit 113f264b60bc4f50011a8f736d74f91ff7da11f1
Author: Antonio Quartulli <antonio(a)open-mesh.com>
Date: Wed Apr 23 14:05:16 2014 +0200
batman-adv: fix reference counting imbalance while sending fragment
In the new fragmentation code the batadv_frag_send_packet()
function obtains a reference to the primary_if, but it does
not release it upon return.
This reference imbalance prevents the primary_if (and then
the related netdevice) to be properly released on shut down.
Fix this by releasing the primary_if in batadv_frag_send_packet().
Introduced by db56e4ecf5c2b179a0101138eacc2ec52b6ef45d
("batman-adv: Fragment and send skbs larger than mtu")
Cc: Martin Hundebøll <martin(a)hundeboll.net>
Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
Acked-by: Martin Hundebøll <martin(a)hundeboll.net>
>---------------------------------------------------------------
113f264b60bc4f50011a8f736d74f91ff7da11f1
fragmentation.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/fragmentation.c b/fragmentation.c
index 88df9b1..cc1cfd6 100644
--- a/fragmentation.c
+++ b/fragmentation.c
@@ -418,12 +418,13 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
struct batadv_neigh_node *neigh_node)
{
struct batadv_priv *bat_priv;
- struct batadv_hard_iface *primary_if;
+ struct batadv_hard_iface *primary_if = NULL;
struct batadv_frag_packet frag_header;
struct sk_buff *skb_fragment;
unsigned mtu = neigh_node->if_incoming->net_dev->mtu;
unsigned header_size = sizeof(frag_header);
unsigned max_fragment_size, max_packet_size;
+ bool ret = false;
/* To avoid merge and refragmentation at next-hops we never send
* fragments larger than BATADV_FRAG_MAX_FRAG_SIZE
@@ -483,7 +484,11 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
skb->len + ETH_HLEN);
batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
- return true;
+ ret = true;
+
out_err:
- return false;
+ if (primary_if)
+ batadv_hardif_free_ref(primary_if);
+
+ return ret;
}
Repository : ssh://git@open-mesh.org/batman-adv
Branch 'master' now includes:
a424cd5 batman-adv: fix neigh_ifinfo imbalance
cdd09f6 batman-adv: fix neigh reference imbalance
7212515 batman-adv: always run purge_orig_neighbors
9b9cdbe batman-adv: fix removing neigh_ifinfo
1c2e700 batman-adv: fix local TT check for outgoing arp requests in DAT
31f3914 batman-adv: change the MAC of each VLAN upon ndo_set_mac_address
2ac2c94 batman-adv: fix indirect hard_iface NULL dereference
0563fda Merge branch 'maint' into next
Repository : ssh://git@open-mesh.org/batman-adv
Branch 'next' now includes:
a424cd5 batman-adv: fix neigh_ifinfo imbalance
cdd09f6 batman-adv: fix neigh reference imbalance
7212515 batman-adv: always run purge_orig_neighbors
9b9cdbe batman-adv: fix removing neigh_ifinfo
1c2e700 batman-adv: fix local TT check for outgoing arp requests in DAT
31f3914 batman-adv: change the MAC of each VLAN upon ndo_set_mac_address
2ac2c94 batman-adv: fix indirect hard_iface NULL dereference
0563fda Merge branch 'maint' into next