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 9FEAD280A3B; Wed, 4 Feb 2026 14:43:31 +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=1770216211; cv=none; b=Qtuvf5EaJQVoSTqTLbpgq4pLKKT8zG7a15EUic2dP00xIMUS6kD86iLihZ9Kc7s6mmInTkvYEPthEwoA71kKt2h8lv65717KuEYwYY+QuXkZLwo79cx5qe+NOn5bE5Bo75qhZm5UwMlifNG0TpMhpi50uFmgXUrlobhQIAlP2XE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770216211; c=relaxed/simple; bh=n/IofHLET7tWCRFZURGzjoRNvXzpnPeGTp3+xZFfjEk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sFJL0wFTr7vquAggwFb5Sqs50CkfkvmDl1VfEN/9CAnC5d7s0M7ceRb79iBGGjNXI9aoaseSCPgpdIiw7ZaUS94NVKkF5CG9ZGpFLUXMCoPijkgR1nuyleqQsIZ0pvaAKoPOe6XixRAM1w4sZWPn4UCWs0rD2bB/XqCsCwoOx6k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xMt/jgYM; 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="xMt/jgYM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D16BBC4CEF7; Wed, 4 Feb 2026 14:43:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770216211; bh=n/IofHLET7tWCRFZURGzjoRNvXzpnPeGTp3+xZFfjEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xMt/jgYMiSQkWrPOnBh7BPfbVtUK0N9E4KqhzU8zG7cRe6Z04Aw5KNf38TMPjCP+P lFWhS4qpLjExZJs1fRA5OHRqwc9Ru69eUCK3iVbp+igmPNCyZEgbzN8qG3CEQ9OXZl LuJB+WJCfRPYRJdqQ8EfcCMGuI+m6z9nmgpAhxkM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jaroslav Kysela , Takashi Iwai Subject: [PATCH 5.10 020/161] ALSA: pcm: Improve the fix for race of buffer access at PCM OSS layer Date: Wed, 4 Feb 2026 15:38:03 +0100 Message-ID: <20260204143852.490754804@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143851.755002596@linuxfoundation.org> References: <20260204143851.755002596@linuxfoundation.org> User-Agent: quilt/0.69 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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jaroslav Kysela commit 47c27c9c9c720bc93fdc69605d0ecd9382e99047 upstream. Handle the error code from snd_pcm_buffer_access_lock() in snd_pcm_runtime_buffer_set_silence() function. Found by Alexandros Panagiotou Fixes: 93a81ca06577 ("ALSA: pcm: Fix race of buffer access at PCM OSS layer") Cc: stable@vger.kernel.org # 6.15 Signed-off-by: Jaroslav Kysela Link: https://patch.msgid.link/20260107213642.332954-1-perex@perex.cz Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- include/sound/pcm.h | 2 +- sound/core/oss/pcm_oss.c | 4 +++- sound/core/pcm_native.c | 9 +++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -1334,7 +1334,7 @@ int snd_pcm_lib_mmap_iomem(struct snd_pc #define snd_pcm_lib_mmap_iomem NULL #endif -void snd_pcm_runtime_buffer_set_silence(struct snd_pcm_runtime *runtime); +int snd_pcm_runtime_buffer_set_silence(struct snd_pcm_runtime *runtime); /** * snd_pcm_limit_isa_dma_size - Get the max size fitting with ISA DMA transfer --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -1078,7 +1078,9 @@ static int snd_pcm_oss_change_params_loc runtime->oss.params = 0; runtime->oss.prepare = 1; runtime->oss.buffer_used = 0; - snd_pcm_runtime_buffer_set_silence(runtime); + err = snd_pcm_runtime_buffer_set_silence(runtime); + if (err < 0) + goto failure; runtime->oss.period_frames = snd_pcm_alsa_frames(substream, oss_period_size); --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -687,13 +687,18 @@ static void snd_pcm_buffer_access_unlock } /* fill the PCM buffer with the current silence format; called from pcm_oss.c */ -void snd_pcm_runtime_buffer_set_silence(struct snd_pcm_runtime *runtime) +int snd_pcm_runtime_buffer_set_silence(struct snd_pcm_runtime *runtime) { - snd_pcm_buffer_access_lock(runtime); + int err; + + err = snd_pcm_buffer_access_lock(runtime); + if (err < 0) + return err; if (runtime->dma_area) snd_pcm_format_set_silence(runtime->format, runtime->dma_area, bytes_to_samples(runtime, runtime->dma_bytes)); snd_pcm_buffer_access_unlock(runtime); + return 0; } EXPORT_SYMBOL_GPL(snd_pcm_runtime_buffer_set_silence);