Commit 97fdc1ef authored by Laura Abbott's avatar Laura Abbott Committed by Stefan Bader

staging: android: ion: Return an ERR_PTR in ion_map_kernel

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

commit 0a2bc003 upstream.

The expected return value from ion_map_kernel is an ERR_PTR. The error
path for a vmalloc failure currently just returns NULL, triggering
a warning in ion_buffer_kmap_get. Encode the vmalloc failure as an ERR_PTR.

Reported-by: syzbot+55b1d9f811650de944c6@syzkaller.appspotmail.com
Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent 43b5e7a6
...@@ -38,7 +38,7 @@ void *ion_heap_map_kernel(struct ion_heap *heap, ...@@ -38,7 +38,7 @@ void *ion_heap_map_kernel(struct ion_heap *heap,
struct page **tmp = pages; struct page **tmp = pages;
if (!pages) if (!pages)
return NULL; return ERR_PTR(-ENOMEM);
if (buffer->flags & ION_FLAG_CACHED) if (buffer->flags & ION_FLAG_CACHED)
pgprot = PAGE_KERNEL; pgprot = PAGE_KERNEL;
......
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