Revert "ion: ensure CMO target is valid"
This reverts commit 1f19ec80894f76b6437e9c89e842f15ab58eab34.
Bug: 72957321
Bug: 79219092
Change-Id: I4b74e3970718c137f543ae638547becfbdff5245
Signed-off-by: Daniel Mentz <danielmentz@google.com>
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index aa5dcce..623622e 100755
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1480,11 +1480,6 @@
}
buffer = dmabuf->priv;
- if (buffer->flags & ION_FLAG_SECURE) {
- pr_err("%s: cannot sync a secure dmabuf\n", __func__);
- dma_buf_put(dmabuf);
- return -EINVAL;
- }
dma_sync_sg_for_device(NULL, buffer->sg_table->sgl,
buffer->sg_table->nents, DMA_BIDIRECTIONAL);
dma_buf_put(dmabuf);
diff --git a/drivers/staging/android/ion/msm/msm_ion.c b/drivers/staging/android/ion/msm/msm_ion.c
index 8288262..8e10e0c 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 @@
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;
