netdev - [PATCH iproute2] iproute2: fixes to compile on some systems.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20171120035707.23563-1-lorenzo@google.com>
Date:   Mon, 20 Nov 2017 12:57:07 +0900
From:   Lorenzo Colitti <lorenzo@...gle.com>
To:     netdev@...r.kernel.org
Cc:     stephen@...workplumber.org, Lorenzo Colitti <lorenzo@...gle.com>
Subject: [PATCH iproute2] iproute2: fixes to compile on some systems.

1. Put the declarations of strlcpy and strlcat inside
   an #ifdef NEED_STRLCPY. Their declarations were already in a
   similar #ifdef.
2. In bpf_scm.h, include sys/un.h for struct sockaddr_un.
3. In utils.h, include time.h for struct timeval.

Tested: builds on ubuntu 14.04 with "make clean distclean; ./configure && make -j64"
Tested: 4.14.1 builds on Android with Android-specific #ifndefs for missing library code
Signed-off-by: Lorenzo Colitti <lorenzo@...gle.com>
---
 include/bpf_scm.h | 1 +
 include/utils.h   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/include/bpf_scm.h b/include/bpf_scm.h
index 35117d11ee..122d59fc43 100644
--- a/include/bpf_scm.h
+++ b/include/bpf_scm.h
@@ -3,6 +3,7 @@

 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/un.h>

 #include "utils.h"
 #include "bpf_elf.h"
diff --git a/include/utils.h b/include/utils.h
index 3d91c50db0..10749fbee1 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -6,6 +6,7 @@
 #include <resolv.h>
 #include <stdlib.h>
 #include <stdbool.h>
+#include <time.h>

 #include "libnetlink.h"
 #include "ll_map.h"
@@ -256,7 +257,9 @@ int make_path(const char *path, mode_t mode);
 char *find_cgroup2_mount(void);
 int get_command_name(const char *pid, char *comm, size_t len);

+#ifdef NEED_STRLCPY
 size_t strlcpy(char *dst, const char *src, size_t size);
 size_t strlcat(char *dst, const char *src, size_t size);
+#endif

 #endif /* __UTILS_H__ */
-- 
2.15.0.448.gf294e3d99a-goog