The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=0228338fc9c6d2243fe4fd3259286d2fbc6df786
commit 0228338fc9c6d2243fe4fd3259286d2fbc6df786 Author: Slawa Olhovchenkov <slw_zxy.spb.ru> AuthorDate: 2026-07-13 16:02:43 +0000 Commit: Bojan Novković <[email protected]> CommitDate: 2026-07-14 15:17:51 +0000 bhyve: Fix some leaks in usr.sbin/bhyve/block_if.c Modify `blockif_open` to properly release a partially initialized `blockif_ctxt` structure on error. Differential Revision: https://reviews.freebsd.org/D57887 Reviewed by: novel, bnovkov, glebius Tested by: bnovkov MFC after: 2 weeks --- usr.sbin/bhyve/block_if.c | 48 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c index 32543f9f3a18..0a4f76ae197d 100644 --- a/usr.sbin/bhyve/block_if.c +++ b/usr.sbin/bhyve/block_if.c @@ -495,6 +495,7 @@ blockif_open(nvlist_t *nvl, const char *ident) pthread_once(&blockif_once, blockif_init); + bc = NULL; fd = -1; extra = 0; ssopt = 0; @@ -650,10 +651,13 @@ blockif_open(nvlist_t *nvl, const char *ident) bc->bc_sectsz = sectsz; bc->bc_psectsz = psectsz; bc->bc_psectoff = psectoff; - pthread_mutex_init(&bc->bc_mtx, NULL); - pthread_cond_init(&bc->bc_cond, NULL); + if (pthread_mutex_init(&bc->bc_mtx, NULL) != 0) + goto err; + if (pthread_cond_init(&bc->bc_cond, NULL) != 0) + goto err; bc->bc_paused = 0; - pthread_cond_init(&bc->bc_work_done_cond, NULL); + if (pthread_cond_init(&bc->bc_work_done_cond, NULL) != 0) + goto err; TAILQ_INIT(&bc->bc_freeq); TAILQ_INIT(&bc->bc_pendq); TAILQ_INIT(&bc->bc_busyq); @@ -664,13 +668,34 @@ blockif_open(nvlist_t *nvl, const char *ident) } for (i = 0; i < BLOCKIF_NUMTHR; i++) { - pthread_create(&bc->bc_btid[i], NULL, blockif_thr, bc); + if (pthread_create(&bc->bc_btid[i], NULL, blockif_thr, bc) != 0) { + bc->bc_btid[i] = NULL; + goto err; + } snprintf(tname, sizeof(tname), "blk-%s-%d", ident, i); pthread_set_name_np(bc->bc_btid[i], tname); } return (bc); err: + if (bc != NULL) { + void *jval; + if (bc->bc_cond != NULL) { + pthread_mutex_lock(&bc->bc_mtx); + bc->bc_closing = 1; + pthread_mutex_unlock(&bc->bc_mtx); + pthread_cond_broadcast(&bc->bc_cond); + for (i = 0; i < BLOCKIF_NUMTHR; i++) + if (bc->bc_btid[i] != NULL) + pthread_join(bc->bc_btid[i], &jval); + pthread_cond_destroy(&bc->bc_cond); + } + if (bc->bc_mtx != NULL) + pthread_mutex_destroy(&bc->bc_mtx); + if (bc->bc_work_done_cond != NULL) + pthread_cond_destroy(&bc->bc_work_done_cond); + free(bc); + } if (fd >= 0) close(fd); return (NULL); @@ -806,6 +831,7 @@ blockif_delete(struct blockif_ctxt *bc, struct blockif_req *breq) int blockif_cancel(struct blockif_ctxt *bc, struct blockif_req *breq) { + struct blockif_sig_elem bse; struct blockif_elem *be; assert(bc->bc_magic == BLOCKIF_SIG); @@ -849,11 +875,10 @@ blockif_cancel(struct blockif_ctxt *bc, struct blockif_req *breq) * Interrupt the processing thread to force it return * prematurely via it's normal callback path. */ + pthread_mutex_init(&bse.bse_mtx, NULL); + pthread_cond_init(&bse.bse_cond, NULL); while (be->be_status == BST_BUSY) { - struct blockif_sig_elem bse, *old_head; - - pthread_mutex_init(&bse.bse_mtx, NULL); - pthread_cond_init(&bse.bse_cond, NULL); + struct blockif_sig_elem *old_head; bse.bse_pending = 1; @@ -872,6 +897,8 @@ blockif_cancel(struct blockif_ctxt *bc, struct blockif_req *breq) pthread_mutex_unlock(&bse.bse_mtx); } + pthread_mutex_destroy(&bse.bse_mtx); + pthread_cond_destroy(&bse.bse_cond); pthread_mutex_unlock(&bc->bc_mtx); /* @@ -895,7 +922,7 @@ blockif_close(struct blockif_ctxt *bc) pthread_mutex_lock(&bc->bc_mtx); bc->bc_closing = 1; if (bc->bc_resize_event != NULL) - mevent_disable(bc->bc_resize_event); + mevent_delete(bc->bc_resize_event); pthread_mutex_unlock(&bc->bc_mtx); pthread_cond_broadcast(&bc->bc_cond); for (i = 0; i < BLOCKIF_NUMTHR; i++) @@ -908,6 +935,9 @@ blockif_close(struct blockif_ctxt *bc) */ bc->bc_magic = 0; close(bc->bc_fd); + pthread_mutex_destroy(&bc->bc_mtx); + pthread_cond_destroy(&bc->bc_cond); + pthread_cond_destroy(&bc->bc_work_done_cond); free(bc); return (0);
