]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
NET: AX.25: Stop heartbeat timer on disconnect.
authorRichard Stearn <richard@rns-stearn.demon.co.uk>
Mon, 13 Jul 2015 09:38:24 +0000 (11:38 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Jul 2015 22:59:58 +0000 (15:59 -0700)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ax25/ax25_subr.c

index 1997538a5d23d93ddca9724fd3787dc0b0b2595a..3b78e8473a01b4a82e376266b04078e714ce1e26 100644 (file)
@@ -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);