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 06B082D594F; Wed, 4 Feb 2026 15:05:16 +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=1770217516; cv=none; b=k8hefyF3Shb8Wvd8qFAgQ4ZaFW5Mj+yiSwIbrKaKwNLw8gq3523AUYI72GLpQLmE9R5aogtB3qHtKLXQrWRJzP4rsQqMpRACYIdffMsUehZezOfPBSMChPH74BvtJ9uy2UGDDqcHxSB89x4R7g0AHK92zDWJ1n8Z8wInumehJ6Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770217516; c=relaxed/simple; bh=+dTkgWPjBiulsSWsa7zrzS2KqRfUyEHk6xKjaHvdHUI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ilTHn/tNIJK+PKK3rEFkq1sSFYofRaIX7dZtU9gLbhSGDI/jXgHYzHZx1z+VswjEvee7FGYnkKbdwXfMO7neo79IajVmKdQUfHL9vLsuFo/IQlo9tstKRVuc/gpCCZs9H7QlvA6Hl4eSfDkszUn9Y/FbndsrZOnlUM1CUV4T5eU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WnoaUlTx; 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="WnoaUlTx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E795C4CEF7; Wed, 4 Feb 2026 15:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770217515; bh=+dTkgWPjBiulsSWsa7zrzS2KqRfUyEHk6xKjaHvdHUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WnoaUlTx9Wp0k1c0xB63NzUYPGNSTb9ks8BZOXr66Xxj4me3Ebfb3fON+2MrSF0fZ ULITE+E/w8wsykxpu8y+HKaA7HL97g21emJcxfB7zni7vDUoyJuKe1MsKL8XbQzUts nZniIwUFQao7LuKkrRCUVgb9Vm5hAEsdNySve2xo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jaroslav Kysela , Takashi Iwai Subject: [PATCH 6.1 038/280] ALSA: pcm: Improve the fix for race of buffer access at PCM OSS layer Date: Wed, 4 Feb 2026 15:36:52 +0100 Message-ID: <20260204143911.009056468@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143909.614719725@linuxfoundation.org> References: <20260204143909.614719725@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 6.1-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 @@ -1429,7 +1429,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 @@ -1085,7 +1085,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 @@ -705,13 +705,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);