]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
ALSA: intel_hdmi: Fix reference to PCM buffer address
authorZhen Ni <nizhen@uniontech.com>
Wed, 2 Mar 2022 07:42:41 +0000 (15:42 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 13:17:23 +0000 (15:17 +0200)
BugLink: https://bugs.launchpad.net/bugs/1969239
commit 0aa6b294b312d9710804679abd2c0c8ca52cc2bc upstream.

PCM buffers might be allocated dynamically when the buffer
preallocation failed or a larger buffer is requested, and it's not
guaranteed that substream->dma_buffer points to the actually used
buffer.  The driver needs to refer to substream->runtime->dma_addr
instead for the buffer address.

Signed-off-by: Zhen Ni <nizhen@uniontech.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20220302074241.30469-1-nizhen@uniontech.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
sound/x86/intel_hdmi_audio.c

index 5fd4e32247a6d6967591ce058eb86acfb53167ab..a314f13e3292e9ba64eb43f953b4b35345cd9759 100644 (file)
@@ -1279,7 +1279,7 @@ static int had_pcm_mmap(struct snd_pcm_substream *substream,
 {
        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
        return remap_pfn_range(vma, vma->vm_start,
-                       substream->dma_buffer.addr >> PAGE_SHIFT,
+                       substream->runtime->dma_addr >> PAGE_SHIFT,
                        vma->vm_end - vma->vm_start, vma->vm_page_prot);
 }