From nobody Wed May 22 13:23:14 2024 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 4VksSM0ZJ6z5Ljd0; Wed, 22 May 2024 13:23:15 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VksSL6srFz43Fw; Wed, 22 May 2024 13:23:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716384195; 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=OW4zJAG1qWMpECGjbvXrd5yadnz3dwLcMxZu1l4UdNA=; b=Iswn1tppIfT+EaklcHZu7FtKUOXGgdgJOV1LA03k4ouAmIG1gJbcyayjrRLwT+1Y8cMYoe HlLnj1xkn787IZIfmeGA5LWNpbbLmQ/+wtzZaaYV0w9l/mAFot5l4dI758I7arlkPYbfPY BjwRmgd1iG6hfxeMgKaYsNnYl0ckC789QXH6p/K5nwVAIhBXD+d23XyzILb2NjV5djRYSw TZvPjrXcPR8YaplMOtK+Yu++mwTSGhjJlbH5rxzd/TjrGcUt8ZAZD6yZ3JPLsSnpfLsPnE tTj3I/k+3NgbisZBZOpAUI7SSDSxj5u5gFPFXGY9KYYsQGZbUNY8m4LsdEx25g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716384195; a=rsa-sha256; cv=none; b=MR20kOxb3TQgsklu2Xtsz0kFISlXu7yajl7GNaB+rQ0EOg/ceucKL4WssEzgNv16PXnCRT qx7GauDkJ5ErrYyqhDKvP9zIboFbO5p5JJMlp6aMdhcYKJbydWNCZpMH87I0S7MP2MvCI1 DVRqeGdg+4jO9MXYvhvPE1OX2wVlF2/Up0dIESX84WD6+XBjX/XKzuddMBkr7GUvjzj45H 42npbXcDCfoEYOTXBR2LzMS1RWVNZ3ah0WIRnltzMGD90PO9xT5UQ6PLlZKTl3oiqu2DQh rBws7qwbSZjT4Lt3dx8crA7btkGNsWohom50kG8EY7qZYoOSL5EwmD2uaxU3hA== 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=1716384195; 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=OW4zJAG1qWMpECGjbvXrd5yadnz3dwLcMxZu1l4UdNA=; b=a3NUpfB3ALL55ybYYoXHz43lYsNTtIs8VnTko6GWsHtS1aunp+YGGZU2iW105QzfuohvPf H6bm8M7NB6eumSS3PDhIcNCwxo86W1Ep310Io4VbwFvL2d1Y73TcZIqEXxBv9IxAslqqxF pyecpmcYDh6EXDy/oBa+0eOhfhjV3luN1JGulZCEyUkTdWOMTfFIUToLMzQiRHY1Tev6iK bP13Bz3ex10/fSogMnDlYGGxRxyaEFQt4aB5AoEGTkYb3bu3tcx4vcP37PAAUDZQbYMuh4 ARgAVtZlW9v1mFHazkeZIPNJ0H1M9Jjtn/v69Ia1GKb65RN7LAqUtV+tHZdsCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VksSL6SY3z16ZN; Wed, 22 May 2024 13:23:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44MDNEFA098555; Wed, 22 May 2024 13:23:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44MDNE3s098553; Wed, 22 May 2024 13:23:14 GMT (envelope-from git) Date: Wed, 22 May 2024 13:23:14 GMT Message-Id: <202405221323.44MDNE3s098553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: a4a473104ec4 - releng/14.1 - sound: Remove nmix variable from mixer_oss_mixerinfo() 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 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/releng/14.1 X-Git-Reftype: branch X-Git-Commit: a4a473104ec4a42c66f1b9a09736954ebad43e7e Auto-Submitted: auto-generated The branch releng/14.1 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a4a473104ec4a42c66f1b9a09736954ebad43e7e commit a4a473104ec4a42c66f1b9a09736954ebad43e7e Author: Christos Margiolis AuthorDate: 2024-05-09 19:07:48 +0000 Commit: Christos Margiolis CommitDate: 2024-05-22 13:20:42 +0000 sound: Remove nmix variable from mixer_oss_mixerinfo() nmix is used to compare against oss_mixerinfo->dev, which is a user-supplied value to select the mixer device (if not -1, in which case we'll select the default one) we want to fetch the information of. It is also used to set oss_mixerinfo->dev in case it is -1. However, nmix is at best redundant, since we have the loop counter already (i), and confusing at worst. For example, suppose a system with 3 mixer devices. We call SNDCTL_MIXERINFO with oss_mixerinfo->dev=1, meaning we want to get information for /dev/mixer1. Suppose /dev/mixer0 detaches while inside the loop, so we'll hit the loop's "continue" case, and nmix won't get incremented (i.e will stay 0 for now). At this point nmix counts 1 device less, so when it reaches 1, we'll be fetching /dev/mixer2's information instead of /dev/mixer1's. This is also true in case the mixer device disappears prior to the call to mixer_oss_mixerinfo(). Simply remove nmix and use the loop counter to both set oss_mixerinfo->dev and check against it in case a non -1 value is supplied. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D45135 (cherry picked from commit 2f31a5eb75f1e47b5c49f574e8ce48d2c863e9d3) (cherry picked from commit 8b4e2ba31d1b171f688cb630f1827ec397ecaacb) Approved by: re (cperciva) --- sys/dev/sound/pcm/mixer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 0645089ac503..31a633afb380 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -1430,7 +1430,7 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) { struct snddev_info *d; struct snd_mixer *m; - int nmix, i; + int i; /* * If probing the device handling the ioctl, make sure it's a mixer @@ -1441,7 +1441,6 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) d = NULL; m = NULL; - nmix = 0; /* * There's a 1:1 relationship between mixers and PCM devices, so @@ -1461,7 +1460,7 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) if (d->mixer_dev != NULL && d->mixer_dev->si_drv1 != NULL && ((mi->dev == -1 && d->mixer_dev == i_dev) || - mi->dev == nmix)) { + mi->dev == i)) { m = d->mixer_dev->si_drv1; mtx_lock(m->lock); @@ -1473,7 +1472,7 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) * sure to unlock when existing. */ bzero((void *)mi, sizeof(*mi)); - mi->dev = nmix; + mi->dev = i; snprintf(mi->id, sizeof(mi->id), "mixer%d", i); strlcpy(mi->name, m->name, sizeof(mi->name)); mi->modify_counter = m->modify_counter; @@ -1537,8 +1536,7 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) mi->legacy_device = i; */ mtx_unlock(m->lock); - } else - ++nmix; + } PCM_UNLOCK(d);