Follow @Openwall on Twitter for new release announcements and other news
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200402153335.38447-1-slava@bacher09.org>
Date: Thu,  2 Apr 2020 18:33:36 +0300
From: Slava Bacherikov <slava@...her09.org>
To: keescook@...omium.org
Cc: andriin@...com,
	bpf@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	jannh@...gle.com,
	alexei.starovoitov@...il.com,
	daniel@...earbox.net,
	kernel-hardening@...ts.openwall.com,
	liuyd.fnst@...fujitsu.com,
	kpsingh@...gle.com,
	Slava Bacherikov <slava@...her09.org>
Subject: [PATCH v4 bpf] kbuild: fix dependencies for DEBUG_INFO_BTF

Currently turning on DEBUG_INFO_SPLIT when DEBUG_INFO_BTF is also
enabled will produce invalid btf file, since gen_btf function in
link-vmlinux.sh script doesn't handle *.dwo files.

Enabling DEBUG_INFO_REDUCED will also produce invalid btf file, and
using GCC_PLUGIN_RANDSTRUCT with BTF makes no sense.

Signed-off-by: Slava Bacherikov <slava@...her09.org>
Reported-by: Jann Horn <jannh@...gle.com>
Reported-by: Liu Yiding <liuyd.fnst@...fujitsu.com>
Acked-by: KP Singh <kpsingh@...gle.com>
Acked-by: Andrii Nakryiko <andriin@...com>
Reviewed-by: Kees Cook <keescook@...omium.org>
Fixes: e83b9f55448a ("kbuild: add ability to generate BTF type info for vmlinux")
---
 lib/Kconfig.debug | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index f61d834e02fe..b94227be2d62 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -222,7 +222,9 @@ config DEBUG_INFO_DWARF4
 
 config DEBUG_INFO_BTF
 	bool "Generate BTF typeinfo"
-	depends on DEBUG_INFO
+	depends on DEBUG_INFO || COMPILE_TEST
+	depends on !DEBUG_INFO_SPLIT && !DEBUG_INFO_REDUCED
+	depends on !GCC_PLUGIN_RANDSTRUCT || COMPILE_TEST
 	help
 	  Generate deduplicated BTF type information from DWARF debug info.
 	  Turning this on expects presence of pahole tool, which will convert

Powered by blists - more mailing lists

Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.