From owner-svn-src-head@freebsd.org  Wed Dec 23 16:32:05 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 50C41A509DB;
 Wed, 23 Dec 2015 16:32:05 +0000 (UTC)
 (envelope-from emax@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 235D112CB;
 Wed, 23 Dec 2015 16:32:05 +0000 (UTC)
 (envelope-from emax@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNGW406093031;
 Wed, 23 Dec 2015 16:32:04 GMT (envelope-from emax@FreeBSD.org)
Received: (from emax@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNGW4m8093030;
 Wed, 23 Dec 2015 16:32:04 GMT (envelope-from emax@FreeBSD.org)
Message-Id: <201512231632.tBNGW4m8093030@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emax set sender to
 emax@FreeBSD.org using -f
From: Maksim Yevmenkin <emax@FreeBSD.org>
Date: Wed, 23 Dec 2015 16:32:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292660 - head/sys/netgraph/bluetooth/socket
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2015 16:32:05 -0000

Author: emax
Date: Wed Dec 23 16:32:04 2015
New Revision: 292660
URL: https://svnweb.freebsd.org/changeset/base/292660

Log:
  - grab ng_btsocket_l2cap_sockets_mtx lock in
    ng_btsocket_l2cap_process_l2ca_enc_change()
    before calling ng_btsocket_l2cap_pcb_by_cid();
  
  - handle possible NULL value returned from
    ng_btsocket_l2cap_pcb_by_cid();
  
  Submitted by:	Hans Petter Selasky; hps at selasky dot org
  MFC after:	1 week

Modified:
  head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c

Modified: head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
==============================================================================
--- head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c	Wed Dec 23 15:22:44 2015	(r292659)
+++ head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c	Wed Dec 23 16:32:04 2015	(r292660)
@@ -708,8 +708,15 @@ static int ng_btsocket_l2cap_process_l2c
 
 	op = (ng_l2cap_l2ca_enc_chg_op *)(msg->data);
 
+	mtx_lock(&ng_btsocket_l2cap_sockets_mtx);
+
 	pcb = ng_btsocket_l2cap_pcb_by_cid(&rt->src, op->lcid,
 					   op->idtype);
+	if (pcb == NULL) {
+		mtx_unlock(&ng_btsocket_l2cap_sockets_mtx);
+		return (ENOENT);
+	}
+
 	mtx_lock(&pcb->pcb_mtx);
 	pcb->encryption = op->result;
 	
@@ -729,6 +736,7 @@ static int ng_btsocket_l2cap_process_l2c
 		}
 	}
 	mtx_unlock(&pcb->pcb_mtx);
+	mtx_unlock(&ng_btsocket_l2cap_sockets_mtx);
 
 	return 0;
 }