From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BC971A04FD for ; Tue, 12 Jul 2022 21:23:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 94B1C427FF; Tue, 12 Jul 2022 21:23:56 +0200 (CEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id B18D7427EE for ; Tue, 12 Jul 2022 21:23:54 +0200 (CEST) Received: by mail-wr1-f51.google.com with SMTP id v16so12508901wrd.13 for ; Tue, 12 Jul 2022 12:23:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EjZ/DrPbLCIxMC9U5G0YltCiAg+A4c190wpz+7+gqgs=; b=m8rFOgqttVrUah2mbPo1AQadL7MYBnTt0CnAdkKuyj6I14dRRJIY/gSvAuuCpsr6ck /jlOG8dwBhQfCaSeTQ2gBFKTrII6MGtAojzRSDDmzp3ucpJRLz/jOJyrl/PPU++VuxJx c3OcDmS+kQpwbyxjYoiK37yjVtKO4VPxKHLZHiMmsYKS/+W2BM0cYq/sUqRLi6ctonmS EYRryswNEJYPkNv0Ry10IMV/u8sC5pubkF+XDanLVHbOIzdQNevvZ9TJcFCs+YCfFkrT mcFs+CKyLThoEzpHotd75k/IIoorb4dZs3tsdcyKSxptNXFZQXQpKeLzjs4U4SuMh0q5 ceOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EjZ/DrPbLCIxMC9U5G0YltCiAg+A4c190wpz+7+gqgs=; b=E82S/x3NelgDKcaPcZVswuK4Y2ztffeMwmjVZdlts/dT6SxCJLebIolieayVX0tj/j W0wN+nhzr0XoDrEIkS2HUpy6W33qfukt54NFF6yx+Ad1swjrtUM8VMG3vdIgbpAWI3EK CtZY9zGNdzH3gtF3hiSAfgAMu4In52xYcEDAU6TYQNQjywYeOvYCB9C2AOLUD3qqlLwD 3nSeP751Y5yRHd8AarIYwkJk6KC7kP2LcG/MWxXQhlPTUJIhRhrb4fJmfq4Ck8RQB3De PZ+55OvIYOQs9661yJYZkkLv1n7SfArvkRxkfv+r7S+74C2KOi65xLN1QcUBawHc59Dl W6ig== X-Gm-Message-State: AJIora9GD6WHl3b7RFosdgCjzgbnBxq/+fe62Fjb0NHtNnYVOtDk6nz7 CbkIl94lQyQjYaOYCj2/dUs= X-Google-Smtp-Source: AGRyM1vRqM/jFdChhS+Nhc0TRNterbEro/HpTK8it6Ei/Oy4GPDXjBcC9REKTVQGGSa007po5yiDQA== X-Received: by 2002:a5d:4582:0:b0:21d:7c57:1f4b with SMTP id p2-20020a5d4582000000b0021d7c571f4bmr22490988wrq.146.1657653834410; Tue, 12 Jul 2022 12:23:54 -0700 (PDT) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id c11-20020adffb4b000000b0021a34023ca3sm8988030wrs.62.2022.07.12.12.23.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 12:23:53 -0700 (PDT) From: luca.boccassi@gmail.com To: Andy Pei Cc: Maxime Coquelin , dpdk stable Subject: patch 'vdpa/ifc/base: fix null pointer dereference' has been queued to stable release 21.11.2 Date: Tue, 12 Jul 2022 20:23:46 +0100 Message-Id: <20220712192349.4174428-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220712192349.4174428-1-luca.boccassi@gmail.com> References: <20220706203506.3422496-31-luca.boccassi@gmail.com> <20220712192349.4174428-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/06b246ead61adaf7e92282f0b386d42469095894 Thanks. Luca Boccassi --- >From 06b246ead61adaf7e92282f0b386d42469095894 Mon Sep 17 00:00:00 2001 From: Andy Pei Date: Fri, 8 Jul 2022 13:57:41 +0800 Subject: [PATCH] vdpa/ifc/base: fix null pointer dereference [ upstream commit 60600018d3c6ae9ab4c24f9acb5c213bf9a21aaf ] Fix null pointer dereference reported in coverity scan. Output some log information when lm_cfg is null. Make sure lm_cfg is not null before operate on lm_cfg. Coverity issue: 378882 Fixes: d7fe5a2861e7 ("net/ifc: support live migration") Signed-off-by: Andy Pei Reviewed-by: Maxime Coquelin --- drivers/vdpa/ifc/base/ifcvf.c | 17 +++++++++++++---- drivers/vdpa/ifc/base/ifcvf_osdep.h | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c index d10c1fd6a4..f3c29f94b3 100644 --- a/drivers/vdpa/ifc/base/ifcvf.c +++ b/drivers/vdpa/ifc/base/ifcvf.c @@ -87,6 +87,8 @@ next: } hw->lm_cfg = hw->mem_resource[4].addr; + if (!hw->lm_cfg) + WARNINGOUT("HW support live migration not support!\n"); if (hw->common_cfg == NULL || hw->notify_base == NULL || hw->isr == NULL || hw->dev_cfg == NULL) { @@ -218,10 +220,12 @@ ifcvf_hw_enable(struct ifcvf_hw *hw) &cfg->queue_used_hi); IFCVF_WRITE_REG16(hw->vring[i].size, &cfg->queue_size); - *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + - (i / 2) * IFCVF_LM_CFG_SIZE + (i % 2) * 4) = - (u32)hw->vring[i].last_avail_idx | - ((u32)hw->vring[i].last_used_idx << 16); + if (lm_cfg) { + *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + + (i / 2) * IFCVF_LM_CFG_SIZE + (i % 2) * 4) = + (u32)hw->vring[i].last_avail_idx | + ((u32)hw->vring[i].last_used_idx << 16); + } IFCVF_WRITE_REG16(i + 1, &cfg->queue_msix_vector); if (IFCVF_READ_REG16(&cfg->queue_msix_vector) == @@ -291,6 +295,8 @@ ifcvf_enable_logging(struct ifcvf_hw *hw, u64 log_base, u64 log_size) u8 *lm_cfg; lm_cfg = hw->lm_cfg; + if (!lm_cfg) + return; *(u32 *)(lm_cfg + IFCVF_LM_BASE_ADDR_LOW) = log_base & IFCVF_32_BIT_MASK; @@ -313,6 +319,9 @@ ifcvf_disable_logging(struct ifcvf_hw *hw) u8 *lm_cfg; lm_cfg = hw->lm_cfg; + if (!lm_cfg) + return; + *(u32 *)(lm_cfg + IFCVF_LM_LOGGING_CTRL) = IFCVF_LM_DISABLE; } diff --git a/drivers/vdpa/ifc/base/ifcvf_osdep.h b/drivers/vdpa/ifc/base/ifcvf_osdep.h index 6aef25ea45..3d567695cc 100644 --- a/drivers/vdpa/ifc/base/ifcvf_osdep.h +++ b/drivers/vdpa/ifc/base/ifcvf_osdep.h @@ -14,6 +14,7 @@ #include #include +#define WARNINGOUT(S, args...) RTE_LOG(WARNING, PMD, S, ##args) #define DEBUGOUT(S, args...) RTE_LOG(DEBUG, PMD, S, ##args) #define STATIC static -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-12 20:22:33.817657799 +0100 +++ 0003-vdpa-ifc-base-fix-null-pointer-dereference.patch 2022-07-12 20:22:33.709247162 +0100 @@ -1 +1 @@ -From 60600018d3c6ae9ab4c24f9acb5c213bf9a21aaf Mon Sep 17 00:00:00 2001 +From 06b246ead61adaf7e92282f0b386d42469095894 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 60600018d3c6ae9ab4c24f9acb5c213bf9a21aaf ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - drivers/vdpa/ifc/base/ifcvf.c | 31 +++++++++++++++++++---------- + drivers/vdpa/ifc/base/ifcvf.c | 17 +++++++++++++---- @@ -19 +20 @@ - 2 files changed, 21 insertions(+), 11 deletions(-) + 2 files changed, 14 insertions(+), 4 deletions(-) @@ -22 +23 @@ -index 0a9f71a960..f1e1474447 100644 +index d10c1fd6a4..f3c29f94b3 100644 @@ -34 +35 @@ -@@ -218,17 +220,19 @@ ifcvf_hw_enable(struct ifcvf_hw *hw) +@@ -218,10 +220,12 @@ ifcvf_hw_enable(struct ifcvf_hw *hw) @@ -38,11 +39,4 @@ -- if (hw->device_type == IFCVF_BLK) -- *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + -- i * IFCVF_LM_CFG_SIZE) = -- (u32)hw->vring[i].last_avail_idx | -- ((u32)hw->vring[i].last_used_idx << 16); -- else -- *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + -- (i / 2) * IFCVF_LM_CFG_SIZE + -- (i % 2) * 4) = -- (u32)hw->vring[i].last_avail_idx | -- ((u32)hw->vring[i].last_used_idx << 16); +- *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + +- (i / 2) * IFCVF_LM_CFG_SIZE + (i % 2) * 4) = +- (u32)hw->vring[i].last_avail_idx | +- ((u32)hw->vring[i].last_used_idx << 16); @@ -50,11 +44,4 @@ -+ if (hw->device_type == IFCVF_BLK) -+ *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + -+ i * IFCVF_LM_CFG_SIZE) = -+ (u32)hw->vring[i].last_avail_idx | -+ ((u32)hw->vring[i].last_used_idx << 16); -+ else -+ *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + -+ (i / 2) * IFCVF_LM_CFG_SIZE + -+ (i % 2) * 4) = -+ (u32)hw->vring[i].last_avail_idx | -+ ((u32)hw->vring[i].last_used_idx << 16); ++ *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + ++ (i / 2) * IFCVF_LM_CFG_SIZE + (i % 2) * 4) = ++ (u32)hw->vring[i].last_avail_idx | ++ ((u32)hw->vring[i].last_used_idx << 16); @@ -65 +52 @@ -@@ -320,6 +324,8 @@ ifcvf_enable_logging(struct ifcvf_hw *hw, u64 log_base, u64 log_size) +@@ -291,6 +295,8 @@ ifcvf_enable_logging(struct ifcvf_hw *hw, u64 log_base, u64 log_size) @@ -74 +61 @@ -@@ -342,6 +348,9 @@ ifcvf_disable_logging(struct ifcvf_hw *hw) +@@ -313,6 +319,9 @@ ifcvf_disable_logging(struct ifcvf_hw *hw)