From 2cc23e8e19c84874d99e80d79a8fe0cd530cd868 Mon Sep 17 00:00:00 2001 From: Vinayak Menon Date: Wed, 17 Mar 2021 13:47:55 +0530 Subject: [PATCH] drivers: staging: ion: fix error check in check_valid_vmid check_valid_vmid makes an incorrect assumption on the return value of ion_msm_page_pool_alloc causing an incorrect pointer access later in ion_msm_page_pool_add. Change-Id: I45dc78978385498366ba729b447ec365a31474d8 Fixes: cae595f476e4 ("ion: Check for valid vmids for msm system heap") Signed-off-by: Vinayak Menon --- drivers/staging/android/ion/heaps/ion_msm_system_heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/ion/heaps/ion_msm_system_heap.c b/drivers/staging/android/ion/heaps/ion_msm_system_heap.c index c2a751653b12..f93f62b0a73b 100644 --- a/drivers/staging/android/ion/heaps/ion_msm_system_heap.c +++ b/drivers/staging/android/ion/heaps/ion_msm_system_heap.c @@ -3,7 +3,7 @@ * ION Memory Allocator system heap exporter * * Copyright (C) 2011 Google, Inc. - * Copyright (c) 2011-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2021, The Linux Foundation. All rights reserved. * */ @@ -291,7 +291,7 @@ static bool check_valid_vmid(int dest_vmid, struct ion_msm_system_heap *sys_heap page = ion_msm_page_pool_alloc(sys_heap->uncached_pools[order_ind], &from_pool); - if (!page) + if (IS_ERR(page)) return false; if (!from_pool)