SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-06-27 00:27:56 +00:00
parent 7f3136b31c
commit e26320a0e2
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
7 changed files with 29 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sys/dev/ic/nvmevar.h
View file

@ -1,4 +1,4 @@
/* $OpenBSD: nvmevar.h,v 1.29 2024/05/13 11:41:52 krw Exp $ */
/* $OpenBSD: nvmevar.h,v 1.30 2024/06/26 21:41:30 asou Exp $ */
/*
* Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
@ -32,7 +32,6 @@ struct nvme_dmamem {
#define NVME_DMA_KVA(_ndm) ((void *)(_ndm)->ndm_kva)
struct nvme_softc;
struct nvme_queue;
struct nvme_ccb {
SIMPLEQ_ENTRY(nvme_ccb) ccb_entry;

12
sys/kern/uipc_usrreq.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uipc_usrreq.c,v 1.206 2024/05/03 17:43:09 mvs Exp $ */
/* $OpenBSD: uipc_usrreq.c,v 1.207 2024/06/26 12:23:36 mvs Exp $ */
/* $NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $ */
/*
@ -761,26 +761,22 @@ unp_detach(struct unpcb *unp)
unp->unp_vnode = NULL;
/*
* Enforce `i_lock' -> `solock()' lock order.
*/
sounlock(so);
rw_enter_write(&unp_gc_lock);
LIST_REMOVE(unp, unp_link);
rw_exit_write(&unp_gc_lock);
if (vp != NULL) {
/* Enforce `i_lock' -> solock() lock order. */
sounlock(so);
VOP_LOCK(vp, LK_EXCLUSIVE);
vp->v_socket = NULL;
KERNEL_LOCK();
vput(vp);
KERNEL_UNLOCK();
solock(so);
}
solock(so);
if (unp->unp_conn != NULL) {
/*
* Datagram socket could be connected to itself.