* [B.A.T.M.A.N.] [PATCH maint] batman-adv: fix reference counting imbalance while sending fragment
@ 2014-04-23 12:05 Antonio Quartulli
2014-04-23 16:40 ` martin
0 siblings, 1 reply; 3+ messages in thread
From: Antonio Quartulli @ 2014-04-23 12:05 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Martin Hundebøll, Antonio Quartulli
From: Antonio Quartulli <antonio@open-mesh.com>
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@hundeboll.net>
Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
---
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;
}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [B.A.T.M.A.N.] [PATCH maint] batman-adv: fix reference counting imbalance while sending fragment
2014-04-23 12:05 [B.A.T.M.A.N.] [PATCH maint] batman-adv: fix reference counting imbalance while sending fragment Antonio Quartulli
@ 2014-04-23 16:40 ` martin
2014-05-02 5:15 ` Marek Lindner
0 siblings, 1 reply; 3+ messages in thread
From: martin @ 2014-04-23 16:40 UTC (permalink / raw)
To: The list for a Better Approach To Mobile Ad-hoc Networking
Cc: Antonio Quartulli, Antonio Quartulli
Hi Antonio,
Good catch!
On 2014-04-23 05:05, Antonio Quartulli wrote:
> From: Antonio Quartulli <antonio@open-mesh.com>
>
> 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@hundeboll.net>
> Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Acked-by: Martin Hundebøll <martin@hundeboll.net>
// Martin
> ---
> 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;
> }
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-02 5:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-23 12:05 [B.A.T.M.A.N.] [PATCH maint] batman-adv: fix reference counting imbalance while sending fragment Antonio Quartulli
2014-04-23 16:40 ` martin
2014-05-02 5:15 ` Marek Lindner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox