From e445d25af763adb749a0ead179fb936e431bf434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 20 May 2025 08:44:56 -0700 Subject: [PATCH] NetBpfLoad: abort() on ignore_on_* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit should be unused Test: TreeHugger Flag: EXEMPT dead code Signed-off-by: Maciej Żenczykowski Change-Id: Ice72d940dd3492d2b9e14dd32390a49f87bd54d1 --- bpf/loader/NetBpfLoad.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index d910da2ccd..d61beb6062 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -909,7 +909,7 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector& ALOGD("skipping map %s which is ignored on %s builds", mapNames[i].c_str(), getBuildType().c_str()); mapFds.push_back(unique_fd()); - continue; + abort(); } if ((isArm() && isKernel32Bit() && md[i].ignore_on_arm32) || @@ -920,7 +920,7 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector& ALOGD("skipping map %s which is ignored on %s", mapNames[i].c_str(), describeArch()); mapFds.push_back(unique_fd()); - continue; + abort(); } enum bpf_map_type type = md[i].type; @@ -1180,7 +1180,7 @@ static int loadCodeSections(const char* elfPath, vector& cs, const (cs[i].prog_def->ignore_on_userdebug && isUserdebug())) { ALOGD("cs[%d].name:%s is ignored on %s builds", i, name.c_str(), getBuildType().c_str()); - continue; + abort(); } if ((isArm() && isKernel32Bit() && cs[i].prog_def->ignore_on_arm32) || @@ -1189,7 +1189,7 @@ static int loadCodeSections(const char* elfPath, vector& cs, const (isX86() && isKernel64Bit() && cs[i].prog_def->ignore_on_x86_64) || (isRiscV() && cs[i].prog_def->ignore_on_riscv64)) { ALOGD("cs[%d].name:%s is ignored on %s", i, name.c_str(), describeArch()); - continue; + abort(); } if (specified(selinux_context)) {