Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
To: alsa-devel@alsa-project.org
Cc: Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@perex.cz>,
	Arthur Marsh <arthur.marsh@internode.on.net>
Subject: [PATCH 03/18] ALSA: emux: fix validation of snd_emux.num_ports
Date: Mon,  1 Apr 2024 12:07:27 +0200	[thread overview]
Message-ID: <20240401100742.506001-4-oswald.buddenhagen@gmx.de> (raw)
In-Reply-To: <20240401100742.506001-1-oswald.buddenhagen@gmx.de>

Both bounds had off-by-one errors.

Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
---
 sound/synth/emux/emux_seq.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
index b227c7e0bc2a..1adaa75df2f6 100644
--- a/sound/synth/emux/emux_seq.c
+++ b/sound/synth/emux/emux_seq.c
@@ -65,11 +65,11 @@ snd_emux_init_seq(struct snd_emux *emu, struct snd_card *card, int index)
 		return -ENODEV;
 	}

-	if (emu->num_ports < 0) {
+	if (emu->num_ports <= 0) {
 		snd_printk(KERN_WARNING "seqports must be greater than zero\n");
 		emu->num_ports = 1;
-	} else if (emu->num_ports >= SNDRV_EMUX_MAX_PORTS) {
-		snd_printk(KERN_WARNING "too many ports."
+	} else if (emu->num_ports > SNDRV_EMUX_MAX_PORTS) {
+		snd_printk(KERN_WARNING "too many ports. "
 			   "limited max. ports %d\n", SNDRV_EMUX_MAX_PORTS);
 		emu->num_ports = SNDRV_EMUX_MAX_PORTS;
 	}
--
2.42.0.419.g70bf8a5751


  parent reply	other threads:[~2024-04-01 10:10 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-01 10:07 [PATCH 00/18] ALSA: emu10k1 & emux: fixes related to wavetable playback Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 01/18] ALSA: emux: fix /proc teardown at module unload Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 02/18] ALSA: emux: prune unused parameter from snd_soundfont_load_guspatch() Oswald Buddenhagen
2024-04-01 10:07 ` Oswald Buddenhagen [this message]
2024-04-01 10:07 ` [PATCH 04/18] ALSA: emux: fix init of patch_info.truesize in load_data() Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 05/18] ALSA: emu10k1: prune vestiges of SNDRV_SFNT_SAMPLE_{BIDIR,REVERSE}_LOOP support Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 06/18] ALSA: emux: centralize & improve patch info validation Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 07/18] ALSA: emux: improve patch ioctl data validation Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 08/18] ALSA: emu10k1: move patch loader assertions into low-level functions Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 09/18] ALSA: emu10k1: fix sample signedness issues in wavetable loader Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 10/18] ALSA: emu10k1: fix playback of 8-bit wavetable samples Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 11/18] ALSA: emu10k1: make wavetable sample playback start position exact Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 12/18] ALSA: emu10k1: shrink blank space in front of wavetable samples Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 13/18] ALSA: emu10k1: merge conditions in patch loader Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 14/18] ALSA: emu10k1: fix wavetable offset recalculation Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 15/18] ALSA: emu10k1: de-duplicate size calculations for 16-bit samples Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 16/18] ALSA: emu10k1: improve cache behavior documentation Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 17/18] ALSA: emu10k1: fix playback of short wavetable samples Oswald Buddenhagen
2024-04-01 10:07 ` [PATCH 18/18] ALSA: emux: simplify snd_sf_list.callback handling Oswald Buddenhagen
2024-04-01 10:51 ` [PATCH 00/18] ALSA: emu10k1 & emux: fixes related to wavetable playback Takashi Iwai
2024-04-01 11:18   ` Oswald Buddenhagen
2024-04-01 11:44     ` Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240401100742.506001-4-oswald.buddenhagen@gmx.de \
    --to=oswald.buddenhagen@gmx.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=arthur.marsh@internode.on.net \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox