[dpdk-stable] patch 'net/i40e: add null input checks' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/06/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/4277f452e8dd4ad92983be36f2b372bff6c0c57f

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 4277f452e8dd4ad92983be36f2b372bff6c0c57f Mon Sep 17 00:00:00 2001
From: Murphy Yang <murphyx.yang at intel.com>
Date: Fri, 8 Jan 2021 08:30:11 +0000
Subject: [PATCH] net/i40e: add null input checks

[ upstream commit 696ad314ccfcd708534aeaefbd946f872278e023 ]

Pointer 'NULL' check for 'mac_addr' or 'conf' within i40e PMD APIs.

Fixes: 66c78f4799ff ("net/i40e: add support for packet template to flow director")
Fixes: 04b443fb2c43 ("net/i40e: fix port id type")

Signed-off-by: Murphy Yang <murphyx.yang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/i40e/rte_pmd_i40e.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c
index 759c370d7d..cd2ec58df7 100644
--- a/drivers/net/i40e/rte_pmd_i40e.c
+++ b/drivers/net/i40e/rte_pmd_i40e.c
@@ -2365,6 +2365,9 @@ rte_pmd_i40e_add_vf_mac_addr(uint16_t port, uint16_t vf_id,
 	struct i40e_mac_filter_info mac_filter;
 	int ret;
 
+	if (mac_addr == NULL)
+		return -EINVAL;
+
 	if (i40e_validate_mac_addr((u8 *)mac_addr) != I40E_SUCCESS)
 		return -EINVAL;
 
@@ -3041,6 +3044,9 @@ int rte_pmd_i40e_flow_add_del_packet_template(
 
 	RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
 
+	if (conf == NULL)
+		return -EINVAL;
+
 	if (!is_i40e_supported(dev))
 		return -ENOTSUP;
 
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:29.834280828 +0100
+++ 0041-net-i40e-add-null-input-checks.patch	2021-02-04 12:04:27.954789655 +0100
@@ -1 +1 @@
-From 696ad314ccfcd708534aeaefbd946f872278e023 Mon Sep 17 00:00:00 2001
+From 4277f452e8dd4ad92983be36f2b372bff6c0c57f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 696ad314ccfcd708534aeaefbd946f872278e023 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 790d042002..2e34140c5b 100644
+index 759c370d7d..cd2ec58df7 100644
@@ -22 +23 @@
-@@ -2366,6 +2366,9 @@ rte_pmd_i40e_add_vf_mac_addr(uint16_t port, uint16_t vf_id,
+@@ -2365,6 +2365,9 @@ rte_pmd_i40e_add_vf_mac_addr(uint16_t port, uint16_t vf_id,
@@ -32 +33 @@
-@@ -3042,6 +3045,9 @@ int rte_pmd_i40e_flow_add_del_packet_template(
+@@ -3041,6 +3044,9 @@ int rte_pmd_i40e_flow_add_del_packet_template(