提交 51097828 编写于 作者: C Colin Ian King 提交者: Zheng Zengkai

ALSA: pcm: Check for null pointer of pointer substream before dereferencing it

stable inclusion
from stable-v5.10.121
commit f2c68c52898f623fe84518da4606538d193b0cca
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6CQ

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f2c68c52898f623fe84518da4606538d193b0cca

--------------------------------

[ Upstream commit 011b559b ]

Pointer substream is being dereferenced on the assignment of pointer card
before substream is being null checked with the macro PCM_RUNTIME_CHECK.
Although PCM_RUNTIME_CHECK calls BUG_ON, it still is useful to perform the
the pointer check before card is assigned.

Fixes: d4cfb30f ("ALSA: pcm: Set per-card upper limit of PCM buffer allocations")
Signed-off-by: NColin Ian King <colin.i.king@gmail.com>
Link: https://lore.kernel.org/r/20220424205945.1372247-1-colin.i.king@gmail.comSigned-off-by: NTakashi Iwai <tiwai@suse.de>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 9d3fbad4
...@@ -434,7 +434,6 @@ EXPORT_SYMBOL(snd_pcm_lib_malloc_pages); ...@@ -434,7 +434,6 @@ EXPORT_SYMBOL(snd_pcm_lib_malloc_pages);
*/ */
int snd_pcm_lib_free_pages(struct snd_pcm_substream *substream) int snd_pcm_lib_free_pages(struct snd_pcm_substream *substream)
{ {
struct snd_card *card = substream->pcm->card;
struct snd_pcm_runtime *runtime; struct snd_pcm_runtime *runtime;
if (PCM_RUNTIME_CHECK(substream)) if (PCM_RUNTIME_CHECK(substream))
...@@ -443,6 +442,8 @@ int snd_pcm_lib_free_pages(struct snd_pcm_substream *substream) ...@@ -443,6 +442,8 @@ int snd_pcm_lib_free_pages(struct snd_pcm_substream *substream)
if (runtime->dma_area == NULL) if (runtime->dma_area == NULL)
return 0; return 0;
if (runtime->dma_buffer_p != &substream->dma_buffer) { if (runtime->dma_buffer_p != &substream->dma_buffer) {
struct snd_card *card = substream->pcm->card;
/* it's a newly allocated buffer. release it now. */ /* it's a newly allocated buffer. release it now. */
do_free_pages(card, runtime->dma_buffer_p); do_free_pages(card, runtime->dma_buffer_p);
kfree(runtime->dma_buffer_p); kfree(runtime->dma_buffer_p);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册