aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-12-11 22:23:42 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-12-11 22:31:21 -0300
commitd44be8ed94e99388516a2d4fb2c3a313e36af232 (patch)
treeecfe37e9824b7f3822c7ddd59cce8781a89917e8 /src
parentlandlock: improve logs for debugging (diff)
downloadfirejail-d44be8ed94e99388516a2d4fb2c3a313e36af232.tar.gz
firejail-d44be8ed94e99388516a2d4fb2c3a313e36af232.tar.zst
firejail-d44be8ed94e99388516a2d4fb2c3a313e36af232.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/firejail/firejail.h2
-rw-r--r--src/firejail/landlock.c2
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);
974int ll_special(const char *allowed_path); 974int ll_special(const char *allowed_path);
975int ll_exec(const char *allowed_path); 975int ll_exec(const char *allowed_path);
976int ll_basic_system(void); 976int ll_basic_system(void);
977int ll_restrict(__u32 flags); 977int ll_restrict(uint32_t flags);
978void ll_add_profile(int type, const char *data); 978void ll_add_profile(int type, const char *data);
979#endif /* HAVE_LANDLOCK */ 979#endif /* HAVE_LANDLOCK */
980 980
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) {
244 return error; 244 return error;
245} 245}
246 246
247int ll_restrict(__u32 flags) { 247int ll_restrict(uint32_t flags) {
248 if (!ll_is_supported()) 248 if (!ll_is_supported())
249 return 0; 249 return 0;
250 250