iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

batman-adv: fix reference counting imbalance while sending fragment

Browse Source 
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 ee75ed8887
("batman-adv: Fragment and send skbs larger than mtu")

Cc: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Acked-by: Martin Hundebøll <martin@hundeboll.net>
This commit is contained in:
Antonio Quartulli 2014-04-23 14:05:16 +02:00 committed by Antonio Quartulli
parent 16a4142363
commit be181015a1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/batman-adv/fragmentation.c
View File

@ -418,12 +418,13 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
struct batadv_neigh_node *neigh_node) struct batadv_neigh_node *neigh_node)
{ {
struct batadv_priv *bat_priv; 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 batadv_frag_packet frag_header;
struct sk_buff *skb_fragment; struct sk_buff *skb_fragment;
unsigned mtu = neigh_node->if_incoming->net_dev->mtu; unsigned mtu = neigh_node->if_incoming->net_dev->mtu;
unsigned header_size = sizeof(frag_header); unsigned header_size = sizeof(frag_header);
unsigned max_fragment_size, max_packet_size; unsigned max_fragment_size, max_packet_size;
bool ret = false;
/* To avoid merge and refragmentation at next-hops we never send /* To avoid merge and refragmentation at next-hops we never send
* fragments larger than BATADV_FRAG_MAX_FRAG_SIZE * 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); skb->len + ETH_HLEN);
batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
return true; ret = true;
out_err: out_err:
return false; if (primary_if)
batadv_hardif_free_ref(primary_if);
return ret;
} }