From 92a3b62b0b5dc5be1b3edbe5b7898c2982643339 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Mon, 31 May 2021 01:22:31 -0400 Subject: [PATCH] raw/ifpga/base: check address before assigning In max10_staging_area_init(), variable "start" from fdt_get_reg() may be invalid, it should be checked before assigning to member variable "staging_area_base" of structure "intel_max10_device". Coverity issue: 367480, 367482 Fixes: a05bd1b40bde ("raw/ifpga: add FPGA RSU APIs") Cc: stable@dpdk.org Signed-off-by: Wei Huang Acked-by: Tianfei Zhang --- drivers/raw/ifpga/base/opae_intel_max10.c | 14 ++++++++++---- drivers/raw/ifpga/base/opae_intel_max10.h | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/raw/ifpga/base/opae_intel_max10.c b/drivers/raw/ifpga/base/opae_intel_max10.c index c223fafa03..9d82fb0982 100644 --- a/drivers/raw/ifpga/base/opae_intel_max10.c +++ b/drivers/raw/ifpga/base/opae_intel_max10.c @@ -593,10 +593,16 @@ static int max10_staging_area_init(struct intel_max10_device *dev) continue; ret = fdt_get_reg(fdt_root, offset, 0, &start, &size); - if (!ret && (size <= MAX_STAGING_AREA_SIZE)) { - dev->staging_area_base = start; - dev->staging_area_size = size; - } + if (ret) + return ret; + + if ((start & 0x3) || (start > MAX_STAGING_AREA_BASE) || + (size > MAX_STAGING_AREA_SIZE)) + return -EINVAL; + + dev->staging_area_base = start; + dev->staging_area_size = size; + return ret; } diff --git a/drivers/raw/ifpga/base/opae_intel_max10.h b/drivers/raw/ifpga/base/opae_intel_max10.h index e7142d6f0d..e761d7ecfb 100644 --- a/drivers/raw/ifpga/base/opae_intel_max10.h +++ b/drivers/raw/ifpga/base/opae_intel_max10.h @@ -182,6 +182,7 @@ struct opae_retimer_status { #define SBUS_VERSION GENMASK(31, 16) #define DFT_MAX_SIZE 0x7e0000 +#define MAX_STAGING_AREA_BASE 0xffffffff #define MAX_STAGING_AREA_SIZE 0x3800000 int max10_reg_read(struct intel_max10_device *dev, -- 2.20.1