From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752029AbdANU3N (ORCPT ); Sat, 14 Jan 2017 15:29:13 -0500 Received: from smtp.rockisland.com ([64.119.0.12]:25931 "EHLO mars.rockisland.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751771AbdANU3L (ORCPT ); Sat, 14 Jan 2017 15:29:11 -0500 X-Greylist: delayed 594 seconds by postgrey-1.27 at vger.kernel.org; Sat, 14 Jan 2017 15:29:10 EST Date: Sat, 14 Jan 2017 12:18:55 -0800 From: Basil Gunn To: Joerg Reuter , Ralf Baechle , "David S. Miller" , linux-hams@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Jeremy McDermond , f6bvp Subject: [PATCH 1/1] ax25: Fix segfault after sock connection timeout Message-ID: <20170114121855.62254455@brox.localnet> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ax.25 socket connection timed out & the sock struct has been previously taken down ie. sock struct is now a NULL pointer. Checking the sock_flag causes the segfault. Check if the socket struct pointer is NULL before checking sock_flag. This segfault is seen in timed out netrom connections. Please submit to -stable. Signed-off-by: Basil Gunn --- diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c index 4855d18..038b109 100644 --- a/net/ax25/ax25_subr.c +++ b/net/ax25/ax25_subr.c @@ -264,7 +264,7 @@ void ax25_disconnect(ax25_cb *ax25, int reason) { ax25_clear_queues(ax25); - if (!sock_flag(ax25->sk, SOCK_DESTROY)) + if (!ax25->sk || !sock_flag(ax25->sk, SOCK_DESTROY)) ax25_stop_heartbeat(ax25); ax25_stop_t1timer(ax25); ax25_stop_t2timer(ax25);