From 89efcc36e7be4e446d0a39a31bc1891a64b2aed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 23 Apr 2024 03:14:00 +0000 Subject: [PATCH] NetBpfLoad: prog names are only valid on 4.15+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The following commit is only in 4.15: commit cb4d2b3f03d8eed90be3a194e5b54b734ec4bbe9 Author: Martin KaFai Lau Date: Wed Sep 27 14:37:52 2017 -0700 bpf: Add name, load_time, uid and map_ids to bpf_prog_info $ git describe cb4d2b3f03d8eed90be3a194e5b54b734ec4bbe9 v4.14-rc1-661-gcb4d2b3f03d8 Bug: 335390828 Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: I246a7a8640bea1e939f12f3ffd3fedc25a0a6422 --- netbpfload/loader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbpfload/loader.cpp b/netbpfload/loader.cpp index f5e45d6684..52428a3776 100644 --- a/netbpfload/loader.cpp +++ b/netbpfload/loader.cpp @@ -1012,7 +1012,7 @@ static int loadCodeSections(const char* elfPath, vector& cs, const .log_size = static_cast<__u32>(log_buf.size()), .expected_attach_type = cs[i].expected_attach_type, }; - if (isAtLeastKernelVersion(4, 14, 0)) + if (isAtLeastKernelVersion(4, 15, 0)) strlcpy(req.prog_name, cs[i].name.c_str(), sizeof(req.prog_name)); fd.reset(bpf(BPF_PROG_LOAD, req));