From patchwork Wed Apr 20 11:46:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Hartkopp X-Patchwork-Id: 92205 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 73481B6F3E for ; Wed, 20 Apr 2011 21:46:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752759Ab1DTLqo (ORCPT ); Wed, 20 Apr 2011 07:46:44 -0400 Received: from mo-p00-ob.rzone.de ([81.169.146.161]:45754 "EHLO mo-p00-ob.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752032Ab1DTLqn (ORCPT ); Wed, 20 Apr 2011 07:46:43 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; t=1303300002; l=655; s=domk; d=hartkopp.net; h=Content-Transfer-Encoding:Content-Type:Subject:CC:To:MIME-Version: From:Date:X-RZG-CLASS-ID:X-RZG-AUTH; bh=CHNjUk+PGrpasiixbLbl22hObng=; b=PS3GRPjqhIYFbp0BuVQZtL3aEg1+sfDPoOQ1V93tVqZSWoUeQpZ/masfgASTlc0A/Uy X4a6ajutqwT7VXN7WkDFui6alrcGM2VoWz3oQhRMVg7fJqECgRNDcMnaUFQIL1y8/o3/5 qAZW3vuDg7h7ZzvOlYK85Ye15tZKw+tWGg4= X-RZG-AUTH: :P2MHfkW8eP4Mre39l357AZT/I7AY/7nT2yrT1q0ngWNsKR9Dbc7nsXB+5k/AuKaTWA== X-RZG-CLASS-ID: mo00 Received: from [192.168.178.22] (p5B0B155D.dip0.t-ipconnect.de [91.11.21.93]) by post.strato.de (mrclete mo56) (RZmta 25.17) with ESMTPA id 501042n3KBM2gb ; Wed, 20 Apr 2011 13:46:34 +0200 (MEST) Message-ID: <4DAEC7A0.1090103@hartkopp.net> Date: Wed, 20 Apr 2011 13:46:40 +0200 From: Oliver Hartkopp User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.15) Gecko/20110402 Icedove/3.1.9 MIME-Version: 1.0 To: David Miller CC: netdev@vger.kernel.org, Dave Jones Subject: can: add missing socket check in can/raw release. Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We can get here with a NULL socket argument passed from userspace, so we need to handle it accordingly. Thanks to Dave Jones pointing at this issue in net/can/bcm.c Signed-off-by: Oliver Hartkopp --- -- 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/can/raw.c b/net/can/raw.c index 649acfa..8f215e6 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -305,7 +305,12 @@ static int raw_init(struct sock *sk) static int raw_release(struct socket *sock) { struct sock *sk = sock->sk; - struct raw_sock *ro = raw_sk(sk); + struct raw_sock *ro; + + if(!sk) + return 0; + + ro = raw_sk(sk); unregister_netdevice_notifier(&ro->notifier);