From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 6953BA0C41;
Wed, 6 Oct 2021 14:11:36 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id AA8A04145B;
Wed, 6 Oct 2021 14:10:37 +0200 (CEST)
Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21])
by mails.dpdk.org (Postfix) with ESMTP id B01DA410F2;
Wed, 6 Oct 2021 14:10:28 +0200 (CEST)
Received: from inva021.nxp.com (localhost [127.0.0.1])
by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 9255D201A36;
Wed, 6 Oct 2021 14:10:28 +0200 (CEST)
Received: from aprdc01srsp001v.ap-rdc01.nxp.com
(aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16])
by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 5A831201A2F;
Wed, 6 Oct 2021 14:10:28 +0200 (CEST)
Received: from lsv03274.swis.in-blr01.nxp.com (lsv03274.swis.in-blr01.nxp.com
[92.120.147.114])
by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id A1C97183AD14;
Wed, 6 Oct 2021 20:10:27 +0800 (+08)
From: nipun.gupta@nxp.com
To: dev@dpdk.org
Cc: thomas@monjalon.net, ferruh.yigit@intel.com, hemant.agrawal@nxp.com,
sachin.saxena@nxp.com, stable@dpdk.org, Gagandeep Singh <g.singh@nxp.com>,
Nipun Gupta <nipun.gupta@nxp.com>
Date: Wed, 6 Oct 2021 17:40:22 +0530
Message-Id: <20211006121022.27119-11-nipun.gupta@nxp.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20211006121022.27119-1-nipun.gupta@nxp.com>
References: <20210927122650.30881-1-nipun.gupta@nxp.com>
<20211006121022.27119-1-nipun.gupta@nxp.com>
X-Virus-Scanned: ClamAV using ClamSMTP
Subject: [dpdk-dev] [PATCH v2 10/10] common/dpaax: fix paddr to vaddr
invalid conversion
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Gagandeep Singh <g.singh@nxp.com>
If some of the VA entries of table are somehow not populated and are
NULL, it can add offset to NULL and return the invalid VA in PA to
VA conversion.
In this patch, adding a check if the VA entry has valid address only
then add offset and return VA.
Fixes: 2f3d633aa593 ("common/dpaax: add library for PA/VA translation table")
Cc: stable@dpdk.org
Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
---
drivers/common/dpaax/dpaax_iova_table.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/common/dpaax/dpaax_iova_table.h b/drivers/common/dpaax/dpaax_iova_table.h
index 230fba8ba0..b1f2300c52 100644
--- a/drivers/common/dpaax/dpaax_iova_table.h
+++ b/drivers/common/dpaax/dpaax_iova_table.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2018 NXP
+ * Copyright 2018-2021 NXP
*/
#ifndef _DPAAX_IOVA_TABLE_H_
@@ -101,6 +101,12 @@ dpaax_iova_table_get_va(phys_addr_t paddr) {
/* paddr > entry->start && paddr <= entry->(start+len) */
index = (paddr_align - entry[i].start)/DPAAX_MEM_SPLIT;
+ /* paddr is within range, but no vaddr entry ever written
+ * at index
+ */
+ if ((void *)(uintptr_t)entry[i].pages[index] == NULL)
+ return NULL;
+
vaddr = (void *)((uintptr_t)entry[i].pages[index] + offset);
break;
} while (1);
--
2.17.1