patch 'net/enic: fix null dereference in flow mask check' has been queued to stable release 25.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 25.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/04/26. 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/4001e10bb00790501fb9dfc753f779a13fb80049

Thanks.

Kevin

---
>From 4001e10bb00790501fb9dfc753f779a13fb80049 Mon Sep 17 00:00:00 2001
From: Alexey Simakov <bigalex934 at gmail.com>
Date: Tue, 7 Jul 2026 11:58:31 +0300
Subject: [PATCH] net/enic: fix null dereference in flow mask check

[ upstream commit 1e267033c1f67cf7ed6f01d449297ff88f3e341d ]

The functions enic_copy_item_ipv4_v1(), enic_copy_item_udp_v1(), and
enic_copy_item_tcp_v1() each initialize a local 'mask' variable from
item->mask and substitute it with a hardcoded mask if NULL. However,
the subsequent mask_exact_match() call uses item->mask directly
instead of the local 'mask' variable, which will dereference NULL
when item->mask is NULL.

Use the local 'mask' variable (which has been validated and possibly
substituted) instead of item->mask.

Fixes: aa3d2ff82198 ("net/enic: flow API for Legacy NICs")

Signed-off-by: Alexey Simakov <bigalex934 at gmail.com>
Acked-by: Hyong Youb Kim <hyonkim at cisco.com>
---
 .mailmap                     | 1 +
 drivers/net/enic/enic_flow.c | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index 57a2044bfe..bc54e58586 100644
--- a/.mailmap
+++ b/.mailmap
@@ -72,4 +72,5 @@ Alexander V Gutkin <alexander.v.gutkin at intel.com>
 Alexandre Ferrieux <alexandre.ferrieux at orange.com>
 Alexey Kardashevskiy <aik at ozlabs.ru>
+Alexey Simakov <bigalex934 at gmail.com>
 Alfredo Cardigliano <cardigliano at ntop.org>
 Ali Alnubani <alialnu at nvidia.com> <alialnu at mellanox.com>
diff --git a/drivers/net/enic/enic_flow.c b/drivers/net/enic/enic_flow.c
index 758000ea21..539b0eb725 100644
--- a/drivers/net/enic/enic_flow.c
+++ b/drivers/net/enic/enic_flow.c
@@ -408,5 +408,5 @@ enic_copy_item_ipv4_v1(struct copy_item_args *arg)
 	/* check that the supplied mask exactly matches capability */
 	if (!mask_exact_match((const uint8_t *)&supported_mask,
-			      (const uint8_t *)item->mask, sizeof(*mask))) {
+			      (const uint8_t *)mask, sizeof(*mask))) {
 		ENICPMD_LOG(ERR, "IPv4 exact match mask");
 		return ENOTSUP;
@@ -446,5 +446,5 @@ enic_copy_item_udp_v1(struct copy_item_args *arg)
 	/* check that the supplied mask exactly matches capability */
 	if (!mask_exact_match((const uint8_t *)&supported_mask,
-			      (const uint8_t *)item->mask, sizeof(*mask))) {
+			      (const uint8_t *)mask, sizeof(*mask))) {
 		ENICPMD_LOG(ERR, "UDP exact match mask");
 		return ENOTSUP;
@@ -485,5 +485,5 @@ enic_copy_item_tcp_v1(struct copy_item_args *arg)
 	/* check that the supplied mask exactly matches capability */
 	if (!mask_exact_match((const uint8_t *)&supported_mask,
-			     (const uint8_t *)item->mask, sizeof(*mask))) {
+			     (const uint8_t *)mask, sizeof(*mask))) {
 		ENICPMD_LOG(ERR, "TCP exact match mask");
 		return ENOTSUP;
-- 
2.55.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-07-30 10:16:02.669180154 +0100
+++ 0040-net-enic-fix-null-dereference-in-flow-mask-check.patch	2026-07-30 10:16:01.481797132 +0100
@@ -1 +1 @@
-From 1e267033c1f67cf7ed6f01d449297ff88f3e341d Mon Sep 17 00:00:00 2001
+From 4001e10bb00790501fb9dfc753f779a13fb80049 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1e267033c1f67cf7ed6f01d449297ff88f3e341d ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index 05a55c0bd6..b430aa8403 100644
+index 57a2044bfe..bc54e58586 100644
@@ -30 +31 @@
-@@ -73,4 +73,5 @@ Alexander V Gutkin <alexander.v.gutkin at intel.com>
+@@ -72,4 +72,5 @@ Alexander V Gutkin <alexander.v.gutkin at intel.com>