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 C251246C4D for ; Wed, 30 Jul 2025 09:11:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BC6A64025E; Wed, 30 Jul 2025 09:11:45 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2070.outbound.protection.outlook.com [40.107.220.70]) by mails.dpdk.org (Postfix) with ESMTP id 89D9B40E26 for ; Wed, 30 Jul 2025 09:11:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dXmNrW5xxOklzLtWsIyjlrTkpC1KFUkUMNcd8hnjDRuqJ2qRga/diwT3vYA90w4XVOu1Jcq60hu6iUL3cpt3VbNnbEd3unVn0aAUDX66i+Y6wHbQG2acUYs1B/wtabjVvuASGRAOXNf7sA9+Y0nM2CLM+irPcgB83Bt6MZJJoZhUrGJ3qUJwieFf7fllC55Q+eWluu2ejhONWduGg7XJqbkHA3S7olM6IdPdsrBfOrwz6nSlib3HP/meqbK0iP9n8MsHbhQzp5pFCrSgS5IxFZua57DCmIXVC/loWebgKwt0s0+NurRRscdqVTZWCfx06Bq4mXbOVuPIhPeJv5pFSg== 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=xvk6cWpzCpnzilGkkHBPZJD89CbjGl1HXMcoO4rTojU=; b=bxQISUdCRRGGOKOxpJSzNBjh6PApAZpr/o2Sye2KMZJWZXvgchcEv3PiPCxCqWhqD+YJBegW0E5AXEU7R1GOCD6Ddrh5PAPHbhAoamoADDdUtpe0NH4wpW5pHe1J5gnQo9L8y3al+jVlZuNzBAtFYIb3OkEizbCd75sSkofsPiquWRWslxBptLR7lNda8LmHkRSqyIbC8KPBVRn9Tvyq40DMJ3Qh4c5aSI3Vrwn0lADZT7q+Nsen/HcmUgsMPsNmv0lOkHVT1euKp4lnhOQGwec5Wx7FbtIAvldFGbr9n4vN4yZSTF+wNziFLnaxDACpjoGPeG3Hzaj7y8h1Qh1Bew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.com 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=xvk6cWpzCpnzilGkkHBPZJD89CbjGl1HXMcoO4rTojU=; b=BLQHBd1HTPB9kQ0y0RLOnVWkkWyZrd1uH+jxSM/w0RgbMsVojn3IDqDorYBtp1yXwQJO/RwL7m+qkVvYLVfzv2r3ocJ0aj/hxA33UDuPk7Q0/Zwc+hviS6f2MMgvniZ1Zs2La7k6eqvIgZ3IOgDPiMVjHKrNqU3Ff8rYEZmB1A+eXJDWPQwaYAudqM1NG5XFYLI98Whv0DE/WIDwIv8bKbeACYOs7qVGoj3d7rP925X0p3hz1enJ2NDiAPKzrDq8Y4uSxzlrQrEAuiqRswZ6IeL7uBIYpDhuG4f0elEeY98tuA0SMYJDwUBgIojohM/U2EjNyB2b7A0rFLSyT3kMAw== Received: from DS7PR03CA0218.namprd03.prod.outlook.com (2603:10b6:5:3ba::13) by CYXPR12MB9278.namprd12.prod.outlook.com (2603:10b6:930:e5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.11; Wed, 30 Jul 2025 07:11:39 +0000 Received: from CY4PEPF0000EE3E.namprd03.prod.outlook.com (2603:10b6:5:3ba:cafe::8f) by DS7PR03CA0218.outlook.office365.com (2603:10b6:5:3ba::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.11 via Frontend Transport; Wed, 30 Jul 2025 07:11:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EE3E.mail.protection.outlook.com (10.167.242.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 07:11:38 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 30 Jul 2025 00:11:15 -0700 Received: from nvidia.com (10.126.231.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; Wed, 30 Jul 2025 00:11:13 -0700 From: Xueming Li To: Rahul Bhansali CC: Xueming Li , dpdk stable Subject: patch 'common/cnxk: fix null pointer checks' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 15:10:15 +0800 Message-ID: <20250730071045.136672-5-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730071045.136672-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730071045.136672-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3E:EE_|CYXPR12MB9278:EE_ X-MS-Office365-Filtering-Correlation-Id: e5caa802-4b36-43c5-d2f0-08ddcf3853c6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?8eA8eNrQqyJx0fFyLVniCjpBDZVUkRhvhdrWUl+QiymOGDA9t0rIafwXmHuA?= =?us-ascii?Q?gDFCkA1L9O5WAQ3v6QkGZay72b+O+m28mTmw4PIKo0EgpzBwA5qqhidrESQr?= =?us-ascii?Q?cIB44xyrgiZ2YIMkjzDSCF9Tg8/jGNQuJHz2dFIl4yga7eLI2eriCLkBVI6d?= =?us-ascii?Q?ht5aHVeThSLCQr+q+tYFIVIJjeQsLZtXrfHs9wxwRYq7umspg5ZH2V5Xh0us?= =?us-ascii?Q?7hwGF0c59u9eDliWCFRysroVkRn/9BM6l/Kw6UwKAl5/g9rsZ92ZUW1GCzv+?= =?us-ascii?Q?tTuXcMVsAmKAw/lZBhDxVrzctJgHhF7t26Noi7NH7Btm/oAuYRhWlj4NNDrd?= =?us-ascii?Q?L9PDqewO77rmFvvHiaN9WwWmkY0dHHzbUq7+yxatPjkHJFbz7UvwVnlwJVyd?= =?us-ascii?Q?i1dLXwauMBWfwPAIPtmsspthUs6HxMTjPX7g02YWcgkULf7pSbgRbX1V1Lqc?= =?us-ascii?Q?WsVpYkGNuVXL0HavcM4s+86AbAHaZjr6PFpu4sPdAztzJE3/66u3hTS7BJdE?= =?us-ascii?Q?P0LAt+wd15VP5rW2BFdHnTyk84lncpvrlix7TVh7WNqVauoMBtL+545MBP8+?= =?us-ascii?Q?5dQ46yu38rueIQcgRZ4xdA9mGUC9fo9EqGXiw/XJpOHvFlzjglGqnJj6c/gi?= =?us-ascii?Q?gmG+gD5bCbNbAN6oLnT9+zrNEkPYup6GurU3JQ5TFAPF1P1VqZivp0EeK5Bp?= =?us-ascii?Q?u4zSsM5xmUa3Bs+xEG/s3W69iwpEgd/qQ8ow2asIIpesHRPU6ZrmJJ9jZ2rk?= =?us-ascii?Q?oKmO8bzCjkxUQJPgMxn4IX9VGG+EED4G2ik5vHTGrCIXpWUDklMiyP8tOQdm?= =?us-ascii?Q?5gqOLK5HbHdJCWw8o9WH27SCuhvijBWLHBCT7yUJ3aAMmLBIkXwKA6DljtTD?= =?us-ascii?Q?G0ALp2j9hhKzGhlHpx6aANr2+YzJ+5feYmK9QAtCqrfPemLtGuLf4Tiu4zeL?= =?us-ascii?Q?3YR6O3ErB03ocLEaq7IZLu3kHUljqZEDEv6hxFWuogWurc3ua6RCad5oLOJY?= =?us-ascii?Q?4SpYu2lQ9OFGlyHWXICNxdvMeljHBcWmDGa+LsgOt169bI55zauRsPdMl9kL?= =?us-ascii?Q?AeBOVYsUHrJg1gof6ArkIdxJqKZx8Q9iua59CnMHcMKiYnu36AtbkPODkd0A?= =?us-ascii?Q?TVt2xrF1bfhqS/By0W8bMy4Agnm6tslqwSsIittUMjG6Y24ZAF9jzUt2Oxtz?= =?us-ascii?Q?yFbVGCNth59VuJUuSxtgbLWPxynFpvpgTN4bJzVsTE3oxX5br5w+HDeak+Hy?= =?us-ascii?Q?esjd2xfE02en4mq8YkVr6WKHof5yZUD5SWbjl2n9upfBJAAcdlJzTE4GCe+L?= =?us-ascii?Q?HKlOVsu6e5JE4VD7WHDFyTqD4cMt5XUQAHKPkX2qSKXEo/+aow5IqVS1DBLq?= =?us-ascii?Q?Mt/1eWtExZY8GmWTP5lEvyHBXwLot37lvfOs1P7U4GjLVZhLjsUCs+DXuZGm?= =?us-ascii?Q?/UKDECcGCOfcIGnMv9hEE2ZCTB8ETqDjaJ5Sovi8alDIXQJ29iU8giFNugF5?= =?us-ascii?Q?sG9auIHVOQn+72XEfzXmpBsUVyPNk2HFqaCT?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 07:11:38.4906 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e5caa802-4b36-43c5-d2f0-08ddcf3853c6 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE3E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9278 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/10/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://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=fe309fb57e18d44550b4d198e3f7bb2e23cb72d0 Thanks. Xueming Li --- >From fe309fb57e18d44550b4d198e3f7bb2e23cb72d0 Mon Sep 17 00:00:00 2001 From: Rahul Bhansali Date: Mon, 23 Jun 2025 10:19:07 +0530 Subject: [PATCH] common/cnxk: fix null pointer checks Cc: Xueming Li [ upstream commit bba99bb88c4f2bf3391ade016d808b27a8a17a19 ] Adds null pointer check before executing CPT instruction. Fixes: 4d00b8c6a331 ("common/cnxk: allocate dynamic BPIDs") Fixes: 4af4e36a93d7 ("common/cnxk: support inline device API without ROC NIX") Signed-off-by: Rahul Bhansali --- drivers/common/cnxk/roc_nix_inl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/common/cnxk/roc_nix_inl.c b/drivers/common/cnxk/roc_nix_inl.c index ba51ddd8c8..80379aa22b 100644 --- a/drivers/common/cnxk/roc_nix_inl.c +++ b/drivers/common/cnxk/roc_nix_inl.c @@ -813,7 +813,7 @@ int roc_nix_inl_inb_init(struct roc_nix *roc_nix) { struct nix *nix = roc_nix_to_nix_priv(roc_nix); - struct roc_cpt_inline_ipsec_inb_cfg cfg; + struct roc_cpt_inline_ipsec_inb_cfg cfg = {0}; struct idev_cfg *idev = idev_get_cfg(); struct nix_inl_dev *inl_dev; uint16_t bpids[ROC_NIX_MAX_BPID_CNT]; @@ -1619,7 +1619,7 @@ roc_nix_inl_sa_sync(struct roc_nix *roc_nix, void *sa, bool inb, if (idev) inl_dev = idev->nix_inl_dev; - if (!inl_dev && roc_nix == NULL) + if ((!inl_dev && roc_nix == NULL) || sa == NULL) return -EINVAL; if (roc_nix) { @@ -1683,7 +1683,7 @@ roc_nix_inl_ctx_write(struct roc_nix *roc_nix, void *sa_dptr, void *sa_cptr, if (idev) inl_dev = idev->nix_inl_dev; - if (!inl_dev && roc_nix == NULL) + if ((!inl_dev && roc_nix == NULL) || sa_dptr == NULL || sa_cptr == NULL) return -EINVAL; if (roc_nix) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 15:02:12.974582847 +0800 +++ 0004-common-cnxk-fix-null-pointer-checks.patch 2025-07-30 15:02:12.771184135 +0800 @@ -1 +1 @@ -From bba99bb88c4f2bf3391ade016d808b27a8a17a19 Mon Sep 17 00:00:00 2001 +From fe309fb57e18d44550b4d198e3f7bb2e23cb72d0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bba99bb88c4f2bf3391ade016d808b27a8a17a19 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index bee8e25c7c..c7637ddbdc 100644 +index ba51ddd8c8..80379aa22b 100644 @@ -21,2 +23,2 @@ -@@ -1312,7 +1312,7 @@ static int - nix_inl_legacy_inb_init(struct roc_nix *roc_nix) +@@ -813,7 +813,7 @@ int + roc_nix_inl_inb_init(struct roc_nix *roc_nix) @@ -27,0 +30 @@ + struct nix_inl_dev *inl_dev; @@ -29,2 +32 @@ - struct roc_cpt *roc_cpt; -@@ -2219,7 +2219,7 @@ roc_nix_inl_sa_sync(struct roc_nix *roc_nix, void *sa, bool inb, +@@ -1619,7 +1619,7 @@ roc_nix_inl_sa_sync(struct roc_nix *roc_nix, void *sa, bool inb, @@ -39 +41 @@ -@@ -2299,7 +2299,7 @@ roc_nix_inl_ctx_write(struct roc_nix *roc_nix, void *sa_dptr, void *sa_cptr, +@@ -1683,7 +1683,7 @@ roc_nix_inl_ctx_write(struct roc_nix *roc_nix, void *sa_dptr, void *sa_cptr,