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 11B2E4625C for ; Tue, 18 Feb 2025 13:44:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 06BF6402E1; Tue, 18 Feb 2025 13:44:34 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2046.outbound.protection.outlook.com [40.107.243.46]) by mails.dpdk.org (Postfix) with ESMTP id 436A9402E1 for ; Tue, 18 Feb 2025 13:44:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oAIM5drfQfWFXWGrxhxXjYD0nqGmuFVpfvnqafj4cNBvgtCaVQ4pnuDdryqoFJL3RzD+TsfPtZruDNZMpf9skxLzaTU4123jsERzJNKnT0BcqPpJ/92BR4Ccq1Z/QYhnd8iyE0d5WnwxlhZmKVG0NeLiMkBQ8QiADOhuu9t6Yj8HUqHFClQLVLGutnzIh5Y1x+q9T6FC9O9Pwlw32rbJm+LtZkStsgt1PPmV2IohcxY/Qy+rjiDnz9ZjPLYSZCqLfiEAcWnGe1M47q0ICyzS9U/QVoWKrPEmKgoU4rFqXKe/CLD6nnFOTNEvm5PliiM7DdUOc/4rlFfXWLOIBJewfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9zUHAtaYUm+/wrlys6I0IU9cbLvSnDVmf1FodQdgAYk=; b=FHN7EMdSxp+rZXWASAjuF/63ctvl8mlmIcwTqaGq7Jsw9LOr1V2MDLri6o5akB1/jBl/hQTJtWuw8m1Am9U1U1ectQEdzhhh1UxAVV/CQ/fICn9HtJFxWE5FRxptJjcUhGGLfz2PiyYBo2rPDJpHh2/J/B8oap5YUHPO75PT4FL7BV7UX3TVIS4rQANWUgW4Zv3wwFJpKzH9GQptzKbQK7mJ9Mrx3d4pxtIAo+vKwmVEnnVVr/HobVKx6o6mwbII6551oxrXnqoUDuwIjUUh9e062HLJdJj3FO57SDA+ChEdv7923VE8XaDm/MC2nBpBqRO4mctZAwAK9zOHay0BqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9zUHAtaYUm+/wrlys6I0IU9cbLvSnDVmf1FodQdgAYk=; b=AOhQy8TYi8qitn9N6FpnQ1tqV22VD88siJ6JeDpYm9gPKoM7SAm/K1nERy+fgCeUMthK78aVDQjOQcN8DF31chYJratp+IsSqoRZrx73LnBtpmYLQsJVzTAbZOKL2Q3JzvROZirjcFwK1sZrxiSQMGGmQDjf3d13KvM9PHjGp0JHOnbB7Su67EgHLsJt1mryZi+qYMtzavpY9I1Sw3Su2Ya/99IC2AEHhKMjWlN46j1fDMpukpYLpY+icKj2wiWozdFN5/ABCuMUvWwj1ubtwmLCTIayiblH/+segti+zoDHir9tdVSvwfw0e85FPNnmZKnvZQBlsU7r6bK9JCL0bw== Received: from BY5PR17CA0053.namprd17.prod.outlook.com (2603:10b6:a03:167::30) by SJ5PPF0529573EF.namprd12.prod.outlook.com (2603:10b6:a0f:fc02::987) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.14; Tue, 18 Feb 2025 12:44:30 +0000 Received: from SJ1PEPF00002323.namprd03.prod.outlook.com (2603:10b6:a03:167:cafe::3f) by BY5PR17CA0053.outlook.office365.com (2603:10b6:a03:167::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.18 via Frontend Transport; Tue, 18 Feb 2025 12:44:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF00002323.mail.protection.outlook.com (10.167.242.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:44:30 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:44:21 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 18 Feb 2025 04:44:19 -0800 From: Xueming Li To: Stephen Hemminger CC: , dpdk stable Subject: patch 'common/cnxk: fix null check' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:21 +0800 Message-ID: <20250218123523.36836-87-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00002323:EE_|SJ5PPF0529573EF:EE_ X-MS-Office365-Filtering-Correlation-Id: 18039d25-3e36-4d66-f803-08dd5019fce3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?+qhnFeGIIuT4m3HLZH/bDnO0VoKDAzCuHyS3h+xHoh335SCh4XrWxU6fwAxb?= =?us-ascii?Q?lu6IFZnczq/iVvkP0SI5uNDYrMo6o5VIMpbeCUWToNoP2PxnE/Rv0/rIXVB9?= =?us-ascii?Q?QED7vpW+FjZnYVYTphqe+wZ4C7eppfTWiP+GrWGcqTKNqOlnkGYj3AfoMMVu?= =?us-ascii?Q?49S7rAMpL9nl6ziOZiGgH7Kej4jwnGANNVh8X19hufUi19LNpW9US0NsGDiv?= =?us-ascii?Q?q3pAkS8QXq/SZEjd/nUGPoj+0u3engHwJV/9Q7mRihPRQvD3pzwhFHlmODE2?= =?us-ascii?Q?jqBZgnH/5rQ0MIcNzJk9GWLWzV7Xrk7KRr7P9KbVVjNA93gh4O5YyBbI3hZs?= =?us-ascii?Q?D1x8kXHwFOObjl1Wik4M6Qu9di25BaMfLeMzwp/OxfNYXobqeNOo65VkgYUm?= =?us-ascii?Q?5oNPoaemlxvdPr+W8koKjq3uEZ5O+UaS7yO32xwFOHZ9bmjIPxlcF+nFZpxy?= =?us-ascii?Q?pQadiC3ywHbq7triQn6Dv/rYK4Bnr/Ui3oAa8JvZ7tde125vCwb3NatwxAYV?= =?us-ascii?Q?ZVZImMbaRSqVDloAggQ3+5PQwl+ySU1TxqACQQUkrxdksfpwmZPhqFTO36PY?= =?us-ascii?Q?gznkyAeDvILOEpQq2bzrDWLY9M8iOLJFkoWW90photl8Qtwg7tj0ESMxuOwb?= =?us-ascii?Q?yDw9VwrKuN7wURGGVjqsbRlegJrVyHG2FIJRfZOUxJ9k8unajCwFfCAF/L2w?= =?us-ascii?Q?cVeJFGf7YTGlfHf/d1BmCh4u1wdB0UCRgV21lBCDZMBbYqrJBRnWu93sFT2S?= =?us-ascii?Q?GzblhbkFWzi4vRB4ZOyIGeDZiNiMCEc3fFdkyaKE9Kq1M038IHE2LxqkR9Fb?= =?us-ascii?Q?kX9k1jTeO3sWi1Opfk4iifuzZZhJPe5MhaNRphP4DiJt9RPbd+qgULRb8RsK?= =?us-ascii?Q?hXbNUFr3+g03VM6+2Z4t0ImnkL72L8qJsvJhJpKu24eQGqzl/g+5S8o5rVzq?= =?us-ascii?Q?Ky3O/rR2KPvbKuoFu7M67tiOCbTHIU6bRgt+/z1R2kABjly+NYh+LWajKoxQ?= =?us-ascii?Q?QhXP82ELGPvacH0hcKpZ3D502Xqsybtu/hXTeh/p3pAQhCjgpSGz7ZzmhoY1?= =?us-ascii?Q?uViASLFI8LqhqGyjvyMei8smzZKzvvdE0llOKGTLfjFK6wuKmB1X650IvfiY?= =?us-ascii?Q?UA++u6PlMBkf3qFz1oZficiYxmw5BK4HiGl9wJqzojNCRnyygKltuKNHwZqk?= =?us-ascii?Q?xXz9ELs1LFyl9uAWnN1ULyV0TzlHvnHIdBJv/DbrOkBQ/YL8ka5qrSzlqRoE?= =?us-ascii?Q?/dGmo3Vx+RZ6bufdUTtt3V0hktYwX6nvVLa3Qn8+QbKMvMbWov+lnsjt1th+?= =?us-ascii?Q?JBLpRH7M3Gmk8dTWPGPuBFKtL10ZlDQuyXuXOLqmuTDFmLTL4UzwY3aeS5Hg?= =?us-ascii?Q?153eb0ajdNYAgTwgLPj0gAtRVCzQzfjB3pYEEmfQCJZYxrd1oPFISiw5Zpe3?= =?us-ascii?Q?emIfRdF7b54GvLvbEIHb8dje0KjphS3zLjvuBlUJDeeBaREAsVbFy7iNCrjP?= =?us-ascii?Q?MMGqJ/UkcfoEk8g=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(82310400026)(36860700013)(1800799024)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:44:30.3212 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 18039d25-3e36-4d66-f803-08dd5019fce3 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00002323.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ5PPF0529573EF 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 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=b1f0f150ca2f9fc29c9a6f1607fb432deb320869 Thanks. Xueming Li --- >From b1f0f150ca2f9fc29c9a6f1607fb432deb320869 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 Cc: Xueming Li [ 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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:03.674812223 +0800 +++ 0086-common-cnxk-fix-null-check.patch 2025-02-18 19:39:00.738244029 +0800 @@ -1 +1 @@ -From 1bab0289c6a58c3847ffbde2718b73a9b988deca Mon Sep 17 00:00:00 2001 +From b1f0f150ca2f9fc29c9a6f1607fb432deb320869 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1bab0289c6a58c3847ffbde2718b73a9b988deca ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 882cf65474..db70bafd9b 100644 +index e966494e21..3d674dbe84 100644 @@ -21 +23 @@ -@@ -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,