odhcp6c: fix build with gcc 8
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Wed, 16 Jan 2019 19:29:10 +0000 (20:29 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Sat, 19 Jan 2019 22:14:28 +0000 (23:14 +0100)
Retrieve and backport upstream patch to fix build with gcc 8

Fixes:
 - http://autobuild.buildroot.org/results/1c6f0d1f2fcd3474af81b3851d875f834a3a0a4f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/odhcp6c/0001-dhcpv6-fix-strncpy-bounds.patch [new file with mode: 0644]

diff --git a/package/odhcp6c/0001-dhcpv6-fix-strncpy-bounds.patch b/package/odhcp6c/0001-dhcpv6-fix-strncpy-bounds.patch
new file mode 100644 (file)
index 0000000..abf5191
--- /dev/null
@@ -0,0 +1,28 @@
+From 327f73dd7093d04c2dbea13ee30fc3dfafc5e944 Mon Sep 17 00:00:00 2001
+From: Hans Dedecker <dedeckeh@gmail.com>
+Date: Sat, 21 Apr 2018 13:40:29 +0200
+Subject: [PATCH] dhcpv6: fix strncpy bounds
+
+Fixes dhcpv6.c:138:2: error: 'strncpy' specified bound 16 equals destination size [-Werror=stringop-truncation]                                                                                                        strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
+[Retrieved (and backported) from:
+https://github.com/openwrt/odhcp6c/commit/327f73dd7093d04c2dbea13ee30fc3dfafc5e944]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ src/dhcpv6.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dhcpv6.c b/src/dhcpv6.c
+index 0b3585c..d70d533 100644
+--- a/src/dhcpv6.c
++++ b/src/dhcpv6.c
+@@ -135,7 +135,7 @@ int init_dhcpv6(const char *ifname, unsigned int options, int sol_timeout)
+       // Detect interface
+       struct ifreq ifr;
+-      strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
++      strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1);
+       if (ioctl(sock, SIOCGIFINDEX, &ifr) < 0)
+               return -1;