| From 0a2bc00341dcfcc793c0dbf4f8d43adf60458b05 Mon Sep 17 00:00:00 2001 |
| From: Laura Abbott <labbott@redhat.com> |
| Date: Mon, 11 Jun 2018 11:06:53 -0700 |
| Subject: staging: android: ion: Return an ERR_PTR in ion_map_kernel |
| |
| From: Laura Abbott <labbott@redhat.com> |
| |
| commit 0a2bc00341dcfcc793c0dbf4f8d43adf60458b05 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: Laura Abbott <labbott@redhat.com> |
| Cc: stable <stable@vger.kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/staging/android/ion/ion_heap.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/staging/android/ion/ion_heap.c |
| +++ b/drivers/staging/android/ion/ion_heap.c |
| @@ -38,7 +38,7 @@ void *ion_heap_map_kernel(struct ion_hea |
| struct page **tmp = pages; |
| |
| if (!pages) |
| - return NULL; |
| + return ERR_PTR(-ENOMEM); |
| |
| if (buffer->flags & ION_FLAG_CACHED) |
| pgprot = PAGE_KERNEL; |
