commit 926f01261542e58c2783ee614072406ded5b5633
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Apr 23 04:41:20 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 23 04:41:20 2024 +0000
tree 31eeb067757a022b1606ae5d90e332695c458e69
parent 0168ae22f63ea3f8df4101329e8f33fb82c170d1
parent 89efcc36e7be4e446d0a39a31bc1891a64b2aed9

Merge "NetBpfLoad: prog names are only valid on 4.15+" into main

netbpfload/loader.cpp

diff --git a/netbpfload/loader.cpp b/netbpfload/loader.cpp
index f5e45d6..52428a3 100644
--- a/netbpfload/loader.cpp
+++ b/netbpfload/loader.cpp
@@ -1012,7 +1012,7 @@
               .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));