From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 59A3A24C077; Tue, 20 May 2025 14:10:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747750253; cv=none; b=HrXjKfQwyb630a2eAkZzZuk1dc+xT65ccLYNFBjKX8qnfjoDyq0ZV9Huob2Y259rsGJnWro1hcvbbGdt85tjhrydqOniLiM9Yq/ZlB6vihonfEk30XX+pKjCk4llYehbgKAc2W7Bqmxx/16sIyJL8qXjUaVRnbUtp1jwtcgVT20= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747750253; c=relaxed/simple; bh=9atDdiq0AeLo+AAsmFKHPjQdlMFloaCPaQu7W0LaNXk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hHj0bY+0qgfe3svjL2uUCJTCy8P6MD+rnB/ryP/argwKPe4VumLOfdZpBho96riM3+i5ODI5ccupGSuAra4oMHu4c1iVlstphrzUXNKHVeKosYI50/rswK6RCHY/UY0260zgDCLNRKCsF8qqRCkuL+k9B+gbvUXcM/jkvZY8JSM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=py63MxWK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="py63MxWK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE0CFC4CEE9; Tue, 20 May 2025 14:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747750253; bh=9atDdiq0AeLo+AAsmFKHPjQdlMFloaCPaQu7W0LaNXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=py63MxWKovJ9P2FJHDSM2LCDCtQelkD/Inc22IZi9XvREbRVXXiSMT6y++t6QYdXB GMH+gZgFfR6qfFF65jb+hfBLjzXhIMy+Oh8SnA5dr0elxFisKcUuQ6cyngnXI+FYnP hMpsxgJMa6B32VS8l+E77Dy3G2I0Rpl9qma/fwUM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wentao Liang , Takashi Iwai Subject: [PATCH 6.12 091/143] ALSA: es1968: Add error handling for snd_pcm_hw_constraint_pow2() Date: Tue, 20 May 2025 15:50:46 +0200 Message-ID: <20250520125813.636360449@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250520125810.036375422@linuxfoundation.org> References: <20250520125810.036375422@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wentao Liang commit 9e000f1b7f31684cc5927e034360b87ac7919593 upstream. The function snd_es1968_capture_open() calls the function snd_pcm_hw_constraint_pow2(), but does not check its return value. A proper implementation can be found in snd_cx25821_pcm_open(). Add error handling for snd_pcm_hw_constraint_pow2() and propagate its error code. Fixes: b942cf815b57 ("[ALSA] es1968 - Fix stuttering capture") Cc: stable@vger.kernel.org # v2.6.22 Signed-off-by: Wentao Liang Link: https://patch.msgid.link/20250514092444.331-1-vulab@iscas.ac.cn Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/es1968.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c @@ -1561,7 +1561,7 @@ static int snd_es1968_capture_open(struc struct snd_pcm_runtime *runtime = substream->runtime; struct es1968 *chip = snd_pcm_substream_chip(substream); struct esschan *es; - int apu1, apu2; + int err, apu1, apu2; apu1 = snd_es1968_alloc_apu_pair(chip, ESM_APU_PCM_CAPTURE); if (apu1 < 0) @@ -1605,7 +1605,9 @@ static int snd_es1968_capture_open(struc runtime->hw = snd_es1968_capture; runtime->hw.buffer_bytes_max = runtime->hw.period_bytes_max = calc_available_memory_size(chip) - 1024; /* keep MIXBUF size */ - snd_pcm_hw_constraint_pow2(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES); + err = snd_pcm_hw_constraint_pow2(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES); + if (err < 0) + return err; spin_lock_irq(&chip->substream_lock); list_add(&es->list, &chip->substream_list);