From nobody Thu Nov 12 16:38:18 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 4jQR0C1TDDz70sjL for ; Thu, 12 Nov 2026 16:38:19 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQR0B5pTxz4JfS for ; Thu, 12 Nov 2026 16:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794501498; 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=REhC39XwdWDOspVBfns6fFWBSbzuo7jIHQA9U9l9lRU=; b=pOIW5KlvRHbo5dMiYX8LVHddAMdOD3ptnKjdazbnYMR9VUm1Mo6PKesb7pBNpUqWV3mUnS fZdPHMeanlsjI2Ng2qfyDbvDpO+EgX5bFzwO4h1zIfO5YUm7oE/V8SXTxW84hco0lK7ThO 5c6O9803s9cNssumaWzeGYHQ6Yz6cpDJFB5nxmWSzmCJx8CZXDSnmAFfcXt0OoSVI/N9R5 Ppu+XnqCPDxm5Qa8U01S/nahR9KlN4dkkVQRs8nSqsqibHmcNxv19i0AyREcZAqLm1lZOB pxDqp/BJBlzE2wfWtP6nkBVp19aJrepLZ7GpIkASgSF5s7ELiQTzoRcql/3imA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794501498; b=IGfZyfjmywlb6p0pG5Fqpu/sCx66ciKq07//7PffyWXhRoemKTxBupk0ssuyGmxUkKltvY 2numT/ugz8xvohBgSUgFkoUY8gHUSPZkvYkjrezdiVBq9EcyAx4h9mtqj5ZF+/yXpXPrGG MOB+JEGD6WTipl0N0Pne+uSWEL4Ql0svw3rEEi5QsjptFFq/hCnX2CbTDJNdzpC25SS1dc L69XjikyqSidgyoKxNZudY/2XSAn1gh+4K8E8VAI6Tz6zuZQFkVxzeHYKg4gdQtUqN9kig AeVoxVqKp0+G1qMF6mlD3zdIIYxRB4ka1dWhSupyqSxMjhKCTaukbIPk70rMaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794501498; 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=REhC39XwdWDOspVBfns6fFWBSbzuo7jIHQA9U9l9lRU=; b=LQaHmL5EynrRenjHywqKwu7jx/Ekii27FcEmDUfkx7A0fyMbCluRv5CUkt0Rpe6Wukhfa2 HI9W8qhAC0nngLpfKYShOvguc3y6A6+JicnWItSx4n2aiRz+nyYuB5D/wUBrnGpaLzvriI BBW1cFyB0xAedfxffl+zkN/0I5R2TlNe4hknTfA29Vpr0kTqef9+J31T9sz3jZMW+mZYNK UkKY5Nv+QvsXrcOTpfF15CgoZVOTVwhRruMESMqUGA8Jx/5zfzgvbQuPtGlRyEOEEfmw90 Sg11Y4nb6eE7BYIgEYYZVmjcL6xjsd5gyRnAK5X7ryZkGZ6ii+rFNLJlptQGOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQR0B5Tjtz19dY for ; Thu, 12 Nov 2026 16:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 381e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 16:38:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: ab9bdb417b41 - main - sound/midi: Centralize snd_midi cleanup List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: ab9bdb417b41b853e3ec668796e42ff65ccfcedb Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 16:38:18 +0000 Message-Id: <6af5eb7a.381e.628dc9e6@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ab9bdb417b41b853e3ec668796e42ff65ccfcedb commit ab9bdb417b41b853e3ec668796e42ff65ccfcedb Author: Christos Margiolis AuthorDate: 2026-11-12 10:28:52 +0000 Commit: Christos Margiolis CommitDate: 2026-11-12 16:35:49 +0000 sound/midi: Centralize snd_midi cleanup midi_init()'s error path leaked both unit numbers and duplicated existing code. While here, drop the locking in midi_init(), because nothing can reach m before make_dev() publishes it. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/dev/sound/midi/midi.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index f812ef0f0253..694df4ef6aa7 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -126,6 +126,17 @@ midi_queue_deq(struct midi_queue *q, uint8_t *dst, size_t n) memmove(q->buf, q->buf + n, q->used); } +static void +midi_destroy(struct snd_midi *m) +{ + free_unr(dev_unr, m->unit); + free_unr(chn_unr, m->channel); + free(m->inq.buf, M_MIDI); + free(m->outq.buf, M_MIDI); + mtx_destroy(&m->lock); + free(m, M_MIDI); +} + /* * Register a new midi device. * @@ -145,8 +156,10 @@ midi_init(kobj_class_t cls, void *cookie) inqsize = MPU_INQSIZE(m, cookie); outqsize = MPU_OUTQSIZE(m, cookie); - if (!inqsize && !outqsize) - goto err1; + if (!inqsize && !outqsize) { + free(m, M_MIDI); + return (NULL); + } mtx_init(&m->lock, "raw midi", NULL, 0); @@ -155,8 +168,6 @@ midi_init(kobj_class_t cls, void *cookie) if (outqsize) obuf = malloc(outqsize, M_MIDI, M_WAITOK); - mtx_lock(&m->lock); - m->hiwat = outqsize / 2; m->inq.buf = ibuf; @@ -168,25 +179,16 @@ midi_init(kobj_class_t cls, void *cookie) m->channel = alloc_unr(chn_unr); m->cookie = cookie; - if (MPU_INIT(m, cookie)) - goto err2; - - mtx_unlock(&m->lock); + if (MPU_INIT(m, cookie)) { + midi_destroy(m); + return (NULL); + } m->dev = make_dev(&midi_cdevsw, m->unit, UID_ROOT, GID_AUDIO, 0660, "midi%d.%d", m->unit, m->channel); m->dev->si_drv1 = m; - return m; - -err2: - mtx_destroy(&m->lock); - - free(m->inq.buf, M_MIDI); - free(m->outq.buf, M_MIDI); -err1: - free(m, M_MIDI); - return NULL; + return (m); } int @@ -204,12 +206,7 @@ midi_uninit(struct snd_midi *m) mtx_unlock(&m->lock); MPU_UNINIT(m, m->cookie); destroy_dev(m->dev); - free_unr(dev_unr, m->unit); - free_unr(chn_unr, m->channel); - free(m->inq.buf, M_MIDI); - free(m->outq.buf, M_MIDI); - mtx_destroy(&m->lock); - free(m, M_MIDI); + midi_destroy(m); return (0); }