From patchwork Mon May 31 05:22:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Huang X-Patchwork-Id: 93599 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 75814A0524; Mon, 31 May 2021 07:28:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E403440040; Mon, 31 May 2021 07:28:42 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id B8BFF4003E; Mon, 31 May 2021 07:28:40 +0200 (CEST) IronPort-SDR: 5A0xjnt1yPgIjtKV+acau+aEbBAD1pDaHJMZJaX7jPWdLP+lIDsSsBk6yX4bRq/EEN3xCVudH6 a5lQBCkKJSGw== X-IronPort-AV: E=McAfee;i="6200,9189,10000"; a="203300214" X-IronPort-AV: E=Sophos;i="5.83,236,1616482800"; d="scan'208";a="203300214" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2021 22:28:39 -0700 IronPort-SDR: qtBNhsCIKB0H2QZScnRsxbZBCL++J1MjT6VrIfsElDdvczfAZh/EhkJ6AH0JKu+WjrsZrqVAIG kJWIyS0/ahGg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,236,1616482800"; d="scan'208";a="549289346" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.238.175.107]) by fmsmga001.fm.intel.com with ESMTP; 30 May 2021 22:28:37 -0700 From: Wei Huang To: dev@dpdk.org, rosen.xu@intel.com, qi.z.zhang@intel.com Cc: stable@dpdk.org, tianfei.zhang@intel.com, ferruh.yigit@intel.com, Wei Huang Date: Mon, 31 May 2021 01:22:31 -0400 Message-Id: <20210531052232.353128-1-wei.huang@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v1] raw/ifpga/base: check address before assigning X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 c223faf..9d82fb0 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 e7142d6..e761d7e 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,