From 687833fffad21fee54ad76d32c536eb5ec4f59b1 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Thu, 8 Apr 2021 04:51:51 -0400 Subject: [PATCH] raw/ifpga/base: check size before assigning In max10_staging_area_init(), variable "size" from fdt_get_reg() may be invalid, it should be checked before assigning to member variable "staging_area_size" of structure "intel_max10_device". Coverity issue: 367480, 367482 Fixes: 96ebfcf8125c ("raw/ifpga/base: add SPI and MAX10 device driver") Cc: stable@dpdk.org Signed-off-by: Wei Huang Acked-by: Tianfei Zhang --- drivers/raw/ifpga/base/opae_intel_max10.c | 2 +- drivers/raw/ifpga/base/opae_intel_max10.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/raw/ifpga/base/opae_intel_max10.c b/drivers/raw/ifpga/base/opae_intel_max10.c index 443e248fb3..c223fafa03 100644 --- a/drivers/raw/ifpga/base/opae_intel_max10.c +++ b/drivers/raw/ifpga/base/opae_intel_max10.c @@ -593,7 +593,7 @@ static int max10_staging_area_init(struct intel_max10_device *dev) continue; ret = fdt_get_reg(fdt_root, offset, 0, &start, &size); - if (!ret) { + if (!ret && (size <= MAX_STAGING_AREA_SIZE)) { dev->staging_area_base = start; dev->staging_area_size = size; } diff --git a/drivers/raw/ifpga/base/opae_intel_max10.h b/drivers/raw/ifpga/base/opae_intel_max10.h index 670683f017..e7142d6f0d 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_SIZE 0x3800000 int max10_reg_read(struct intel_max10_device *dev, unsigned int reg, unsigned int *val); -- 2.20.1