[dpdk-stable] patch 'net/qede: replace strncpy by strlcpy' has been queued to LTS release 17.11.5

Yongseok Koh yskoh at mellanox.com
Thu Jan 3 09:13:35 CET 2019


Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/04/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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 9518fb165c32383debb867c850ea1ee7fdc8adbf Mon Sep 17 00:00:00 2001
From: Andy Green <andy at warmcat.com>
Date: Mon, 14 May 2018 13:00:37 +0800
Subject: [PATCH] net/qede: replace strncpy by strlcpy

[ upstream commit 0fa4f3eeefb3e76124f5bbc1fccedcf43f4503f3 ]

Fixes: 8427c6647964 ("net/qede/base: add attention formatting string")

Signed-off-by: Andy Green <andy at warmcat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/qede/base/ecore_int.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/qede/base/ecore_int.c b/drivers/net/qede/base/ecore_int.c
index b2582aacd..367fe5ee8 100644
--- a/drivers/net/qede/base/ecore_int.c
+++ b/drivers/net/qede/base/ecore_int.c
@@ -6,6 +6,8 @@
  * See LICENSE.qede_pmd for copyright and licensing details.
  */
 
+#include <rte_string_fns.h>
+
 #include "bcm_osal.h"
 #include "ecore.h"
 #include "ecore_spq.h"
@@ -1108,9 +1110,9 @@ static enum _ecore_status_t ecore_int_deassertion(struct ecore_hwfn *p_hwfn,
 							      p_aeu->bit_name,
 							      num);
 					else
-						OSAL_STRNCPY(bit_name,
-							     p_aeu->bit_name,
-							     30);
+						strlcpy(bit_name,
+							p_aeu->bit_name,
+							sizeof(bit_name));
 
 					/* We now need to pass bitmask in its
 					 * correct position.
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-02 23:59:12.747294497 -0800
+++ 0012-net-qede-replace-strncpy-by-strlcpy.patch	2019-01-02 23:59:12.045815000 -0800
@@ -1,10 +1,11 @@
-From 0fa4f3eeefb3e76124f5bbc1fccedcf43f4503f3 Mon Sep 17 00:00:00 2001
+From 9518fb165c32383debb867c850ea1ee7fdc8adbf Mon Sep 17 00:00:00 2001
 From: Andy Green <andy at warmcat.com>
 Date: Mon, 14 May 2018 13:00:37 +0800
 Subject: [PATCH] net/qede: replace strncpy by strlcpy
 
+[ upstream commit 0fa4f3eeefb3e76124f5bbc1fccedcf43f4503f3 ]
+
 Fixes: 8427c6647964 ("net/qede/base: add attention formatting string")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andy Green <andy at warmcat.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
@@ -13,7 +14,7 @@
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/qede/base/ecore_int.c b/drivers/net/qede/base/ecore_int.c
-index f43781ba4..d9e22b5ed 100644
+index b2582aacd..367fe5ee8 100644
 --- a/drivers/net/qede/base/ecore_int.c
 +++ b/drivers/net/qede/base/ecore_int.c
 @@ -6,6 +6,8 @@
@@ -25,7 +26,7 @@
  #include "bcm_osal.h"
  #include "ecore.h"
  #include "ecore_spq.h"
-@@ -1104,9 +1106,9 @@ static enum _ecore_status_t ecore_int_deassertion(struct ecore_hwfn *p_hwfn,
+@@ -1108,9 +1110,9 @@ static enum _ecore_status_t ecore_int_deassertion(struct ecore_hwfn *p_hwfn,
  							      p_aeu->bit_name,
  							      num);
  					else


More information about the stable mailing list