From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 3DAD91B129 for ; Thu, 3 Jan 2019 09:14:47 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 3 Jan 2019 10:14:44 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x038EJfg008603; Thu, 3 Jan 2019 10:14:42 +0200 From: Yongseok Koh To: Andy Green Cc: Ferruh Yigit , dpdk stable Date: Thu, 3 Jan 2019 00:13:36 -0800 Message-Id: <20190103081400.14191-13-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190103081400.14191-1-yskoh@mellanox.com> References: <20190103081400.14191-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/qede: fix strncpy' has been queued to LTS release 17.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jan 2019 08:14:47 -0000 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 d0849a4b0f21e280a77952657ce9e9b29356e632 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Mon, 14 May 2018 13:00:42 +0800 Subject: [PATCH] net/qede: fix strncpy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit f28742ba06a83a0bb8f658e12105e975ab7b26d7 ] drivers/net/qede/qede_main.c: In function ‘qed_slowpath_start’: drivers/net/qede/qede_main.c:307:3: error: ‘strncpy’ output may be truncated copying 12 bytes from a string of length 127 [-Werror=stringop-truncation] strncpy((char *)drv_version.name, (const char *)params->name, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MCP_DRV_VER_STR_SIZE - 4); ~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: 86a2265e59d7 ("qede: add SRIOV support") Signed-off-by: Andy Green Reviewed-by: Ferruh Yigit --- drivers/net/qede/qede_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c index 95b4cd91b..107f074a9 100644 --- a/drivers/net/qede/qede_main.c +++ b/drivers/net/qede/qede_main.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "qede_ethdev.h" @@ -302,9 +303,8 @@ static int qed_slowpath_start(struct ecore_dev *edev, drv_version.version = (params->drv_major << 24) | (params->drv_minor << 16) | (params->drv_rev << 8) | (params->drv_eng); - /* TBD: strlcpy() */ - strncpy((char *)drv_version.name, (const char *)params->name, - MCP_DRV_VER_STR_SIZE - 4); + strlcpy((char *)drv_version.name, (const char *)params->name, + sizeof(drv_version.name)); rc = ecore_mcp_send_drv_version(hwfn, hwfn->p_main_ptt, &drv_version); if (rc) { -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-02 23:59:12.795178295 -0800 +++ 0013-net-qede-fix-strncpy.patch 2019-01-02 23:59:12.048815000 -0800 @@ -1,4 +1,4 @@ -From f28742ba06a83a0bb8f658e12105e975ab7b26d7 Mon Sep 17 00:00:00 2001 +From d0849a4b0f21e280a77952657ce9e9b29356e632 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Mon, 14 May 2018 13:00:42 +0800 Subject: [PATCH] net/qede: fix strncpy @@ -6,6 +6,8 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +[ upstream commit f28742ba06a83a0bb8f658e12105e975ab7b26d7 ] + drivers/net/qede/qede_main.c: In function ‘qed_slowpath_start’: drivers/net/qede/qede_main.c:307:3: error: ‘strncpy’ output may be truncated copying 12 bytes from a string of length 127 @@ -16,7 +18,6 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: 86a2265e59d7 ("qede: add SRIOV support") -Cc: stable@dpdk.org Signed-off-by: Andy Green Reviewed-by: Ferruh Yigit @@ -25,7 +26,7 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c -index 2333ca073..ee63ac22b 100644 +index 95b4cd91b..107f074a9 100644 --- a/drivers/net/qede/qede_main.c +++ b/drivers/net/qede/qede_main.c @@ -9,6 +9,7 @@ @@ -36,7 +37,7 @@ #include "qede_ethdev.h" -@@ -303,9 +304,8 @@ static int qed_slowpath_start(struct ecore_dev *edev, +@@ -302,9 +303,8 @@ static int qed_slowpath_start(struct ecore_dev *edev, drv_version.version = (params->drv_major << 24) | (params->drv_minor << 16) | (params->drv_rev << 8) | (params->drv_eng);