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 B4F534624E for ; Mon, 17 Feb 2025 18:09:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AF745400EF; Mon, 17 Feb 2025 18:09:10 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 8BD44400EF for ; Mon, 17 Feb 2025 18:09:08 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-439685e14f1so21354005e9.3 for ; Mon, 17 Feb 2025 09:09:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812148; x=1740416948; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P2ySoT6g+mamCCM7hgXCksZ+keWJp5KyHbuT0CotWVI=; b=jOkrNCWMNpQi9ULnkkV5Z+6nPjqBENoIRKpp41w3Og9zlsKeJVbuEC60ShzxtLwDlI 26iBgw6baRdN+4mW17fcu3MqpEnWyQmYnt/jO52jNujl4KOWT2DbWd/SqTnBSgkb5wjh 3ies+K1c7YVAECr52/S8G53JVpJXMXZ/2E4y0ASYA7AScDheoIpopEVI/AERjS8ZVGoU /nm8p66hFmayFz+b4XlbCb4ukBLUNxDD5UB0v56UKyoRV+hGA+olmdgobv0HNgae7yRD rpoljJzELnZaKx2qDQbJL9sVvdQDo92LPT2MeZb2Rh1JEI0u6dlw8PyDoxpRZXdr33fw fFJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812148; x=1740416948; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P2ySoT6g+mamCCM7hgXCksZ+keWJp5KyHbuT0CotWVI=; b=No3TBbcG5tlpBWzXbmtD47Ea1cE/fzVtEYeFsGxPJ2rW7QDCDOwjXIj/EbWnd3OvLa yVy5NEckjCTNbZst/btw+rJrqpqcDUFNH6HYdknpvdBZ+fCp/3YiqnaQP/Gt1UwHgQ7h PkGC8g/h0MHyREK01gFx+IAlcPQfs4CdvYxLBiojc4aP9MRLvBIkFOQqgR6/S4qHHUAq QPeNOtwNQ74544FDVOgJAEYji5VqN9ExOCXNiHbqXNWidMl91gAmpZQVCRWhOR9o8i+n ixpOc9+t4oQ2F3MVYkKSREY0VQ5JSQ6NgjpAj97o1NmAB0eOLGQxVyPVi/wZh/umRsvH ynVw== X-Gm-Message-State: AOJu0Yxy0aUStALWIsELXfP0jTrvv1wuBbdDwa9D5mJ6AV7rTkbUSK2v o2mzWCQS2Z4kXaRmn/AjbHK+7znTGkSn+PsBYW6zG6nQqBE8f0Bc X-Gm-Gg: ASbGncvow+VKckF1RC+RaJfggkUggh+VxedmUmcnVvlGs4i/6new5jRClHxEhkkjLYd OxX2MEdkQ6m6zLYWjcNpLlWJ1e9Zo/Tz/Y2bMQpLHberRdapEor1ifqgXGNwbrAA1GDIApuPNUY 6vwhvwNA77KIvdSMCTcPlKAWu2QVIhdZFo8fVm5cfp9gl6vkgJw0k3qV0byXWxVP5QuuowpGODZ UqbMHbCP5Vha47Wncq0wGSTXbWaWUHeYm56Ru9ykdh+Jw7VyZTpWpL9scEwOdkj35r/2ity0ZiD 6nguFXM0wKz8QlG3lPv+pQ== X-Google-Smtp-Source: AGHT+IFsyBxGD/YMrL0Z7Bc2fTKtfS8DdJCsaENGYpgGodBX++gzRFes9J/e1U45u0HSJwTJ58c5Vg== X-Received: by 2002:a05:600c:46c9:b0:439:6377:dba4 with SMTP id 5b1f17b1804b1-4396e75385dmr82074085e9.19.1739812147970; Mon, 17 Feb 2025 09:09:07 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43984dd042fsm33707585e9.12.2025.02.17.09.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:09:07 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: dpdk stable Subject: patch 'common/cnxk: fix null check' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:49 +0000 Message-ID: <20250217170456.1068278-76-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-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 22.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/19/25. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/0ac965dafc74a22d160f3183fe7aea7fe4ea2d11 Thanks. Luca Boccassi --- >From 0ac965dafc74a22d160f3183fe7aea7fe4ea2d11 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:20 -0800 Subject: [PATCH] common/cnxk: fix null check [ upstream commit 1bab0289c6a58c3847ffbde2718b73a9b988deca ] The pointer mode is used then checked which is a bug reported by PVS studio. Fixes: bd2fd34ab86f ("common/cnxk: sync eth mode change command with firmware") Signed-off-by: Stephen Hemminger --- drivers/common/cnxk/roc_bphy_cgx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/common/cnxk/roc_bphy_cgx.c b/drivers/common/cnxk/roc_bphy_cgx.c index e966494e21..3d674dbe84 100644 --- a/drivers/common/cnxk/roc_bphy_cgx.c +++ b/drivers/common/cnxk/roc_bphy_cgx.c @@ -364,20 +364,20 @@ roc_bphy_cgx_set_link_mode(struct roc_bphy_cgx *roc_cgx, unsigned int lmac, { uint64_t scr1, scr0; + if (!mode) + return -EINVAL; + + if (!roc_cgx) + return -EINVAL; + if (roc_model_is_cn9k() && (mode->use_portm_idx || mode->portm_idx || mode->mode_group_idx)) { return -ENOTSUP; } - if (!roc_cgx) - return -EINVAL; - if (!roc_bphy_cgx_lmac_exists(roc_cgx, lmac)) return -ENODEV; - if (!mode) - return -EINVAL; - scr1 = FIELD_PREP(SCR1_ETH_CMD_ID, ETH_CMD_MODE_CHANGE) | FIELD_PREP(SCR1_ETH_MODE_CHANGE_ARGS_SPEED, mode->speed) | FIELD_PREP(SCR1_ETH_MODE_CHANGE_ARGS_DUPLEX, mode->full_duplex) | -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:19.497406114 +0000 +++ 0076-common-cnxk-fix-null-check.patch 2025-02-17 16:13:16.874441592 +0000 @@ -1 +1 @@ -From 1bab0289c6a58c3847ffbde2718b73a9b988deca Mon Sep 17 00:00:00 2001 +From 0ac965dafc74a22d160f3183fe7aea7fe4ea2d11 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1bab0289c6a58c3847ffbde2718b73a9b988deca ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 882cf65474..db70bafd9b 100644 +index e966494e21..3d674dbe84 100644 @@ -21 +22 @@ -@@ -366,20 +366,20 @@ roc_bphy_cgx_set_link_mode(struct roc_bphy_cgx *roc_cgx, unsigned int lmac, +@@ -364,20 +364,20 @@ roc_bphy_cgx_set_link_mode(struct roc_bphy_cgx *roc_cgx, unsigned int lmac,