summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2022-12-27 12:06:12 +0000
committerMaciej Żenczykowski <maze@google.com>2022-12-27 12:07:03 +0000
commite9361bb0bb370f2ec4e53b0ae540098b05f182a7 (patch)
treea111feef461f9b3a96e8b12bc4bd612f0a32fef3
parent4935df14b1716a2932ef1af8715188f0a72782ce (diff)
downloadnet-e9361bb0bb370f2ec4e53b0ae540098b05f182a7.tar.gz
Use the .o-wide bpfloader min/max ver for maps & programs too
This is basically a no-op, but will make future compatibility checks easier. The programs/maps already won't load on a bpfloader outside of this range, as the entire .o will be skipped. Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I0669c7ff9e04e24a8da68aa821c9ad705a8f5a93
-rw-r--r--common/native/bpf_headers/include/bpf/bpf_helpers.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/common/native/bpf_headers/include/bpf/bpf_helpers.h b/common/native/bpf_headers/include/bpf/bpf_helpers.h
index 4d487200..5b17a8ef 100644
--- a/common/native/bpf_headers/include/bpf/bpf_helpers.h
+++ b/common/native/bpf_headers/include/bpf/bpf_helpers.h
@@ -167,8 +167,8 @@ static void (*bpf_ringbuf_submit_unsafe)(const void* data, __u64 flags) = (void*
.uid = (usr), \
.gid = (grp), \
.mode = (md), \
- .bpfloader_min_ver = DEFAULT_BPFLOADER_MIN_VER, \
- .bpfloader_max_ver = DEFAULT_BPFLOADER_MAX_VER, \
+ .bpfloader_min_ver = BPFLOADER_MIN_VER, \
+ .bpfloader_max_ver = BPFLOADER_MAX_VER, \
.min_kver = (minkver), \
.max_kver = (maxkver), \
.selinux_context = (selinux), \
@@ -296,8 +296,8 @@ static long (*bpf_get_current_comm)(void* buf, uint32_t buf_size) = (void*) BPF_
.min_kver = (min_kv), \
.max_kver = (max_kv), \
.optional = (opt), \
- .bpfloader_min_ver = DEFAULT_BPFLOADER_MIN_VER, \
- .bpfloader_max_ver = DEFAULT_BPFLOADER_MAX_VER, \
+ .bpfloader_min_ver = BPFLOADER_MIN_VER, \
+ .bpfloader_max_ver = BPFLOADER_MAX_VER, \
.selinux_context = selinux, \
.pin_subdir = pindir, \
}; \