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 2025-01-10 03:18:05 +00:00
parent df306e9b72
commit 6dadaa4a5d
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
44 changed files with 503 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sys/kern/uipc_socket.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uipc_socket.c,v 1.357 2025/01/07 23:13:46 mvs Exp $ */
/* $OpenBSD: uipc_socket.c,v 1.359 2025/01/09 17:43:33 mvs Exp $ */
/* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */
/*
@ -154,7 +154,7 @@ soalloc(const struct protosw *prp, int wait)
}
#endif
refcnt_init(&so->so_refcnt);
refcnt_init_trace(&so->so_refcnt, DT_REFCNT_IDX_SOCKET);
rw_init_flags(&so->so_lock, dom_name, RWL_DUPOK);
rw_init(&so->so_rcv.sb_lock, "sbufrcv");
rw_init(&so->so_snd.sb_lock, "sbufsnd");
@ -1388,9 +1388,10 @@ sosplice(struct socket *so, int fd, off_t max, struct timeval *tv)
sosp = soref(so->so_sp->ssp_socket);
sounsplice(so, so->so_sp->ssp_socket, 0);
sorele(sosp);
}
} else
error = EPROTO;
sbunlock(&so->so_rcv);
return (0);
return (error);
}
if (sosplice_taskq == NULL) {