lkml.org 
[lkml]   [2018]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 196/366] staging: android: ion: Return an ERR_PTR in ion_map_kernel
    3.16.61-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    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;
    \
     
     \ /
      Last update: 2018-11-11 21:24    [W:2.873 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site