diff mbox

[3.19.y-ckt,013/130] NET: AX.25: Stop heartbeat timer on disconnect.

Message ID 1440713521-5906-14-git-send-email-kamal@canonical.com
State New
Headers show

Commit Message

Kamal Mostafa Aug. 27, 2015, 10:10 p.m. UTC 
3.19.8-ckt6 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Richard Stearn <richard@rns-stearn.demon.co.uk>

commit da278622bf04f8ddb14519a2b8214e108ef26101 upstream.

This may result in a kernel panic.  The bug has always existed but
somehow we've run out of luck now and it bites.

Signed-off-by: Richard Stearn <richard@rns-stearn.demon.co.uk>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 net/ax25/ax25_subr.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Richard Stearn Aug. 28, 2015, 8:52 a.m. UTC | #1 
Kamal Mostafa wrote:
> 3.19.8-ckt6 -stable review patch.  If anyone has any objections, please let me know.

Hi Kamal

This patch should _not_ be applied.
Breaks other parts of the driver.
Investigations on-going.

Apologies for the disruption.
Kamal Mostafa Aug. 28, 2015, 9:08 p.m. UTC | #2 
On Fri, 2015-08-28 at 09:52 +0100, Richard Stearn wrote:
> Kamal Mostafa wrote:
> > 3.19.8-ckt6 -stable review patch.  If anyone has any objections, please let me know.
> 
> Hi Kamal
> 
> This patch should _not_ be applied.
> Breaks other parts of the driver.
> Investigations on-going.
> 
> Apologies for the disruption.

No worries -- I've dropped this patch from 3.19-stable.  Thanks very
much, Richard.

 -Kamal
diff mbox

Patch

diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c
index 1997538..3b78e84 100644
--- a/net/ax25/ax25_subr.c
+++ b/net/ax25/ax25_subr.c
@@ -264,6 +264,7 @@  void ax25_disconnect(ax25_cb *ax25, int reason)
 {
 	ax25_clear_queues(ax25);
 
+	ax25_stop_heartbeat(ax25);
 	ax25_stop_t1timer(ax25);
 	ax25_stop_t2timer(ax25);
 	ax25_stop_t3timer(ax25);