From: Andrii Nakryiko <and...@kernel.org>

[ Upstream commit 86ce322d21eb032ed8fdd294d0fb095d2debb430 ]

Fix bug in handling bpf_testmod unloading that will cause test_progs exiting
prematurely if bpf_testmod unloading failed. This is especially problematic
when running a subset of test_progs that doesn't require root permissions and
doesn't rely on bpf_testmod, yet will fail immediately due to exit(1) in
unload_bpf_testmod().

Fixes: 9f7fa225894c ("selftests/bpf: Add bpf_testmod kernel module for testing")
Signed-off-by: Andrii Nakryiko <and...@kernel.org>
Signed-off-by: Daniel Borkmann <dan...@iogearbox.net>
Link: https://lore.kernel.org/bpf/20210126065019.1268027-1-and...@kernel.org
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 tools/testing/selftests/bpf/test_progs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/test_progs.c 
b/tools/testing/selftests/bpf/test_progs.c
index 213628ee721c1..6396932b97e29 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -390,7 +390,7 @@ static void unload_bpf_testmod(void)
                        return;
                }
                fprintf(env.stderr, "Failed to unload bpf_testmod.ko from 
kernel: %d\n", -errno);
-               exit(1);
+               return;
        }
        if (env.verbosity > VERBOSE_NONE)
                fprintf(stdout, "Successfully unloaded bpf_testmod.ko.\n");
-- 
2.27.0



Reply via email to