diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-12-18 15:56:24 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-12-18 17:09:10 +0100 |
| commit | 5c1733e33c888a3cb7f576564d8ad543d5ad4a9e (patch) | |
| tree | d9181980f8be06caab1468ae17b72a44b67a45bc /sound | |
| parent | ALSA: usb-audio: Disable sample read check if firmware doesn't give back (diff) | |
| download | linux-dev-5c1733e33c888a3cb7f576564d8ad543d5ad4a9e.tar.xz linux-dev-5c1733e33c888a3cb7f576564d8ad543d5ad4a9e.zip | |
ALSA: memalloc: Align buffer allocations in page size
Currently the standard memory allocator (snd_dma_malloc_pages*())
passes the byte size to allocate as is. Most of the backends
allocates real pages, hence the actual allocations are aligned in page
size. However, the genalloc doesn't seem assuring the size alignment,
hence it may result in the access outside the buffer when the whole
memory pages are exposed via mmap.
For avoiding such inconsistencies, this patch makes the allocation
size always to be aligned in page size.
Note that, after this change, snd_dma_buffer.bytes field contains the
aligned size, not the originally requested size. This value is also
used for releasing the pages in return.
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
Link: https://lore.kernel.org/r/20201218145625.2045-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/memalloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 0f335162f87c..966bef5acc75 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -133,6 +133,7 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, if (WARN_ON(!dmab)) return -ENXIO; + size = PAGE_ALIGN(size); dmab->dev.type = type; dmab->dev.dev = device; dmab->bytes = 0; |