Commit bf11ba28 authored by Takashi Iwai's avatar Takashi Iwai Committed by Kleber Sacilotto de Souza

ALSA: memalloc: Don't exceed over the requested size

BugLink: https://bugs.launchpad.net/bugs/1792340

commit dfef01e1 upstream.

snd_dma_alloc_pages_fallback() tries to allocate pages again when the
allocation fails with reduced size.  But the first try actually
*increases* the size to power-of-two, which may give back a larger
chunk than the requested size.  This confuses the callers, e.g. sgbuf
assumes that the size is equal or less, and it may result in a bad
loop due to the underflow and eventually lead to Oops.

The code of this function seems incorrectly assuming the usage of
get_order().  We need to decrease at first, then align to
power-of-two.
Reported-and-tested-by: default avatarhe, bo <bo.he@intel.com>
Reported-by: default avatarzhang jun <jun.zhang@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 7faf9708
...@@ -239,16 +239,12 @@ int snd_dma_alloc_pages_fallback(int type, struct device *device, size_t size, ...@@ -239,16 +239,12 @@ int snd_dma_alloc_pages_fallback(int type, struct device *device, size_t size,
int err; int err;
while ((err = snd_dma_alloc_pages(type, device, size, dmab)) < 0) { while ((err = snd_dma_alloc_pages(type, device, size, dmab)) < 0) {
size_t aligned_size;
if (err != -ENOMEM) if (err != -ENOMEM)
return err; return err;
if (size <= PAGE_SIZE) if (size <= PAGE_SIZE)
return -ENOMEM; return -ENOMEM;
aligned_size = PAGE_SIZE << get_order(size); size >>= 1;
if (size != aligned_size) size = PAGE_SIZE << get_order(size);
size = aligned_size;
else
size >>= 1;
} }
if (! dmab->area) if (! dmab->area)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment