Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966148AbcCPIJD (ORCPT ); Wed, 16 Mar 2016 04:09:03 -0400 Received: from mail.kernel.org ([198.145.29.136]:59485 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965137AbcCPIIs (ORCPT ); Wed, 16 Mar 2016 04:08:48 -0400 From: lizf@kernel.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Richard Stearn , Ralf Baechle , "David S. Miller" , Zefan Li Subject: [PATCH 3.4 030/107] NET: AX.25: Stop heartbeat timer on disconnect. Date: Wed, 16 Mar 2016 16:05:24 +0800 Message-Id: <1458115601-5762-30-git-send-email-lizf@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458115541-5712-1-git-send-email-lizf@kernel.org> References: <1458115541-5712-1-git-send-email-lizf@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 966 Lines: 34 From: Richard Stearn 3.4.111-rc1 review patch. If anyone has any objections, please let me know. ------------------ 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 Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller Signed-off-by: Zefan Li --- net/ax25/ax25_subr.c | 1 + 1 file changed, 1 insertion(+) 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); -- 1.9.1