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 EBEBB43345 for ; Thu, 16 Nov 2023 14:25:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E63A740EDF; Thu, 16 Nov 2023 14:25:08 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id D032C40EDF for ; Thu, 16 Nov 2023 14:25:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wlgo6YMq9/UlRQaWHKjJY7++OALDvF+nRAL7mBYyBzw=; b=EUNSGwXdkhjbo0BYd8E9cG9a0N+jG+LQjGxzJJmqkXpSUyHt3ZCQuySy4mDk8p4WiPbYsa X6MXTrhMaTJxmvxx5uki8Pi5Le8ajHmD6QsjUEgWm2qDP+kyN6lnTh3mJcYCS5ly+TZKfX DHtMGlnJc1xg7D+kbupEN03dT2Uf9mg= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-491-TWgUk6o2NSelbHSVrLJORQ-1; Thu, 16 Nov 2023 08:25:06 -0500 X-MC-Unique: TWgUk6o2NSelbHSVrLJORQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CF05038157A4; Thu, 16 Nov 2023 13:25:05 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03ACD2166B27; Thu, 16 Nov 2023 13:25:04 +0000 (UTC) From: Kevin Traynor To: Weiguo Li Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/sfc: remove null dereference in log' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:33 +0000 Message-ID: <20231116132348.557257-51-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/c24098a7ad7be7d1418075b9fc712fcfe35a963d Thanks. Kevin --- >From c24098a7ad7be7d1418075b9fc712fcfe35a963d 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 [ 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 184f6e7c67..5059422ed3 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -2054,5 +2054,5 @@ sfc_process_mport_journal_cb(void *data, efx_mport_desc_t *mport, 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.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.758104530 +0000 +++ 0051-net-sfc-remove-null-dereference-in-log.patch 2023-11-16 13:21:52.516946567 +0000 @@ -1 +1 @@ -From d05ce802f39dd4a67c18f9dbe1a00901429ba191 Mon Sep 17 00:00:00 2001 +From c24098a7ad7be7d1418075b9fc712fcfe35a963d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d05ce802f39dd4a67c18f9dbe1a00901429ba191 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 1efe64a36a..6d57b2ba26 100644 +index 184f6e7c67..5059422ed3 100644 @@ -23 +24 @@ -@@ -2071,5 +2071,5 @@ sfc_process_mport_journal_cb(void *data, efx_mport_desc_t *mport, +@@ -2054,5 +2054,5 @@ sfc_process_mport_journal_cb(void *data, efx_mport_desc_t *mport,