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 AB96842ECF for ; Thu, 20 Jul 2023 17:24:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A8C0042D61; Thu, 20 Jul 2023 17:24:32 +0200 (CEST) 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 63B9342D46 for ; Thu, 20 Jul 2023 17:24:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866671; 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=8c6pEOGiQ3mgYMpc6ornvCj1rrFYN7WTVdxaUBamFCs=; b=hHWA6TRDSIJacK0ZyHPrGoT38x8ii9I23cPPH48Jnr9fZGY257OTAm5eXsr9QqBYJ4N+nk C1L3Waxmx7krIaWMoMs4QGnQLdInqDaFaL+IyA0sPUDGEw4H/0/+wCcPSwPIqhCwRw1TWR p8mbGhOQrGHQVoLV1XAToRxybFwfWOg= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-372-UjhqiY6zMI6Z1PrtfsB8WA-1; Thu, 20 Jul 2023 11:22:56 -0400 X-MC-Unique: UjhqiY6zMI6Z1PrtfsB8WA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F2EF73849544; Thu, 20 Jul 2023 15:22:10 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C8F6492C13; Thu, 20 Jul 2023 15:22:09 +0000 (UTC) From: Kevin Traynor To: Denis Pryazhennikov Cc: Ivan Malov , Viacheslav Galaktionov , Ferruh Yigit , dpdk stable Subject: patch 'ethdev: check that at least one FEC mode is specified' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:37 +0100 Message-ID: <20230720151942.262154-86-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.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 07/25/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/b6557a758d42086033cfe0ac01a456b95b8c2a8c Thanks. Kevin --- >From b6557a758d42086033cfe0ac01a456b95b8c2a8c Mon Sep 17 00:00:00 2001 From: Denis Pryazhennikov Date: Mon, 8 May 2023 15:47:06 +0400 Subject: [PATCH] ethdev: check that at least one FEC mode is specified [ upstream commit 9fdcf2be070dcd5ea3d845ce798c298c5dfbaa4a ] The behaviour is undefined in the rte_eth_fec_set() function when the fec_capa parameter is equal to zero. Add a check to handle this case. Fixes: b7ccfb09da95 ("ethdev: introduce FEC API") Signed-off-by: Denis Pryazhennikov Acked-by: Ivan Malov Acked-by: Viacheslav Galaktionov Acked-by: Ferruh Yigit --- lib/ethdev/rte_ethdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 7e29982a4e..081d8bb297 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -4352,4 +4352,9 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa) dev = &rte_eth_devices[port_id]; + if (fec_capa == 0) { + RTE_ETHDEV_LOG(ERR, "At least one FEC mode should be specified\n"); + return -EINVAL; + } + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fec_set, -ENOTSUP); return eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa)); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:05.415022067 +0100 +++ 0086-ethdev-check-that-at-least-one-FEC-mode-is-specified.patch 2023-07-20 16:17:54.952751696 +0100 @@ -1 +1 @@ -From 9fdcf2be070dcd5ea3d845ce798c298c5dfbaa4a Mon Sep 17 00:00:00 2001 +From b6557a758d42086033cfe0ac01a456b95b8c2a8c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9fdcf2be070dcd5ea3d845ce798c298c5dfbaa4a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 731423ef03..1e024802ae 100644 +index 7e29982a4e..081d8bb297 100644 @@ -25 +26 @@ -@@ -4829,4 +4829,9 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa) +@@ -4352,4 +4352,9 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa) @@ -33,2 +34,2 @@ - if (*dev->dev_ops->fec_set == NULL) - return -ENOTSUP; + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fec_set, -ENOTSUP); + return eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa));