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 9B2431B94E for ; Fri, 11 Jan 2019 11:32:08 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 11 Jan 2019 12:32:03 +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 x0BAVjcY018586; Fri, 11 Jan 2019 12:32:02 +0200 From: Yongseok Koh To: Ferruh Yigit Cc: dpdk stable Date: Fri, 11 Jan 2019 02:31:33 -0800 Message-Id: <20190111103142.21088-10-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190111103142.21088-1-yskoh@mellanox.com> References: <20190111103142.21088-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/dpaa: fix build with gcc 9.0' 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: Fri, 11 Jan 2019 10:32:09 -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/13/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 ea44f4c81017449bbc9cfec7eb0e94387a789750 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 2 Nov 2018 19:06:05 +0000 Subject: [PATCH] bus/dpaa: fix build with gcc 9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 74f277101265ff3376c65270da2dcbc6d1325494 ] build error: In function ‘fman_if_init’, .../drivers/bus/dpaa/base/fman/fman.c:186:2: error: ‘strncpy’ output may be truncated copying 4095 bytes from a string of length 4095 [-Werror=stringop-truncation] strncpy(__if->node_path, dpa_node->full_name, PATH_MAX - 1); strncpy may result a not null-terminated string, replaced it with strlcpy Fixes: 5b22cf744689 ("bus/dpaa: introducing FMan configurations") Signed-off-by: Ferruh Yigit --- drivers/bus/dpaa/base/fman/fman.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c index a9c88ddcb..4403ff5de 100644 --- a/drivers/bus/dpaa/base/fman/fman.c +++ b/drivers/bus/dpaa/base/fman/fman.c @@ -46,6 +46,7 @@ #include #include #include +#include #define QMI_PORT_REGS_OFFSET 0x400 @@ -216,7 +217,7 @@ fman_if_init(const struct device_node *dpa_node) } memset(__if, 0, sizeof(*__if)); INIT_LIST_HEAD(&__if->__if.bpool_list); - strncpy(__if->node_path, dpa_node->full_name, PATH_MAX - 1); + strlcpy(__if->node_path, dpa_node->full_name, PATH_MAX - 1); __if->node_path[PATH_MAX - 1] = '\0'; /* Obtain the MAC node used by this interface except macless */ -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-11 02:29:11.432076253 -0800 +++ 0010-bus-dpaa-fix-build-with-gcc-9.0.patch 2019-01-11 02:29:10.747974000 -0800 @@ -1,4 +1,4 @@ -From 74f277101265ff3376c65270da2dcbc6d1325494 Mon Sep 17 00:00:00 2001 +From ea44f4c81017449bbc9cfec7eb0e94387a789750 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 2 Nov 2018 19:06:05 +0000 Subject: [PATCH] bus/dpaa: fix build with gcc 9.0 @@ -6,6 +6,8 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +[ upstream commit 74f277101265ff3376c65270da2dcbc6d1325494 ] + build error: In function ‘fman_if_init’, .../drivers/bus/dpaa/base/fman/fman.c:186:2: @@ -17,7 +19,6 @@ replaced it with strlcpy Fixes: 5b22cf744689 ("bus/dpaa: introducing FMan configurations") -Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit --- @@ -25,10 +26,10 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c -index bdb700423..06762e0f4 100644 +index a9c88ddcb..4403ff5de 100644 --- a/drivers/bus/dpaa/base/fman/fman.c +++ b/drivers/bus/dpaa/base/fman/fman.c -@@ -13,6 +13,7 @@ +@@ -46,6 +46,7 @@ #include #include #include @@ -36,7 +37,7 @@ #define QMI_PORT_REGS_OFFSET 0x400 -@@ -183,7 +184,7 @@ fman_if_init(const struct device_node *dpa_node) +@@ -216,7 +217,7 @@ fman_if_init(const struct device_node *dpa_node) } memset(__if, 0, sizeof(*__if)); INIT_LIST_HEAD(&__if->__if.bpool_list);