From nobody Thu Nov 12 16:38:20 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 4jQR0F2tLMz70sZp for ; Thu, 12 Nov 2026 16:38:21 +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 4jQR0D6qz8z4JRq for ; Thu, 12 Nov 2026 16:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794501501; 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=4IBff/xQ7k7TfM1MaKs7NBOIH57qpiyxZFC+nGlY+tE=; b=T0abRA/nlvmVdl7ZCFMogdEOCWk9comRH/WGiT8QC4hWHQ2lwPezTYCUNM44U3U0qZAJxG 2teAMA2HBqQoGxyatylEQwRQXtpksHqxU5pmYNHLZZz5XFh5Iz605CuymPRP9GyXMk3Vcv G4BTrncTfG16oPi5UH0I7U/f6Wi0zWDmhyvWhRM2+LstWkDduXQiWN9QywUN2MKLPhsVrK rsizmu5O0LUD37COfgb89jQUxal6iz8oijRQyDFATRmGo6rRJ0YbtokonYk1LnRqdrDMf0 wcUWXi1Qz8Ve5B5RMOQy3R4pWC0AleF+oBUjKp68npyQKSSLTxJhQ2I5k02z6A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794501501; b=GMzssbarr3fT3n3FzjHtvBnWM8TeoEcVC9bdVzTGSO5XgZ7dxeZOEtiGhglmecXF7nyAwX ZYU9CnGzBXaf1zi9DVk2h6bjHh1vjuyLWDKwMXKV6knbtEkYvLx4C0NxBloP09Vtmoat1I cwarZscxgPBszQdn6OHqa5zeDq9vgvOBp3s0H1bIgiHGkZ6WF2S37StHKBkzRPfXC/BCFe hH6DAuOzEgVmp90Y9GjbNGxfy4JjJOJgBOOjcofHFSc1T14WjKY8XjO0WbqrNau6iS6GSM woxSNLONavItpxdymNQet3f4xUM+HmVJchdyA9QJuMMdLfEW4cDBpOUbR7sKQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794501501; 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=4IBff/xQ7k7TfM1MaKs7NBOIH57qpiyxZFC+nGlY+tE=; b=dcbK1fPj+M8Vk4V/Gbjvupd6njUfpxrCWvvXdDN+eglTuSpgjybjYMqgpq0VZLDgt4mClA nwDjykAzuTTPVKOOeHuKuRb9N8tSDGMaoDg4HPb/vqbZMq3mJQY2D3b0GMgteRzUiyChnt jV9RTJgPDeXkGevU5gd8yEfLKob6jx4wOdT90xf7QVINRWPQ4L8zKhlHg48eTGSvHCqh8l wpgDKAT+PbTrUlDxjeBOyU++BV2uIAQNJxLM6v+Y+vSK6LHwqYCWq4CVuvPVA9ssFvDNkJ QfT/VxH2WknAwU/hqCmVDIBo0JvF5IEF1PPoZXaHWthsTPThG7drGB1reZYoRQ== 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 4jQR0D69TGz18vr for ; Thu, 12 Nov 2026 16:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 215f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 16:38:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 315d50898cc2 - main - sound/midi: Create the device node with make_dev_s() 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: 315d50898cc2a561020059251a42068b3f983e78 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 16:38:20 +0000 Message-Id: <6af5eb7c.215f.e6aa624@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=315d50898cc2a561020059251a42068b3f983e78 commit 315d50898cc2a561020059251a42068b3f983e78 Author: Christos Margiolis AuthorDate: 2026-11-12 10:49:46 +0000 Commit: Christos Margiolis CommitDate: 2026-11-12 16:35:49 +0000 sound/midi: Create the device node with make_dev_s() make_dev(9) publishes the node before si_drv1 is assigned, so an open(2) racing with midi_init() could dereference si_drv1 before it's set. Triggering a UAF is not currently an issue because all cdevsw methods check for NULL, but the fix makes it more robust in any case. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/dev/sound/midi/midi.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 790fdc05feac..03f5907491ca 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -146,10 +146,12 @@ midi_destroy(struct snd_midi *m) struct snd_midi * midi_init(kobj_class_t cls, void *cookie) { + struct make_dev_args args; struct snd_midi *m; size_t inqsize, outqsize; uint8_t *ibuf = NULL; uint8_t *obuf = NULL; + int err; m = malloc(sizeof(*m), M_MIDI, M_WAITOK | M_ZERO); kobj_init((kobj_t)m, cls); @@ -184,9 +186,20 @@ midi_init(kobj_class_t cls, void *cookie) 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; + make_dev_args_init(&args); + args.mda_devsw = &midi_cdevsw; + args.mda_unit = m->unit; + args.mda_uid = UID_ROOT; + args.mda_gid = GID_AUDIO; + args.mda_mode = 0660; + args.mda_si_drv1 = m; + err = make_dev_s(&args, &m->dev, "midi%d.%d", m->unit, m->channel); + if (err != 0) { + printf("%s: failed to create midi%d.%d: error %d\n", __func__, + m->unit, m->channel, err); + midi_destroy(m); + return (NULL); + } return (m); }