root/xz
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2025-11-04 07:22:55 +00:00
Code Issues Releases Wiki Activity

xzdec: Support Landlock ABI version 4

Browse Source 
This was added to xz in 02e3505991233901575b7eabc06b2c6c62a96899
but I forgot to do the same in xzdec.

The Landlock sandbox in xzdec could be stricter as now it's
active only for the last file being decompressed. In xz,
read-only sandbox is used for multi-file case. On the other hand,
xz doesn't go to the strictest mode when processing the last file
when more than one file was specified; xzdec does.

(cherry picked from commit 3334c71d3d4294a4f6569df3ba9bcf2443dfa501)
This commit is contained in:
Lasse Collin 2024-04-19 12:11:09 +03:00
parent bfe9be7a46
commit f99e7c69ad
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/xzdec/xzdec.c
View File

@ -28,6 +28,11 @@
# include <linux/landlock.h> # include <linux/landlock.h>
# include <sys/prctl.h> # include <sys/prctl.h>
# include <sys/syscall.h> # include <sys/syscall.h>
# ifdef LANDLOCK_ACCESS_NET_BIND_TCP
# define LANDLOCK_ABI_MAX 4
# else
# define LANDLOCK_ABI_MAX 3
# endif
#endif #endif
#if defined(HAVE_CAP_RIGHTS_LIMIT) || defined(HAVE_PLEDGE) \ #if defined(HAVE_CAP_RIGHTS_LIMIT) || defined(HAVE_PLEDGE) \
@ -333,12 +338,17 @@ sandbox_enter(int src_fd)
(void *)NULL, 0, LANDLOCK_CREATE_RULESET_VERSION); (void *)NULL, 0, LANDLOCK_CREATE_RULESET_VERSION);
if (landlock_abi > 0) { if (landlock_abi > 0) {
// We support ABI versions 1-3. if (landlock_abi > LANDLOCK_ABI_MAX)
if (landlock_abi > 3) landlock_abi = LANDLOCK_ABI_MAX;
landlock_abi = 3;
const struct landlock_ruleset_attr attr = { const struct landlock_ruleset_attr attr = {
.handled_access_fs = (1ULL << (12 + landlock_abi)) - 1 .handled_access_fs = (1ULL
<< (12 + my_min(3, landlock_abi))) - 1,
# if LANDLOCK_ABI_MAX >= 4
.handled_access_net = landlock_abi < 4 ? 0 :
(LANDLOCK_ACCESS_NET_BIND_TCP
| LANDLOCK_ACCESS_NET_CONNECT_TCP),
# endif
}; };
const int ruleset_fd = syscall(SYS_landlock_create_ruleset, const int ruleset_fd = syscall(SYS_landlock_create_ruleset,