mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
87 lines
2.8 KiB
Diff
87 lines
2.8 KiB
Diff
|
From 89f2bcf1ac860b0b380e579e9a8764013f263a7d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mitchel Humpherys <mitchelh@codeaurora.org>
|
||
|
|
Date: Fri, 25 Oct 2013 12:05:47 -0700
|
||
|
|
Subject: msm: ADSPRPC: Add checks for erroneous values
|
||
|
|
|
||
|
|
Check for invalid parameters passed in user invocation
|
||
|
|
and validate the return values using appropriate macros.
|
||
|
|
|
||
|
|
Change-Id: If529873d025ac0c13725efbedda5a58fae327722
|
||
|
|
Acked-by: Sathish Ambley <sambley@qti.qualcomm.com>
|
||
|
|
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
|
||
|
|
---
|
||
|
|
drivers/char/adsprpc.c | 16 +++++++++++-----
|
||
|
|
1 file changed, 11 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c
|
||
|
|
index e421135..c8b6c0a 100644
|
||
|
|
--- a/drivers/char/adsprpc.c
|
||
|
|
+++ b/drivers/char/adsprpc.c
|
||
|
|
@@ -199,7 +199,7 @@ static void free_mem(struct fastrpc_buf *buf)
|
||
|
|
me->smmu.domain_id, 0);
|
||
|
|
buf->phys = 0;
|
||
|
|
}
|
||
|
|
- if (buf->virt) {
|
||
|
|
+ if (!IS_ERR_OR_NULL(buf->virt)) {
|
||
|
|
ion_unmap_kernel(me->iclient, buf->handle);
|
||
|
|
buf->virt = 0;
|
||
|
|
}
|
||
|
|
@@ -212,7 +212,7 @@ static void free_map(struct fastrpc_mmap *map)
|
||
|
|
{
|
||
|
|
struct fastrpc_apps *me = &gfa;
|
||
|
|
if (!IS_ERR_OR_NULL(map->handle)) {
|
||
|
|
- if (map->virt) {
|
||
|
|
+ if (!IS_ERR_OR_NULL(map->virt)) {
|
||
|
|
ion_unmap_kernel(me->iclient, map->handle);
|
||
|
|
map->virt = 0;
|
||
|
|
}
|
||
|
|
@@ -231,13 +231,15 @@ static int alloc_mem(struct fastrpc_buf *buf)
|
||
|
|
unsigned long len;
|
||
|
|
buf->handle = 0;
|
||
|
|
buf->virt = 0;
|
||
|
|
+ buf->phys = 0;
|
||
|
|
heap = me->smmu.enabled ? ION_HEAP(ION_IOMMU_HEAP_ID) :
|
||
|
|
ION_HEAP(ION_ADSP_HEAP_ID) | ION_HEAP(ION_AUDIO_HEAP_ID);
|
||
|
|
buf->handle = ion_alloc(clnt, buf->size, SZ_4K, heap, ION_FLAG_CACHED);
|
||
|
|
VERIFY(err, 0 == IS_ERR_OR_NULL(buf->handle));
|
||
|
|
if (err)
|
||
|
|
goto bail;
|
||
|
|
- VERIFY(err, 0 != (buf->virt = ion_map_kernel(clnt, buf->handle)));
|
||
|
|
+ buf->virt = ion_map_kernel(clnt, buf->handle);
|
||
|
|
+ VERIFY(err, 0 == IS_ERR_OR_NULL(buf->virt));
|
||
|
|
if (err)
|
||
|
|
goto bail;
|
||
|
|
if (me->smmu.enabled) {
|
||
|
|
@@ -356,6 +358,9 @@ static int get_page_list(uint32_t kernel, uint32_t sc, remote_arg_t *pra,
|
||
|
|
list[i].num = 0;
|
||
|
|
list[i].pgidx = 0;
|
||
|
|
len = pra[i].buf.len;
|
||
|
|
+ VERIFY(err, len >= 0);
|
||
|
|
+ if (err)
|
||
|
|
+ goto bail;
|
||
|
|
if (!len)
|
||
|
|
continue;
|
||
|
|
buf = pra[i].buf.pv;
|
||
|
|
@@ -857,7 +862,7 @@ static int fastrpc_internal_invoke(struct fastrpc_apps *me, uint32_t mode,
|
||
|
|
context_free(ctx);
|
||
|
|
|
||
|
|
if (me->smmu.enabled) {
|
||
|
|
- bufs = REMOTE_SCALARS_LENGTH(sc);
|
||
|
|
+ bufs = REMOTE_SCALARS_INBUFS(sc) + REMOTE_SCALARS_OUTBUFS(sc);
|
||
|
|
if (fds) {
|
||
|
|
handles = (struct ion_handle **)(fds + bufs);
|
||
|
|
for (i = 0; i < bufs; i++)
|
||
|
|
@@ -1037,7 +1042,8 @@ static int fastrpc_internal_mmap(struct fastrpc_apps *me,
|
||
|
|
VERIFY(err, 0 == IS_ERR_OR_NULL(map->handle));
|
||
|
|
if (err)
|
||
|
|
goto bail;
|
||
|
|
- VERIFY(err, 0 != (map->virt = ion_map_kernel(clnt, map->handle)));
|
||
|
|
+ map->virt = ion_map_kernel(clnt, map->handle);
|
||
|
|
+ VERIFY(err, 0 == IS_ERR_OR_NULL(map->virt));
|
||
|
|
if (err)
|
||
|
|
goto bail;
|
||
|
|
buf = (void *)mmap->vaddrin;
|
||
|
|
--
|
||
|
|
cgit v1.1
|
||
|
|
|