aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/android/ion/msm/msm_ion.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/android/ion/msm/msm_ion.c')
-rw-r--r--drivers/staging/android/ion/msm/msm_ion.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/android/ion/msm/msm_ion.c b/drivers/staging/android/ion/msm/msm_ion.c
index 828826254657..8e10e0cddd74 100644
--- a/drivers/staging/android/ion/msm/msm_ion.c
+++ b/drivers/staging/android/ion/msm/msm_ion.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2014,2016,2018 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -722,11 +722,11 @@ long msm_ion_custom_ioctl(struct ion_client *client,
down_read(&mm->mmap_sem);
- start = (unsigned long)data.flush_data.vaddr +
- data.flush_data.offset;
- end = start + data.flush_data.length;
+ start = (unsigned long) data.flush_data.vaddr;
+ end = (unsigned long) data.flush_data.vaddr
+ + data.flush_data.length;
- if (check_vaddr_bounds(start, end)) {
+ if (start && check_vaddr_bounds(start, end)) {
pr_err("%s: virtual address %p is out of bounds\n",
__func__, data.flush_data.vaddr);
ret = -EINVAL;