From: Yongseok Koh <yskoh@mellanox.com>
To: Ferruh Yigit <ferruh.yigit@intel.com>
Cc: dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'bus/dpaa: fix build with gcc 9.0' has been queued to LTS release 17.11.5
Date: Fri, 11 Jan 2019 02:31:33 -0800 [thread overview]
Message-ID: <20190111103142.21088-10-yskoh@mellanox.com> (raw)
In-Reply-To: <20190111103142.21088-1-yskoh@mellanox.com>
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 <ferruh.yigit@intel.com>
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 <ferruh.yigit@intel.com>
---
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 <fman.h>
#include <of.h>
#include <rte_dpaa_logs.h>
+#include <rte_string_fns.h>
#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 <ferruh.yigit@intel.com>
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 <ferruh.yigit@intel.com>
---
@@ -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 <fman.h>
#include <of.h>
#include <rte_dpaa_logs.h>
@@ -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);
next prev parent reply other threads:[~2019-01-11 10:32 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-11 10:31 [dpdk-stable] patch 'net/octeontx: fix packet corruption on Tx' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'doc: fix style and syntax in flow API guide' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/mvpp2: fix array initialization' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/mlx5: fix interrupt completion queue index wrapping' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'doc: fix missing CCM to QAT feature list' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'app/testpmd: check Rx VLAN offload flag to print VLAN TCI' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'doc: fix typos in the flow API guide' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'app/testpmd: fix metering and policing commands' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/virtio: fix PCI config error handling' " Yongseok Koh
2019-01-11 10:31 ` Yongseok Koh [this message]
2019-01-11 10:31 ` [dpdk-stable] patch 'app/testpmd: fix RED byte stats' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'examples/flow_filtering: remove VLAN item' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/virtio: fix unchecked return value' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/octeontx: fix mbuf corruption with large private sizes' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'app/testpmd: fix memory leak for TM object' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/octeontx: fix failures when available ports > queues' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'app/pdump: fix port id storage size' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'doc: add cross-compilation in sample apps guide' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/mlx4: fix possible uninitialized variable' " Yongseok Koh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190111103142.21088-10-yskoh@mellanox.com \
--to=yskoh@mellanox.com \
--cc=ferruh.yigit@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).