common/dpaax: fix physical address conversion
authorGagandeep Singh <g.singh@nxp.com>
Wed, 6 Oct 2021 17:01:31 +0000 (22:31 +0530)
committerThomas Monjalon <thomas@monjalon.net>
Thu, 7 Oct 2021 12:47:35 +0000 (14:47 +0200)
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>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
drivers/common/dpaax/dpaax_iova_table.h

index 230fba8..b1f2300 100644 (file)
@@ -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);