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 BD8A3433D8 for ; Mon, 11 Dec 2023 11:19:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B472D40ED2; Mon, 11 Dec 2023 11:19:55 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2069.outbound.protection.outlook.com [40.107.212.69]) by mails.dpdk.org (Postfix) with ESMTP id 03CAD40E0F for ; Mon, 11 Dec 2023 11:19:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SiHaoNLCzTLSk0ycyFkPpIUHn5BpRztsr9uJ0VdHnlfDckQ+0P3jOTUmQnDrIKRGwYhN2gIELzmzCezFqbK5T8ohEecY2n9GIZ0CyAGRk4rPi7oQCHJy+m2rnO5VmedMwZ0jDHg8kvyZ0U8EjCukAE6rkWqBBg7jbh91YJlJ0oZngqSuvvPhydbh8Y9kf/EyI5dLJdWqLiTXGDfpFUqOrek8UtYTxIQ3uCF7uvGws2Gi2nFuV+VrK0QiDJ4g2KNUgmZzaex7Za1YgJsrdAN65ScBDR2/Xppnt1N8WAiAEp099qCCEoH65qhfz9js8pCtJGV1+fo44RsGIzKPblnWoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=etqyQKsp1ISWoAHhYaZ7UT/Wr1QWdO6RxmpZm3/cHYA=; b=Z/2l1V83HfhZoXxjCkAz5WwPLBhuZMDidr4i/w0hyXM4xcQOYyoZ1G0ESKZnZkRMrkcUd5nrita1i9xZAyJdHE/rKv56NOERMG9apAno12xuCDA8JbsFhE+L6DI2ZTv8hZ0iivarvtXkfMRmrWuLRo1xFqxkGbiG5iF3oBjyUZwtfjl1uCUbYxW4JcEhZtzLAELjGfBZlrD7msS9+0tko84V3FyXTYzLH/1ZidBL7dGkD7oowGXOQs8xeXv7zAhU8vPMTp3RH8IQySUvGom8zyBIcGUp5EqT2cEXMJ1wcpmNokKgBV29f7uS3yoJt1V3M6SfWah3FNoS86wEscHHdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=xencore.cn 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=etqyQKsp1ISWoAHhYaZ7UT/Wr1QWdO6RxmpZm3/cHYA=; b=GW9YIa1ksNqd4JwbhpS26ZuZg6gzDs/O6Q69BSHhsN9pHtIL8CitcPTsWGTFFcuENRXfhxsGMnCrEUl/WNKGATRI908OzprZpWRjulIGwFCZ1g9d2eJmrxjK5sIM6iAsY6uMRegvM4dO7tZXT+YoBb9D057niU3Uac5EsCx9aNTbB7Bk6p0lA2BFtfrDk4QLQFF5JeTGrkYHp39GuSVjivUp3c1kmqDQn/CmOMkyLRfkIcUErBc4OU5HOVfEnQUKc0UmF9BibHBtFooa08TrXgnBzIL7qD192N3umymetHLfRM1OVZJL32n5p8AjCeowbFJvUnvIA10QAJKTu4X3xw== Received: from SA9PR13CA0083.namprd13.prod.outlook.com (2603:10b6:806:23::28) by DS7PR12MB5717.namprd12.prod.outlook.com (2603:10b6:8:70::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:19:49 +0000 Received: from SN1PEPF0002529E.namprd05.prod.outlook.com (2603:10b6:806:23:cafe::c9) by SA9PR13CA0083.outlook.office365.com (2603:10b6:806:23::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.21 via Frontend Transport; Mon, 11 Dec 2023 10:19:49 +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 SN1PEPF0002529E.mail.protection.outlook.com (10.167.242.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:19:49 +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.986.41; Mon, 11 Dec 2023 02:19:30 -0800 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.986.41; Mon, 11 Dec 2023 02:19:28 -0800 From: Xueming Li To: Weiguo Li CC: Ferruh Yigit , dpdk stable Subject: patch 'net/sfc: remove null dereference in log' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:41 +0800 Message-ID: <20231211101226.2122-77-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-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: 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: SN1PEPF0002529E:EE_|DS7PR12MB5717:EE_ X-MS-Office365-Filtering-Correlation-Id: d6aaca9b-76f7-4586-b5b3-08dbfa32b506 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1xV3GvB7SlCTfhiPpaV4QFgbL3WikgwFO5gWfMkkWX4sYP8ULtNe8tZk7FeTkixg0K73eabnTpJ5iGQgGCV1Y/Pgbx80fZ9YNneZUBiz9Qj+ZI2xKRSx0EQ89LU6obuPbnR4Y9aFa9220LsX45DKG2ZCkLsP2pcVKHNNRY4yBIL5LQAKlTZMPKneb7jhIRFVp4m0+QZdlYW79TwK1xUA1WBKWEH8c9ei9zdEmQvOJ9dUfsB1KJyPy6WWhpcsMsKyhaKgQ8wC2Pbc86xR7LmmhlWcE/OVpepyHtn358FPVf/r4REGKGGA0GDL8yKU5g8j1jfTikGPHKvV1vxZ/7VI5NiT6VA+zk4SqxDsT8ndmnTRW8OPyNYunkL89uQ107RX9U/mpmCnWIx0SPm+h1Fi2bYpxMb0e6UpHh7eJkdQYk5CDzDyaAq7i8ZW5vIeh5OcN5cSA3sLZ2nBf/IIjI+8BxrSBT2ruVt8XtdxD6OosU5B/vbpt3PuCHcYUZuMY3631K3q4jVruxAGn5FmKDTBwL2CxEn+YowMujdzQUepKUJX3YKm5F4HnanMcwl3JgSj+qfzeWWJorrRHoVHvlLlvDWpUxa/hoNvpOJeESdALnhfuNKilfHv9ZvnI8BRYkI2Lo5EVU2fQ4En3yScFf9L+0VhHScgz2pifZPybivHIFRdBuF5W01ZOJl5jbUQAxylE6oN9O9BUJUxNJYMfTp0YVmPT1zeVkOkr27d3pIVvSDzYu7jnPyI2dRttFyzYfRilZU8OemcD/ps/+ENr359M42lwjNSE3+ZwtOBkLPSlMM= 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:(13230031)(4636009)(376002)(39860400002)(396003)(346002)(136003)(230922051799003)(1800799012)(186009)(82310400011)(64100799003)(451199024)(40470700004)(36840700001)(46966006)(40460700003)(4001150100001)(2906002)(41300700001)(36860700001)(36756003)(86362001)(7636003)(82740400003)(356005)(2616005)(336012)(426003)(16526019)(1076003)(26005)(6286002)(6666004)(478600001)(53546011)(7696005)(47076005)(966005)(83380400001)(4326008)(5660300002)(316002)(6916009)(70586007)(70206006)(54906003)(8936002)(8676002)(55016003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:19:49.4075 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d6aaca9b-76f7-4586-b5b3-08dbfa32b506 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: SN1PEPF0002529E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5717 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=28f7dd30ee751f439839811ffa99395f6503ccb0 Thanks. Xueming Li --- >From 28f7dd30ee751f439839811ffa99395f6503ccb0 Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Sat, 4 Nov 2023 15:37:15 +0800 Subject: [PATCH] net/sfc: remove null dereference in log Cc: Xueming Li [ upstream commit d05ce802f39dd4a67c18f9dbe1a00901429ba191 ] When ctx->sa is null, sfc_err(ctx->sa, ...) will trigger a null dereference in the macro of sfc_err. Use SFC_GENERIC_LOG(ERR, ...) to avoid that. Fixes: 44db08d53be3 ("net/sfc: maintain controller to EFX interface mapping") Signed-off-by: Weiguo Li Reviewed-by: Ferruh Yigit --- drivers/net/sfc/sfc_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index 2ec743ebce..170ee57931 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -2055,7 +2055,7 @@ sfc_process_mport_journal_cb(void *data, efx_mport_desc_t *mport, struct sfc_mport_journal_ctx *ctx = data; if (ctx == NULL || ctx->sa == NULL) { - sfc_err(ctx->sa, "received NULL context or SFC adapter"); + SFC_GENERIC_LOG(ERR, "received NULL context or SFC adapter"); return EINVAL; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:25.536267800 +0800 +++ 0076-net-sfc-remove-null-dereference-in-log.patch 2023-12-11 17:56:23.087652300 +0800 @@ -1 +1 @@ -From d05ce802f39dd4a67c18f9dbe1a00901429ba191 Mon Sep 17 00:00:00 2001 +From 28f7dd30ee751f439839811ffa99395f6503ccb0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d05ce802f39dd4a67c18f9dbe1a00901429ba191 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 1efe64a36a..6d57b2ba26 100644 +index 2ec743ebce..170ee57931 100644 @@ -23 +25 @@ -@@ -2070,7 +2070,7 @@ sfc_process_mport_journal_cb(void *data, efx_mport_desc_t *mport, +@@ -2055,7 +2055,7 @@ sfc_process_mport_journal_cb(void *data, efx_mport_desc_t *mport,