From cb19e1b21eb31e2d46dba9281057da794c03db7a Mon Sep 17 00:00:00 2001 From: Yu-Ting Tseng Date: Tue, 10 Dec 2024 14:55:04 -0800 Subject: [PATCH] Only run uprobestatsbpfload if available Bug: 382190229 Change-Id: I34c5d700bc31239a04cd9fb8c3a820ec72008c51 Test: TH --- bpf/loader/NetBpfLoad.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index 4834b09ab5..d27eb2f843 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -1658,17 +1658,17 @@ static int doLoad(char** argv, char * const envp[]) { } // unreachable before U QPR3 - { + if (exists(uprobestatsBpfLoader)) { ALOGI("done, transferring control to uprobestatsbpfload."); const char *args[] = { uprobestatsBpfLoader, NULL, }; execve(args[0], (char **)args, envp); + ALOGI("unable to execute uprobestatsbpfload, transferring control to " + "platform bpfloader."); } - ALOGI("unable to execute uprobestatsbpfload, transferring control to " - "platform bpfloader."); // platform BpfLoader *needs* to run as root const char * args[] = { platformBpfLoader, NULL, }; execve(args[0], (char**)args, envp);