[dpdk-stable] patch 'net/hns3: fix unintended sign extension in fd operation' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

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/26/20. 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.

Thanks.

Luca Boccassi

---
>From 9cd77fe6e7ea86eeac5dc7f8eff407e3c14ec8dd Mon Sep 17 00:00:00 2001
From: "Wei Hu (Xavier)" <xavier.huwei at huawei.com>
Date: Tue, 9 Jun 2020 16:44:16 +0800
Subject: [PATCH] net/hns3: fix unintended sign extension in fd operation

[ upstream commit 5c471cb581ebd9a06918dbf5092f4228cc1e565e ]

Currently, there are coverity defects warning as below:

CID 349937 (#1 of 1): Unintended sign extension (SIGN_EXTENSION)
sign_extension: Suspicious implicit sign extension: port_number with
type uint16_t (16 bits, unsigned) is promoted in port_number << cur_pos
to type int (32 bits, signed), then sign-extended to type unsigned long
(64 bits, unsigned). If port_number << cur_pos is greater than
0x7FFFFFFF, the upper bits of the result will all be 1.

CID 349893 (#1 of 1): Unintended sign extension (SIGN_EXTENSION)
sign_extension: Suspicious implicit sign extension: vlan_tag with type
uint8_t (8 bits, unsigned) is promoted in vlan_tag << cur_pos to type
int (32 bits, signed), then sign-extended to type unsigned long (64
bits, unsigned). If vlan_tag << cur_pos is greater than 0x7FFFFFFF, the
upper bits of the result will all be 1.

This patch fixes them by replacing the data type of port_number and
vlan_tag with uint32_t in the inner static function named
hns3_fd_convert_meta_data of hns3 PMD driver.

Coverity issue: 349937, 349893
Fixes: fcba820d9b9e ("net/hns3: support flow director")

Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
---
 drivers/net/hns3/hns3_fdir.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c
index 79f3f0d14..98a044f56 100644
--- a/drivers/net/hns3/hns3_fdir.c
+++ b/drivers/net/hns3/hns3_fdir.c
@@ -619,7 +619,7 @@ static void hns3_fd_convert_meta_data(struct hns3_fd_key_cfg *cfg,
 				      uint8_t *key_x, uint8_t *key_y)
 {
 	uint16_t meta_data = 0;
-	uint16_t port_number;
+	uint32_t port_number;
 	uint8_t cur_pos = 0;
 	uint8_t tuple_size;
 	uint8_t shift_bits;
@@ -637,7 +637,7 @@ static void hns3_fd_convert_meta_data(struct hns3_fd_key_cfg *cfg,
 				     rule->key_conf.spec.tunnel_type ? 1 : 0);
 			cur_pos += tuple_size;
 		} else if (i == VLAN_NUMBER) {
-			uint8_t vlan_tag;
+			uint32_t vlan_tag;
 			uint8_t vlan_num;
 			if (rule->key_conf.spec.tunnel_type == 0)
 				vlan_num = rule->key_conf.vlan_num;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:49.729579730 +0100
+++ 0029-net-hns3-fix-unintended-sign-extension-in-fd-operati.patch	2020-07-24 12:53:48.219005193 +0100
@@ -1,8 +1,10 @@
-From 5c471cb581ebd9a06918dbf5092f4228cc1e565e Mon Sep 17 00:00:00 2001
+From 9cd77fe6e7ea86eeac5dc7f8eff407e3c14ec8dd Mon Sep 17 00:00:00 2001
 From: "Wei Hu (Xavier)" <xavier.huwei at huawei.com>
 Date: Tue, 9 Jun 2020 16:44:16 +0800
 Subject: [PATCH] net/hns3: fix unintended sign extension in fd operation
 
+[ upstream commit 5c471cb581ebd9a06918dbf5092f4228cc1e565e ]
+
 Currently, there are coverity defects warning as below:
 
 CID 349937 (#1 of 1): Unintended sign extension (SIGN_EXTENSION)
@@ -25,7 +27,6 @@
 
 Coverity issue: 349937, 349893
 Fixes: fcba820d9b9e ("net/hns3: support flow director")
-Cc: stable at dpdk.org
 
 Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
 ---
@@ -33,7 +34,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c
-index 7bc5bf831..6ab439d06 100644
+index 79f3f0d14..98a044f56 100644
 --- a/drivers/net/hns3/hns3_fdir.c
 +++ b/drivers/net/hns3/hns3_fdir.c
 @@ -619,7 +619,7 @@ static void hns3_fd_convert_meta_data(struct hns3_fd_key_cfg *cfg,