[dpdk-stable] patch 'drivers/net: fix possible overflow using strlcat' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

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

Kevin Traynor

---
>From 6ebf5b652d11d578f44b2258bc3414da9b03cf9b Mon Sep 17 00:00:00 2001
From: Chaitanya Babu Talluri <tallurix.chaitanya.babu at intel.com>
Date: Fri, 22 Mar 2019 07:51:42 +0000
Subject: [PATCH] drivers/net: fix possible overflow using strlcat

[ upstream commit faf8c3095ac649f3d893ee846e2aa7cf1b4ccf4d ]

strcat does not check the destination length and there might be
chances of string overflow so instead of strcat, strlcat is used.

Fixes: 540a211084a7 ("bnx2x: driver core")
Fixes: e163c18a15b0 ("net/i40e: update ptype and pctype info")

Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Shahed Shaikh <shshaikh at marvell.com>
---
 drivers/net/bnx2x/bnx2x.c      | 5 +++--
 drivers/net/i40e/i40e_ethdev.c | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 26b3828e8..ab092e23f 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -26,4 +26,5 @@
 #include <fcntl.h>
 #include <zlib.h>
+#include <rte_string_fns.h>
 
 #define BNX2X_PMD_VER_PREFIX "BNX2X PMD"
@@ -11742,5 +11743,5 @@ static const char *get_bnx2x_flags(uint32_t flags)
 	for (i = 0; i < 5; i++)
 		if (flags & (1 << i)) {
-			strcat(flag_str, flag[i]);
+			strlcat(flag_str, flag[i], sizeof(flag_str));
 			flags ^= (1 << i);
 		}
@@ -11748,5 +11749,5 @@ static const char *get_bnx2x_flags(uint32_t flags)
 		static char unknown[BNX2X_INFO_STR_MAX];
 		snprintf(unknown, 32, "Unknown flag mask %x", flags);
-		strcat(flag_str, unknown);
+		strlcat(flag_str, unknown, sizeof(flag_str));
 	}
 	return flag_str;
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 8191a6a73..63ec8136d 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -12203,6 +12203,6 @@ i40e_update_customized_pctype(struct rte_eth_dev *dev, uint8_t *pkg,
 				if (proto[n].proto_id != proto_id)
 					continue;
-				strcat(name, proto[n].name);
-				strcat(name, "_");
+				strlcat(name, proto[n].name, sizeof(name));
+				strlcat(name, "_", sizeof(name));
 				break;
 			}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-16 15:34:27.158407760 +0100
+++ 0044-drivers-net-fix-possible-overflow-using-strlcat.patch	2019-04-16 15:34:25.217179129 +0100
@@ -1,14 +1,15 @@
-From faf8c3095ac649f3d893ee846e2aa7cf1b4ccf4d Mon Sep 17 00:00:00 2001
+From 6ebf5b652d11d578f44b2258bc3414da9b03cf9b Mon Sep 17 00:00:00 2001
 From: Chaitanya Babu Talluri <tallurix.chaitanya.babu at intel.com>
 Date: Fri, 22 Mar 2019 07:51:42 +0000
 Subject: [PATCH] drivers/net: fix possible overflow using strlcat
 
+[ upstream commit faf8c3095ac649f3d893ee846e2aa7cf1b4ccf4d ]
+
 strcat does not check the destination length and there might be
 chances of string overflow so instead of strcat, strlcat is used.
 
 Fixes: 540a211084a7 ("bnx2x: driver core")
 Fixes: e163c18a15b0 ("net/i40e: update ptype and pctype info")
-Cc: stable at dpdk.org
 
 Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu at intel.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>