]> www.infradead.org Git - users/dwmw2/linux.git/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)
committerTakashi Iwai <tiwai@suse.de>
Thu, 21 Nov 2024 11:34:43 +0000 (12:34 +0100)
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>
sound/core/pcm_native.c

index 47027fa4eb2827cfa1ee2d99fdfcdb21c33e5150..381a476a1045d566cf55d90fe50f55b99fcc9133 100644 (file)
@@ -3813,9 +3813,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;