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 72C2B45DB9 for ; Wed, 27 Nov 2024 18:20:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6EB53402DE; Wed, 27 Nov 2024 18:20:44 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7CE24402DE for ; Wed, 27 Nov 2024 18:20:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728042; 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=ia0IYsSaoVTvym53xae8SGHcthKz8ztJtkxCIUjSvNc=; b=LJcDM2Jo4bQbJeECXhoKxv6JTmj+O762YAvZWUqV3cJqZ5TVX6t9Y9L7GxBCP01VE1uX0M FFEwbbY3i/BzqmCrKVJj+A6T6EjWHyOkOo2TTx/jCmNWFvJPcHCJS7o33J1Q1QR1F9HDRI zStatByKOxHtDOi50w4vkG2I/st9NHE= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-632-W8veC9XgOzOYIbuUw3M9ng-1; Wed, 27 Nov 2024 12:20:38 -0500 X-MC-Unique: W8veC9XgOzOYIbuUw3M9ng-1 X-Mimecast-MFC-AGG-ID: W8veC9XgOzOYIbuUw3M9ng Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 613E619541A1; Wed, 27 Nov 2024 17:20:37 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A6E9C30001A2; Wed, 27 Nov 2024 17:20:35 +0000 (UTC) From: Kevin Traynor To: Barbara Skobiej Cc: Anatoly Burakov , Bruce Richardson , dpdk stable Subject: patch 'net/ixgbe/base: fix unchecked return value' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:17:38 +0000 Message-ID: <20241127171916.690404-31-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 3DgwToEehCKddILmiW3LvMu2SiJgaMv3b_hxmNbmAYI_1732728037 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.9 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/02/24. 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/64022eb0b9f9b78a0b44634e98818aa7b695b8b6 Thanks. Kevin --- >From 64022eb0b9f9b78a0b44634e98818aa7b695b8b6 Mon Sep 17 00:00:00 2001 From: Barbara Skobiej Date: Thu, 29 Aug 2024 10:00:11 +0100 Subject: [PATCH] net/ixgbe/base: fix unchecked return value [ upstream commit eb3684b191928ebb5d263e3f8ab1e309bfec099e ] There was unchecked return value in the ixgbe_stop_mac_link_on_d3_82599 function. Added checking of return value from the called function ixgbe_read_eeprom. Fixes: b7ad3713b958 ("ixgbe/base: allow to disable link on D3") Signed-off-by: Barbara Skobiej Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/ixgbe/base/ixgbe_82599.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ixgbe/base/ixgbe_82599.c b/drivers/net/ixgbe/base/ixgbe_82599.c index 69fd4cd3fb..b39dd70da0 100644 --- a/drivers/net/ixgbe/base/ixgbe_82599.c +++ b/drivers/net/ixgbe/base/ixgbe_82599.c @@ -552,11 +552,13 @@ out: void ixgbe_stop_mac_link_on_d3_82599(struct ixgbe_hw *hw) { - u32 autoc2_reg; u16 ee_ctrl_2 = 0; + u32 autoc2_reg; + u32 status; DEBUGFUNC("ixgbe_stop_mac_link_on_d3_82599"); - ixgbe_read_eeprom(hw, IXGBE_EEPROM_CTRL_2, &ee_ctrl_2); + status = ixgbe_read_eeprom(hw, IXGBE_EEPROM_CTRL_2, &ee_ctrl_2); - if (!ixgbe_mng_present(hw) && !hw->wol_enabled && + if (status == IXGBE_SUCCESS && + !ixgbe_mng_present(hw) && !hw->wol_enabled && ee_ctrl_2 & IXGBE_EEPROM_CCD_BIT) { autoc2_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC2); -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:39.270813918 +0000 +++ 0031-net-ixgbe-base-fix-unchecked-return-value.patch 2024-11-27 17:17:38.188269181 +0000 @@ -1 +1 @@ -From eb3684b191928ebb5d263e3f8ab1e309bfec099e Mon Sep 17 00:00:00 2001 +From 64022eb0b9f9b78a0b44634e98818aa7b695b8b6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit eb3684b191928ebb5d263e3f8ab1e309bfec099e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index c4ad906f0f..3110477700 100644 +index 69fd4cd3fb..b39dd70da0 100644 @@ -24 +25 @@ -@@ -557,11 +557,13 @@ out: +@@ -552,11 +552,13 @@ out: