From patchwork Mon Jul 13 09:38:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Baechle X-Patchwork-Id: 494481 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 13AF61400A0 for ; Mon, 13 Jul 2015 19:38:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752604AbbGMJia (ORCPT ); Mon, 13 Jul 2015 05:38:30 -0400 Received: from eddie.linux-mips.org ([148.251.95.138]:42937 "EHLO cvs.linux-mips.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751879AbbGMJi2 (ORCPT ); Mon, 13 Jul 2015 05:38:28 -0400 Received: from localhost.localdomain ([127.0.0.1]:37339 "EHLO linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by eddie.linux-mips.org with ESMTP id S27009022AbbGMJi0605Rr (ORCPT + 2 others); Mon, 13 Jul 2015 11:38:26 +0200 Received: from scotty.linux-mips.net (localhost.localdomain [127.0.0.1]) by scotty.linux-mips.net (8.15.1/8.14.8) with ESMTP id t6D9cOQM000301; Mon, 13 Jul 2015 11:38:24 +0200 Received: (from ralf@localhost) by scotty.linux-mips.net (8.15.1/8.15.1/Submit) id t6D9cOTs000300; Mon, 13 Jul 2015 11:38:24 +0200 Date: Mon, 13 Jul 2015 11:38:24 +0200 From: Ralf Baechle To: "David S. Miller" , netdev@vger.kernel.org, Richard Stearn , f6bvp , Thomas Osterried , linux-hams@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2] NET: AX.25: Stop heartbeat timer on disconnect. Message-ID: <20150713093824.GA32732@linux-mips.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Richard Stearn 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 Cc: stable@vger.kernel.org # all branches Signed-off-by: Ralf Baechle --- 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 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);