Hi,
FYI, your patch has been queued to stable release 24.11.3
Note it hasn't been pushed to
https://linkprotect.cudasvc.com/url?a=http%3a%2f%2fdpdk.org%2fbrowse%2fdpdk-stable&c=E,1,30w89yF4QLjfadAKGQFITCXmNAI8Fubd9zc_3CAyjRcyr7va20H2s-pRwTp8SDIDMsUiJ7ia2x0VYw8GBCf30-aNCcdCSAH9ghwAa3liAemIg-mFdFHKuQKY13B1&typo=1 yet.
It will be pushed if I get no objections before 07/23/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://github.com/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/cc5b54d0d2c07c676771ed09e74322f6512e6cc1
Thanks.
Kevin
---
From cc5b54d0d2c07c676771ed09e74322f6512e6cc1 Mon Sep 17 00:00:00 2001
From: Danylo Vodopianov <dvo-plv@napatech.com>
Date: Mon, 5 May 2025 09:13:01 +0200
Subject: [PATCH] net/ntnic: avoid divide by zero
[ upstream commit 8bbae3e37cf309e8ffc5292bf9d41c44a217f7f1 ]
Fix CID issue 457736 divide by 0. It was avoided by
adding adittional checking on the return value
for function.
Fixes: effa04693274 ("net/ntnic: add statistics")
Signed-off-by: Danylo Vodopianov <dvo-plv@napatech.com>
---
drivers/net/ntnic/nthw/stat/nthw_stat.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/ntnic/nthw/stat/nthw_stat.c b/drivers/net/ntnic/nthw/stat/nthw_stat.c
index b0db7b1984..d3e9225e58 100644
--- a/drivers/net/ntnic/nthw/stat/nthw_stat.c
+++ b/drivers/net/ntnic/nthw/stat/nthw_stat.c
@@ -319,4 +319,8 @@ int nthw_stat_init(nthw_stat_t *p, nthw_fpga_t *p_fpga, int n_instance)
if (p->mp_fld_load_bin) {
uint32_t rpp = nthw_fpga_get_product_param(p_fpga, NT_RPP_PER_PS, 0);
+ if (rpp == 0) {
+ NT_LOG(ERR, NTHW, "RPP has wrong value"); /* Avoid divide by 0 */
+ return -1;
+ }
uint32_t bin =
(uint32_t)(((PORT_LOAD_WINDOWS_SIZE * 1000000000000ULL) / (32ULL * rpp)) -
--
2.50.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-07-18 20:29:13.162673752 +0100
+++ 0060-net-ntnic-avoid-divide-by-zero.patch 2025-07-18 20:29:10.956907411 +0100
@@ -1 +1 @@
-From 8bbae3e37cf309e8ffc5292bf9d41c44a217f7f1 Mon Sep 17 00:00:00 2001
+From cc5b54d0d2c07c676771ed09e74322f6512e6cc1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8bbae3e37cf309e8ffc5292bf9d41c44a217f7f1 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 2ddef052a5..9bb97bf311 100644
+index b0db7b1984..d3e9225e58 100644
@@ -22 +23 @@
-@@ -320,4 +320,8 @@ int nthw_stat_init(nthw_stat_t *p, nthw_fpga_t *p_fpga, int n_instance)
+@@ -319,4 +319,8 @@ int nthw_stat_init(nthw_stat_t *p, nthw_fpga_t *p_fpga, int n_instance)