diff options
author | sam <sam@FreeBSD.org> | 2005-02-26 02:31:34 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2005-02-26 02:31:34 +0000 |
commit | 91d370b82c2b0933dab3811cc65b5909d9bdded6 (patch) | |
tree | fa2ca8578cc68e04be4ec6cf287f805413a674bd /sys | |
parent | 0214e187afbaf0828ba5150116108e477bc04222 (diff) | |
download | FreeBSD-src-91d370b82c2b0933dab3811cc65b5909d9bdded6.zip FreeBSD-src-91d370b82c2b0933dab3811cc65b5909d9bdded6.tar.gz |
move ptr use down to after null check
Noticed by: Coverity Prevent analysis tool
Reviewed by: emax
Diffstat (limited to 'sys')
-rw-r--r-- | sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c index 23f72fa..152a836 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c @@ -3325,9 +3325,6 @@ ng_btsocket_rfcomm_pcb_kill(ng_btsocket_rfcomm_pcb_p pcb, int error) { ng_btsocket_rfcomm_session_p s = pcb->session; - mtx_assert(&pcb->session->session_mtx, MA_OWNED); - mtx_assert(&pcb->pcb_mtx, MA_OWNED); - NG_BTSOCKET_RFCOMM_INFO( "%s: Killing DLC, so=%p, dlci=%d, state=%d, flags=%#x, error=%d\n", __func__, pcb->so, pcb->dlci, pcb->state, pcb->flags, error); @@ -3336,6 +3333,9 @@ ng_btsocket_rfcomm_pcb_kill(ng_btsocket_rfcomm_pcb_p pcb, int error) panic("%s: DLC without session, pcb=%p, state=%d, flags=%#x\n", __func__, pcb, pcb->state, pcb->flags); + mtx_assert(&pcb->session->session_mtx, MA_OWNED); + mtx_assert(&pcb->pcb_mtx, MA_OWNED); + if (pcb->flags & NG_BTSOCKET_RFCOMM_DLC_TIMO) ng_btsocket_rfcomm_untimeout(pcb); |