]> git.hungrycats.org Git - linux/commitdiff
ALSA: pcm: Add sanity NULL check for the default mmap fault handler
authorTakashi Iwai <tiwai@suse.de>
Wed, 20 Nov 2024 14:11:02 +0000 (15:11 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Dec 2024 09:32:51 +0000 (10:32 +0100)
commit d2913a07d9037fe7aed4b7e680684163eaed6bc4 upstream.

A driver might allow the mmap access before initializing its
runtime->dma_area properly.  Add a proper NULL check before passing to
virt_to_page() for avoiding a panic.

Reported-by: syzbot+4bf62a7b1d0f4fdb7ae2@syzkaller.appspotmail.com
Cc: <stable@vger.kernel.org>
Link: https://patch.msgid.link/20241120141104.7060-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/core/pcm_native.c

index cc21c483c4a579782a0469ed6627f98deffb1477..e40de64ec85cb51cb889e78a5f4f375a92622f15 100644 (file)
@@ -3794,9 +3794,11 @@ static vm_fault_t snd_pcm_mmap_data_fault(struct vm_fault *vmf)
                return VM_FAULT_SIGBUS;
        if (substream->ops->page)
                page = substream->ops->page(substream, offset);
-       else if (!snd_pcm_get_dma_buf(substream))
+       else if (!snd_pcm_get_dma_buf(substream)) {
+               if (WARN_ON_ONCE(!runtime->dma_area))
+                       return VM_FAULT_SIGBUS;
                page = virt_to_page(runtime->dma_area + offset);
-       else
+       else
                page = snd_sgbuf_get_page(snd_pcm_get_dma_buf(substream), offset);
        if (!page)
                return VM_FAULT_SIGBUS;