d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- grab ng_btsocket_l2cap_sockets_mtx lock in

Browse Source 
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
This commit is contained in:
Maksim Yevmenkin 2015-12-23 16:32:04 +00:00
parent 91569f1f38
commit 74cc817d85
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
View File

@ -708,8 +708,15 @@ static int ng_btsocket_l2cap_process_l2ca_enc_change(struct ng_mesg *msg, ng_bts
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_l2ca_enc_change(struct ng_mesg *msg, ng_bts
}
}
mtx_unlock(&pcb->pcb_mtx);
mtx_unlock(&ng_btsocket_l2cap_sockets_mtx);
return 0;
}