From nobody Thu Jun 11 09:31:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gbcph63gnz6h3Ll for ; Thu, 11 Jun 2026 09:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gbcph5Th1z3qxS for ; Thu, 11 Jun 2026 09:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781170284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ei5mLW9Ckx8R8G5giR7Z/v7MUgRhaguIqGcGVBgooek=; b=jA8/WrVV1a8Qwuk5ff61fMOhiPpDffgBcT+A5cw6N+6Lv/giU0yjqnJMVvjw4C3nvuQ6mm LMWYZ2NZ9+PNWtuO4tf+aOjYwgq4G0XqzXhPaSoL3KR+5af4PEYKjP7OBG+ib0PQOOwoy4 g3AWwt1AQ5vUzNvP6Qj98Rn1WHUjDb7fGA0ok+Ghzb28cPoAaQBrCbbU/RUkMRPoj9mMAJ 73AV4Jeh5vxbjT1CSKVsDK7Lu2WWjfxsBF0vpDAK4s8J0+vh8t6+tL+bvByRMrYUnJ0njh ABoDjGv19lNOqYRCQzzl90Zh7PmX/zU0VH86H6NvUsSma6U5by0JOmAix2j0hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781170284; a=rsa-sha256; cv=none; b=UNdsi7HY/CssFvYO5oNazi4xoS9egWM34m4OPi43aLm0J78rJXAoztDOstxABT+blfLy9Z 617P9WeA8Z6sUJ+6c7l16be0TbFcVUzquVCFaPwMOBbPzkAXXU6/U3pCcRIhlM23A6oD2H jGidvghv9+uqdtKaK6+FBqLTVl6SkNGitl7ZLKSfnXF7a5C7KsBoVnAWtcraoXmiUK27W0 xH0P9TnDD00E62gTO209LA7ijPSZFOvWy+b1WZtiXI5PI5/MTrI0l4Rb91OSfBFF80AXPM nYPsNnUNqXQSqMi3p7FwlRgtC++r6MKSdoxzM7RNKNyXHlVMHYkNcAs9Z9r2Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781170284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ei5mLW9Ckx8R8G5giR7Z/v7MUgRhaguIqGcGVBgooek=; b=Q99DspZjhowyTuTaeL4XAc5T8hdIynfMHjEBdFZmHC+2bEDlRSP/qD73kSENok0J1pGJqu 3T7ccs7OedyxsqPuO0DNnZhMKEvKgSb7HuzpeGhDg7fNjPA0OOTvP7BazxgdDeSMK0Tft6 0lPsHrnt6pcBDdh8Tvo4lwqhgxb1xR2bjykgbUeGSnKTfQjpsrmBs50yyAUyE2taXWg2x3 AjCP56+nQRtsRvZNsdfJIf/iz6c8ekLw5NG6/9EzCNC/bbNH/06dWawc9lWm2OxrFcgpnJ 7GrnYM4KqnFxGWZFG2SjwmiTzl27UZ9Zp8Sy8OFK2wQ9JoETZAqfejx4iV5i5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gbcph4v2MzlnM for ; Thu, 11 Jun 2026 09:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32e9e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 11 Jun 2026 09:31:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 0bd5ef6b4363 - main - virtual_oss(8): Properly cleanup cuse(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bd5ef6b43633a3cf77495a087a9376b2b3b11c9 Auto-Submitted: auto-generated Date: Thu, 11 Jun 2026 09:31:09 +0000 Message-Id: <6a2a805d.32e9e.14d065d3@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0bd5ef6b43633a3cf77495a087a9376b2b3b11c9 commit 0bd5ef6b43633a3cf77495a087a9376b2b3b11c9 Author: Christos Margiolis AuthorDate: 2026-05-29 11:32:42 +0000 Commit: Christos Margiolis CommitDate: 2026-06-11 09:30:22 +0000 virtual_oss(8): Properly cleanup cuse(3) virtual_oss(8) does not currently keep track of the cuse(3) it creates, nor does it destroy any of them on exit, except for the control device. This is harmless if virtual_oss(8) is killed after all audio streams have been shut down, but if it's killed during I/O, the process hangs and/or goes into uninterruptible sleep state. To fix this, have pointers to all cuse(3) devices, and explicitly destroy them on exit. Also make sure we don't leak memory in dup_profile(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: jrm Pull-Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/41 --- usr.sbin/virtual_oss/virtual_oss/int.h | 2 ++ usr.sbin/virtual_oss/virtual_oss/main.c | 39 +++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/int.h b/usr.sbin/virtual_oss/virtual_oss/int.h index 974f1a51f573..7b7cabd62743 100644 --- a/usr.sbin/virtual_oss/virtual_oss/int.h +++ b/usr.sbin/virtual_oss/virtual_oss/int.h @@ -122,6 +122,8 @@ struct virtual_profile { vclient_head_t head; char oss_name[VMAX_STRING]; char wav_name[VMAX_STRING]; + struct cuse_dev *oss_dev; + struct cuse_dev *wav_dev; uint32_t rx_filter_size; uint32_t tx_filter_size; double *rx_filter_data[VMAX_CHAN]; diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index 1d24be89f3da..9eafd5549a5c 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -1858,6 +1858,15 @@ done: nvlist_destroy(nvl); } +static void +cleanup_profile(vprofile_t *pvp) +{ + if (pvp->oss_dev != NULL) + cuse_dev_destroy(pvp->oss_dev); + if (pvp->wav_dev != NULL) + cuse_dev_destroy(pvp->wav_dev); +} + static const char * dup_profile(vprofile_t *pvp, int *pamp, int pol, int rx_mute, int tx_mute, int synchronized, int is_client) @@ -1865,6 +1874,7 @@ dup_profile(vprofile_t *pvp, int *pamp, int pol, int rx_mute, vprofile_t *ptr; struct cuse_dev *pdev; struct group *gr; + const char *errstr; gid_t gid; int x, perm; @@ -1937,9 +1947,10 @@ dup_profile(vprofile_t *pvp, int *pamp, int pol, int rx_mute, pdev = cuse_dev_create(&vclient_oss_methods, ptr, NULL, 0, gid, perm, ptr->oss_name); if (pdev == NULL) { - free(ptr); - return ("Could not create CUSE DSP device"); + errstr = "Could not create CUSE DSP device"; + goto err; } + ptr->oss_dev = pdev; /* register to sndstat */ ptr->fd_sta = open("/dev/sndstat", O_WRONLY); @@ -1954,9 +1965,10 @@ dup_profile(vprofile_t *pvp, int *pamp, int pol, int rx_mute, pdev = cuse_dev_create(&vclient_wav_methods, ptr, NULL, 0, gid, perm, ptr->wav_name); if (pdev == NULL) { - free(ptr); - return ("Could not create CUSE WAV device"); + errstr = "Could not create CUSE WAV device"; + goto err; } + ptr->wav_dev = pdev; } atomic_lock(); @@ -1991,6 +2003,13 @@ dup_profile(vprofile_t *pvp, int *pamp, int pol, int rx_mute, init_compressor(pvp); return (voss_httpd_start(ptr)); + +err: + cleanup_profile(ptr); + free(ptr); + + return (errstr); + } static void @@ -2560,6 +2579,7 @@ main(int argc, char **argv) const char *ptrerr; struct sigaction sa; struct cuse_dev *pdev = NULL; + struct virtual_profile *pvp; TAILQ_INIT(&virtual_profile_client_head); TAILQ_INIT(&virtual_profile_loopback_head); @@ -2645,8 +2665,19 @@ main(int argc, char **argv) destroy_threads(); + /* Destroy CUSE devices */ + if (voss_ctl_device[0] != 0) cuse_dev_destroy(pdev); + TAILQ_FOREACH(pvp, &virtual_profile_client_head, entry) { + cleanup_profile(pvp); + } + TAILQ_FOREACH(pvp, &virtual_profile_loopback_head, entry) { + cleanup_profile(pvp); + } + + cuse_uninit(); + return (0); }