2017-10-29 14:23:02 -04:00
|
|
|
From 208e72e59c8411e75d4118b48648a5b7d42b1682 Mon Sep 17 00:00:00 2001
|
2017-10-29 01:48:53 -04:00
|
|
|
From: Siena Richard <sienar@codeaurora.org>
|
|
|
|
|
Date: Wed, 11 Jan 2017 11:09:24 -0800
|
|
|
|
|
Subject: ASoC: msm: qdsp6v2: extend validation of virtual address
|
|
|
|
|
|
|
|
|
|
Validate a buffer virtual address is fully within the region before
|
2017-10-29 14:23:02 -04:00
|
|
|
returning the region to ensure functionality for an extended edge
|
|
|
|
|
case.
|
2017-10-29 01:48:53 -04:00
|
|
|
|
|
|
|
|
Change-Id: Iba3e080889980f393d6a9f0afe0231408b92d654
|
|
|
|
|
Signed-off-by: Siena Richard <sienar@codeaurora.org>
|
|
|
|
|
CRs-fixed: 1108461
|
|
|
|
|
---
|
|
|
|
|
drivers/misc/qcom/qdsp6v2/audio_utils_aio.c | 7 +++++--
|
|
|
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/misc/qcom/qdsp6v2/audio_utils_aio.c b/drivers/misc/qcom/qdsp6v2/audio_utils_aio.c
|
2017-10-29 14:23:02 -04:00
|
|
|
index 9ade557..c12f791 100644
|
2017-10-29 01:48:53 -04:00
|
|
|
--- a/drivers/misc/qcom/qdsp6v2/audio_utils_aio.c
|
|
|
|
|
+++ b/drivers/misc/qcom/qdsp6v2/audio_utils_aio.c
|
|
|
|
|
@@ -1,6 +1,6 @@
|
|
|
|
|
/* Copyright (C) 2008 Google, Inc.
|
|
|
|
|
* Copyright (C) 2008 HTC Corporation
|
|
|
|
|
- * Copyright (c) 2009-2016, The Linux Foundation. All rights reserved.
|
|
|
|
|
+ * Copyright (c) 2009-2017, The Linux Foundation. All rights reserved.
|
|
|
|
|
*
|
|
|
|
|
* This software is licensed under the terms of the GNU General Public
|
|
|
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
|
|
|
@@ -119,7 +119,10 @@ static int audio_aio_ion_lookup_vaddr(struct q6audio_aio *audio, void *addr,
|
|
|
|
|
list_for_each_entry(region_elt, &audio->ion_region_queue, list) {
|
|
|
|
|
if (addr >= region_elt->vaddr &&
|
|
|
|
|
addr < region_elt->vaddr + region_elt->len &&
|
|
|
|
|
- addr + len <= region_elt->vaddr + region_elt->len) {
|
|
|
|
|
+ addr + len <= region_elt->vaddr + region_elt->len &&
|
|
|
|
|
+ addr + len > addr) {
|
|
|
|
|
+ /* to avoid integer addition overflow */
|
|
|
|
|
+
|
|
|
|
|
/* offset since we could pass vaddr inside a registerd
|
|
|
|
|
* ion buffer
|
|
|
|
|
*/
|
|
|
|
|
--
|
|
|
|
|
cgit v1.1
|
|
|
|
|
|
