From d44be8ed94e99388516a2d4fb2c3a313e36af232 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Mon, 11 Dec 2023 22:23:42 -0300 Subject: landlock: use uint32_t instead of __u32 in firejail.h The build on Alpine fails due to `__u32` not being defined. It seems that musl itself does not define it, so linux/types.h would have to be included (for example, by including linux/landlock.h). Error from `build_src_package`[1]: make -C src/firejail/ make[1]: Entering directory '/builds/Firejail/firejail_ci/src/firejail' gcc [...] -DMOD_DIR='"src/firejail"' [...] -c appimage.c -o appimage.o In file included from appimage.c:23: firejail.h:977:17: error: unknown type name '__u32' 977 | int ll_restrict(__u32 flags); | ^~~~~ make[1]: Leaving directory '/builds/Firejail/firejail_ci/src/firejail' make[1]: *** [../../src/prog.mk:16: appimage.o] Error 1 make: *** [Makefile:58: src/firejail/firejail] Error 2 This amends commit 13b2c566d ("feature: add Landlock support", 2023-10-24) / PR #6078. [1] https://gitlab.com/Firejail/firejail_ci/-/jobs/5729692038 --- src/firejail/firejail.h | 2 +- src/firejail/landlock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index 613fafe72..d0b903fb4 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h @@ -974,7 +974,7 @@ int ll_write(const char *allowed_path); int ll_special(const char *allowed_path); int ll_exec(const char *allowed_path); int ll_basic_system(void); -int ll_restrict(__u32 flags); +int ll_restrict(uint32_t flags); void ll_add_profile(int type, const char *data); #endif /* HAVE_LANDLOCK */ diff --git a/src/firejail/landlock.c b/src/firejail/landlock.c index 054d31ee4..9cf5ec165 100644 --- a/src/firejail/landlock.c +++ b/src/firejail/landlock.c @@ -244,7 +244,7 @@ int ll_basic_system(void) { return error; } -int ll_restrict(__u32 flags) { +int ll_restrict(uint32_t flags) { if (!ll_is_supported()) return 0; -- cgit v1.2.3-70-g09d2