44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From 950cffc0366981d4e41b08f007b37bd6af931f25 Mon Sep 17 00:00:00 2001
|
|
From: Jesus Sanchez-Palencia <jesussanp@google.com>
|
|
Date: Wed, 8 Mar 2023 16:48:36 -0800
|
|
Subject: [PATCH] libbpf: Revert poisoning of strlcpy
|
|
|
|
This reverts commit 6d0c4b11e743("libbpf: Poison strlcpy()").
|
|
|
|
It added the pragma poison directive to libbpf_internal.h to protect
|
|
against accidental usage of strlcpy but ended up breaking the build for
|
|
toolchains based on libcs which provide the strlcpy() declaration from
|
|
string.h (e.g. uClibc-ng). The include order which causes the issue is:
|
|
|
|
string.h,
|
|
from Iibbpf_common.h:12,
|
|
from libbpf.h:20,
|
|
from libbpf_internal.h:26,
|
|
from strset.c:9:
|
|
|
|
Fixes: 6d0c4b11e743 ("libbpf: Poison strlcpy()")
|
|
Signed-off-by: Jesus Sanchez-Palencia <jesussanp@google.com>
|
|
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
|
|
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
|
|
Link: https://lore.kernel.org/bpf/20230309004836.2808610-1-jesussanp@google.com
|
|
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
|
|
---
|
|
src/libbpf_internal.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/libbpf_internal.h b/src/libbpf_internal.h
|
|
index fbaf68335..e4d05662a 100644
|
|
--- a/src/cc/libbpf/src/libbpf_internal.h
|
|
+++ b/src/cc/libbpf/src/libbpf_internal.h
|
|
@@ -20,8 +20,8 @@
|
|
/* make sure libbpf doesn't use kernel-only integer typedefs */
|
|
#pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64
|
|
|
|
-/* prevent accidental re-addition of reallocarray()/strlcpy() */
|
|
-#pragma GCC poison reallocarray strlcpy
|
|
+/* prevent accidental re-addition of reallocarray() */
|
|
+#pragma GCC poison reallocarray
|
|
|
|
#include "libbpf.h"
|
|
#include "btf.h"
|