From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D96EE1B4FA for ; Fri, 23 Nov 2018 11:29:08 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E0AC7AE93; Fri, 23 Nov 2018 10:29:08 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 22C55413C; Fri, 23 Nov 2018 10:29:06 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: dpdk stable Date: Fri, 23 Nov 2018 10:26:21 +0000 Message-Id: <20181123102713.17309-17-ktraynor@redhat.com> In-Reply-To: <20181123102713.17309-1-ktraynor@redhat.com> References: <20181123102713.17309-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 23 Nov 2018 10:29:08 +0000 (UTC) Subject: [dpdk-stable] patch 'bus/dpaa: fix build with gcc 9.0' has been queued to stable release 18.08.1 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, 23 Nov 2018 10:29:09 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/29/18. 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. Kevin Traynor --- >>From dd595243159bfc6f50b7129c7d4aa0d8ee75eaed 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 bdb700423..06762e0f4 100644 --- a/drivers/bus/dpaa/base/fman/fman.c +++ b/drivers/bus/dpaa/base/fman/fman.c @@ -14,4 +14,5 @@ #include #include +#include #define QMI_PORT_REGS_OFFSET 0x400 @@ -184,5 +185,5 @@ 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'; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-23 10:22:54.680269571 +0000 +++ 0017-bus-dpaa-fix-build-with-gcc-9.0.patch 2018-11-23 10:22:54.000000000 +0000 @@ -1,4 +1,4 @@ -From 74f277101265ff3376c65270da2dcbc6d1325494 Mon Sep 17 00:00:00 2001 +From dd595243159bfc6f50b7129c7d4aa0d8ee75eaed 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 ---