[dpdk-dev,v2,05/18] drivers/net/nfp/nfpcore: fix strncpy misuse

Message ID 152582947587.6809.10453223101431457646.stgit@localhost.localdomain (mailing list archive)
State Superseded, archived
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail apply issues

Commit Message

Andy Green May 9, 2018, 1:31 a.m. UTC
  Signed-off-by: Andy Green <andy@warmcat.com>
---
 drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
  

Comments

Alejandro Lucero May 9, 2018, 9:49 a.m. UTC | #1
On Wed, May 9, 2018 at 2:31 AM, Andy Green <andy@warmcat.com> wrote:

> Signed-off-by: Andy Green <andy@warmcat.com>
> ---
>  drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
> b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
> index 4e6c66624..52b294888 100644
> --- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
> +++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
> @@ -31,6 +31,8 @@
>  #include <sys/file.h>
>  #include <sys/stat.h>
>
> +#include <rte_string_fns.h>
> +
>  #include "nfp_cpp.h"
>  #include "nfp_target.h"
>  #include "nfp6000/nfp6000.h"
> @@ -846,7 +848,7 @@ nfp6000_init(struct nfp_cpp *cpp, const char *devname)
>
>
>         memset(desc->busdev, 0, BUSDEV_SZ);
> -       strncpy(desc->busdev, devname, strlen(devname));
> +       strlcpy(desc->busdev, devname, sizeof(desc->busdev));
>
>         ret = nfp_acquire_process_lock(desc);
>         if (ret)
>
>
Acked-by: Alejandro Lucero <alejandro.lucero@netronome.com>
Tested-by: Alejandro Lucero <alejandro.lucero@netronome.com>
  

Patch

diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
index 4e6c66624..52b294888 100644
--- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
+++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
@@ -31,6 +31,8 @@ 
 #include <sys/file.h>
 #include <sys/stat.h>
 
+#include <rte_string_fns.h>
+
 #include "nfp_cpp.h"
 #include "nfp_target.h"
 #include "nfp6000/nfp6000.h"
@@ -846,7 +848,7 @@  nfp6000_init(struct nfp_cpp *cpp, const char *devname)
 
 
 	memset(desc->busdev, 0, BUSDEV_SZ);
-	strncpy(desc->busdev, devname, strlen(devname));
+	strlcpy(desc->busdev, devname, sizeof(desc->busdev));
 
 	ret = nfp_acquire_process_lock(desc);
 	if (ret)