* [RFC] Bluetooth: Fix memory leaks due to chan refcnt
@ 2012-03-21 15:45 Andrei Emeltchenko
2012-03-22 13:33 ` Gustavo Padovan
0 siblings, 1 reply; 3+ messages in thread
From: Andrei Emeltchenko @ 2012-03-21 15:45 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
When we queue delayed work we hold(chan) and delayed work
shall put(chan) after execution.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/l2cap_core.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index ec9f883..c90d025 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1341,6 +1341,7 @@ static void l2cap_monitor_timeout(struct work_struct *work)
if (chan->retry_count >= chan->remote_max_tx) {
l2cap_send_disconn_req(chan->conn, chan, ECONNABORTED);
l2cap_chan_unlock(chan);
+ l2cap_chan_put(chan);
return;
}
@@ -1349,6 +1350,7 @@ static void l2cap_monitor_timeout(struct work_struct *work)
l2cap_send_rr_or_rnr(chan, L2CAP_CTRL_POLL);
l2cap_chan_unlock(chan);
+ l2cap_chan_put(chan);
}
static void l2cap_retrans_timeout(struct work_struct *work)
@@ -1366,8 +1368,8 @@ static void l2cap_retrans_timeout(struct work_struct *work)
set_bit(CONN_WAIT_F, &chan->conn_state);
l2cap_send_rr_or_rnr(chan, L2CAP_CTRL_POLL);
-
l2cap_chan_unlock(chan);
+ l2cap_chan_put(chan);
}
static void l2cap_drop_acked_frames(struct l2cap_chan *chan)
--
1.7.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RFC] Bluetooth: Fix memory leaks due to chan refcnt
2012-03-21 15:45 [RFC] Bluetooth: Fix memory leaks due to chan refcnt Andrei Emeltchenko
@ 2012-03-22 13:33 ` Gustavo Padovan
2012-03-22 13:44 ` Andrei Emeltchenko
0 siblings, 1 reply; 3+ messages in thread
From: Gustavo Padovan @ 2012-03-22 13:33 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
* Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com> [2012-03-21 17:45:06 +0200]:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> When we queue delayed work we hold(chan) and delayed work
> shall put(chan) after execution.
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> net/bluetooth/l2cap_core.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
Looks you are right.
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index ec9f883..c90d025 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -1341,6 +1341,7 @@ static void l2cap_monitor_timeout(struct work_struct *work)
> if (chan->retry_count >= chan->remote_max_tx) {
> l2cap_send_disconn_req(chan->conn, chan, ECONNABORTED);
> l2cap_chan_unlock(chan);
> + l2cap_chan_put(chan);
> return;
> }
>
> @@ -1349,6 +1350,7 @@ static void l2cap_monitor_timeout(struct work_struct *work)
>
> l2cap_send_rr_or_rnr(chan, L2CAP_CTRL_POLL);
> l2cap_chan_unlock(chan);
> + l2cap_chan_put(chan);
> }
>
> static void l2cap_retrans_timeout(struct work_struct *work)
> @@ -1366,8 +1368,8 @@ static void l2cap_retrans_timeout(struct work_struct *work)
> set_bit(CONN_WAIT_F, &chan->conn_state);
>
> l2cap_send_rr_or_rnr(chan, L2CAP_CTRL_POLL);
> -
But please remove this change and re-send you patch.
Gustavo
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RFC] Bluetooth: Fix memory leaks due to chan refcnt
2012-03-22 13:33 ` Gustavo Padovan
@ 2012-03-22 13:44 ` Andrei Emeltchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrei Emeltchenko @ 2012-03-22 13:44 UTC (permalink / raw)
To: Gustavo Padovan, linux-bluetooth
On Thu, Mar 22, 2012 at 10:33:35AM -0300, Gustavo Padovan wrote:
> Hi Andrei,
>
> * Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com> [2012-03-21 17:45:06 +0200]:
>
> > From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> >
> > When we queue delayed work we hold(chan) and delayed work
> > shall put(chan) after execution.
> >
> > Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> > ---
> > net/bluetooth/l2cap_core.c | 4 +++-
> > 1 files changed, 3 insertions(+), 1 deletions(-)
>
> Looks you are right.
>
> >
> > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> > index ec9f883..c90d025 100644
> > --- a/net/bluetooth/l2cap_core.c
> > +++ b/net/bluetooth/l2cap_core.c
> > @@ -1341,6 +1341,7 @@ static void l2cap_monitor_timeout(struct work_struct *work)
> > if (chan->retry_count >= chan->remote_max_tx) {
> > l2cap_send_disconn_req(chan->conn, chan, ECONNABORTED);
> > l2cap_chan_unlock(chan);
> > + l2cap_chan_put(chan);
> > return;
> > }
> >
> > @@ -1349,6 +1350,7 @@ static void l2cap_monitor_timeout(struct work_struct *work)
> >
> > l2cap_send_rr_or_rnr(chan, L2CAP_CTRL_POLL);
> > l2cap_chan_unlock(chan);
> > + l2cap_chan_put(chan);
> > }
> >
> > static void l2cap_retrans_timeout(struct work_struct *work)
> > @@ -1366,8 +1368,8 @@ static void l2cap_retrans_timeout(struct work_struct *work)
> > set_bit(CONN_WAIT_F, &chan->conn_state);
> >
> > l2cap_send_rr_or_rnr(chan, L2CAP_CTRL_POLL);
> > -
>
> But please remove this change and re-send you patch.
Without this change the code looks inconsistent. Look to the code above;
it does not have empty line here.
Best regards
Andrei Emeltchenko
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-22 13:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-21 15:45 [RFC] Bluetooth: Fix memory leaks due to chan refcnt Andrei Emeltchenko
2012-03-22 13:33 ` Gustavo Padovan
2012-03-22 13:44 ` Andrei Emeltchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).