diff mbox

[v2] NET: AX.25: Stop heartbeat timer on disconnect.

Message ID 20150713093824.GA32732@linux-mips.org
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Ralf Baechle July 13, 2015, 9:38 a.m. UTC 
From: Richard Stearn <richard@rns-stearn.demon.co.uk>

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>
Cc: stable@vger.kernel.org	# all branches
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
v2: Correctly attribute the patch to Richard Stearn in the From: line

 net/ax25/ax25_subr.c | 1 +
 1 file changed, 1 insertion(+)


----- End forwarded message -----

  Ralf
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller July 15, 2015, 11:13 p.m. UTC | #1 
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 13 Jul 2015 11:38:24 +0200

> From: Richard Stearn <richard@rns-stearn.demon.co.uk>
> 
> 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>
> Cc: stable@vger.kernel.org	# all branches
> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
> ---
> v2: Correctly attribute the patch to Richard Stearn in the From: line

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
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);