landlock network coverage support
v3 cover landlock network coverage support
This testing suite is meant to test the landlock network support. The landlock fallback had to be modified in order to support ABI v4 which changed the landlock rules structures. Also, a new test has been added in landlock08, testing bind() and connect() syscalls support. A few error checks have been added in the landlock02 test.
---
Changes in v3:
- remove some unused autoconf rules
- use _abi1 struct for landlock01
- better ENVAL handling in landlock01
- cleanup landlock02
- handle both abi1 and abi4 in landlock02
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- check for LANDLOCK_RULE_NET_PORT symbol via autoconf
- split landlock_ruleset_attr for abi1 and abi4
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Andrea Cervesato (4):
Fallback landlock network support
Network helpers in landlock suite common functions Add landlock08 test
Add error coverage for landlock network support
configure.ac | 5 +- include/lapi/capability.h | 4 + include/lapi/landlock.h | 28 +-- runtest/syscalls | 1 + testcases/kernel/syscalls/landlock/.gitignore | 1 + testcases/kernel/syscalls/landlock/landlock01.c | 15 +- testcases/kernel/syscalls/landlock/landlock02.c | 93 ++++++--- testcases/kernel/syscalls/landlock/landlock03.c | 6 +- testcases/kernel/syscalls/landlock/landlock04.c | 6 +- testcases/kernel/syscalls/landlock/landlock05.c | 10 +- testcases/kernel/syscalls/landlock/landlock06.c | 14 +- testcases/kernel/syscalls/landlock/landlock07.c | 6 +- testcases/kernel/syscalls/landlock/landlock08.c | 209 +++++++++++++++++++++ .../kernel/syscalls/landlock/landlock_common.h | 134 ++++++++++++- 14 files changed, 455 insertions(+), 77 deletions(-)
---
base-commit: 6408294d83682635393e36c14bbd6ebd94fead94
change-id: 20240916-landlock_network-b4bb45fde72b
Best regards,
Signature · 5 lines
Andrea Cervesato <[email protected]> -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 1/4 Fallback landlock network support
From: Andrea Cervesato <[email protected]>
Landlock network support has been added in the ABI v4, adding features for bind() and connect() syscalls. It also defined one more member in the landlock_ruleset_attr struct, breaking our LTP fallbacks, used to build landlock testing suite. For this reason, we introduce tst_landlock_ruleset_attr_abi[14] struct(s) which fallback ABI v1 and v4 ruleset_attr definitions.
--- configure.ac | 5 ++-- include/lapi/capability.h | 4 ++++ include/lapi/landlock.h | 28 ++++++++++++---------- testcases/kernel/syscalls/landlock/landlock01.c | 15 ++++-------- testcases/kernel/syscalls/landlock/landlock02.c | 8 +++---- testcases/kernel/syscalls/landlock/landlock03.c | 6 ++--- testcases/kernel/syscalls/landlock/landlock04.c | 6 ++--- testcases/kernel/syscalls/landlock/landlock05.c | 10 ++++---- testcases/kernel/syscalls/landlock/landlock06.c | 14 ++++------- testcases/kernel/syscalls/landlock/landlock07.c | 6 ++--- .../kernel/syscalls/landlock/landlock_common.h | 12 ++++------ 11 files changed, 53 insertions(+), 61 deletions(-)
configure.ac +2 -3
@@ -34,6 +34,8 @@ m4_ifndef([PKG_CHECK_EXISTS], AC_PREFIX_DEFAULT(/opt/ltp) AC_CHECK_DECLS([IFLA_NET_NS_PID],,,[#include <linux/if_link.h>]) +AC_CHECK_DECLS([LANDLOCK_RULE_PATH_BENEATH],,,[#include <linux/landlock.h>]) +AC_CHECK_DECLS([LANDLOCK_RULE_NET_PORT],,,[#include <linux/landlock.h>]) AC_CHECK_DECLS([MADV_MERGEABLE],,,[#include <sys/mman.h>]) AC_CHECK_DECLS([NFTA_CHAIN_ID, NFTA_VERDICT_CHAIN_ID],,,[#include <linux/netfilter/nf_tables.h>]) AC_CHECK_DECLS([PR_CAPBSET_DROP, PR_CAPBSET_READ],,,[#include <sys/prctl.h>])
@@ -158,7 +160,6 @@ AC_CHECK_FUNCS_ONCE([ \ AC_CHECK_FUNCS(mkdtemp,[],AC_MSG_ERROR(mkdtemp() not found!)) AC_CHECK_MEMBERS([struct fanotify_event_info_fid.fsid.__val],,,[#include <sys/fanotify.h>]) -AC_CHECK_MEMBERS([struct landlock_ruleset_attr.handled_access_net],,,[#include <linux/landlock.h>]) AC_CHECK_MEMBERS([struct perf_event_mmap_page.aux_head],,,[#include <linux/perf_event.h>]) AC_CHECK_MEMBERS([struct sigaction.sa_sigaction],[],[],[#include <signal.h>]) AC_CHECK_MEMBERS([struct statx.stx_mnt_id, struct statx.stx_dio_mem_align],,,[
@@ -172,7 +173,6 @@ AC_CHECK_MEMBERS([struct utsname.domainname],,,[ ]) AC_CHECK_TYPES([enum kcmp_type],,,[#include <linux/kcmp.h>]) -AC_CHECK_TYPES([enum landlock_rule_type],,,[#include <linux/landlock.h>]) AC_CHECK_TYPES([struct acct_v3],,,[#include <sys/acct.h>]) AC_CHECK_TYPES([struct af_alg_iv, struct sockaddr_alg],,,[# include <linux/if_alg.h>]) AC_CHECK_TYPES([struct fanotify_event_info_fid, struct fanotify_event_info_error,
@@ -194,7 +194,6 @@ AC_CHECK_TYPES([struct if_nextdqblk],,,[#include <linux/quota.h>]) AC_CHECK_TYPES([struct iovec],,,[#include <sys/uio.h>]) AC_CHECK_TYPES([struct ipc64_perm],,,[#include <sys/ipcbuf.h>]) AC_CHECK_TYPES([struct loop_config],,,[#include <linux/loop.h>]) -AC_CHECK_TYPES([struct landlock_ruleset_attr],,,[#include <linux/landlock.h>]) AC_CHECK_TYPES([struct landlock_path_beneath_attr],,,[#include <linux/landlock.h>]) AC_CHECK_TYPES([struct landlock_net_port_attr],,,[#include <linux/landlock.h>])
include/lapi/capability.h +4 -0
@@ -20,6 +20,10 @@# endif #endif +#ifndef CAP_NET_BIND_SERVICE +# define CAP_NET_BIND_SERVICE 10 +#endif +#ifndef CAP_NET_RAW # define CAP_NET_RAW 13#endif
include/lapi/landlock.h +15 -13
@@ -7,6 +7,7 @@#define LAPI_LANDLOCK_H__ #include "config.h" +#include <stdint.h> #ifdef HAVE_LINUX_LANDLOCK_H # include <linux/landlock.h>
@@ -14,13 +15,16 @@#include "lapi/syscalls.h" -#ifndef HAVE_STRUCT_LANDLOCK_RULESET_ATTR -struct landlock_ruleset_attr +struct tst_landlock_ruleset_attr_abi1 +{ +uint64_t handled_access_fs; +}; + +struct tst_landlock_ruleset_attr_abi4 {uint64_t handled_access_fs;uint64_t handled_access_net; }; -#endif #ifndef HAVE_STRUCT_LANDLOCK_PATH_BENEATH_ATTR struct landlock_path_beneath_attr
@@ -30,12 +34,12 @@ struct landlock_path_beneath_attr } __attribute__((packed));#endif -#ifndef HAVE_ENUM_LANDLOCK_RULE_TYPE -enum landlock_rule_type -{ -LANDLOCK_RULE_PATH_BENEATH =1 , -LANDLOCK_RULE_NET_PORT , -}; +#if !HAVE_DECL_LANDLOCK_RULE_PATH_BENEATH +# define LANDLOCK_RULE_PATH_BENEATH 1 +#endif + +#if !HAVE_DECL_LANDLOCK_RULE_NET_PORT +# define LANDLOCK_RULE_NET_PORT 2#endif #ifndef HAVE_STRUCT_LANDLOCK_NET_PORT_ATTR
@@ -123,8 +127,7 @@ struct landlock_net_port_attr#endif static inline int safe_landlock_create_ruleset (const char *file,const int lineno, -const struct landlock_ruleset_attr *attr, -size_t size ,uint32_t flags) +const void *attr,size_t size ,uint32_t flags) {int rval;
@@ -143,8 +146,7 @@ static inline int safe_landlock_create_ruleset(const char *file, const int linen }static inline int safe_landlock_add_rule (const char *file,const int lineno, -int ruleset_fd,enum landlock_rule_type rule_type, -const void *rule_attr,uint32_t flags) +int ruleset_fd,int rule_type,const void *rule_attr,uint32_t flags) {int rval;
testcases/kernel/syscalls/landlock/landlock01.c +5 -10
@@ -17,14 +17,14 @@#include "landlock_common.h" -static struct landlock_ruleset_attr *ruleset_attr; -static struct landlock_ruleset_attr *null_attr; +static struct tst_landlock_ruleset_attr_abi1 *ruleset_attr; +static struct tst_landlock_ruleset_attr_abi1 *null_attr;static size_t rule_size;static size_t rule_small_size;static size_t rule_big_size; static struct tcase { - struct landlock_ruleset_attr **attr; + struct tst_landlock_ruleset_attr_abi1 **attr; uint64_t access_fs; size_t *size; uint32_t flags;
@@ -60,13 +60,8 @@ static void setup(void) {verify_landlock_is_enabled (); - rule_size =sizeof (struct landlock_ruleset_attr ); - -#ifdef HAVE_STRUCT_LANDLOCK_RULESET_ATTR_HANDLED_ACCESS_NET - rule_small_size = rule_size -sizeof (uint64_t ) -1 ; -#else + rule_size =sizeof (struct tst_landlock_ruleset_attr_abi1 ); rule_small_size = rule_size -1 ; -#endif rule_big_size =SAFE_SYSCONF (_SC_PAGESIZE) +1 ; }
@@ -77,7 +72,7 @@ static struct tst_test test = { .setup = setup, .needs_root = 1, .bufs = (struct tst_buffers []) { - {&ruleset_attr, .size =sizeof (struct landlock_ruleset_attr )}, + {&ruleset_attr, .size =sizeof (struct tst_landlock_ruleset_attr_abi1 )}, {}, }, .caps = (struct tst_cap []) {
testcases/kernel/syscalls/landlock/landlock02.c +4 -4
@@ -20,7 +20,7 @@#include "landlock_common.h" -static struct landlock_ruleset_attr *ruleset_attr; +static struct tst_landlock_ruleset_attr_abi1 *ruleset_attr;static struct landlock_path_beneath_attr *path_beneath_attr;static struct landlock_path_beneath_attr *rule_null;static int ruleset_fd;
@@ -93,7 +93,7 @@ static void run(unsigned int n) }TST_EXP_FAIL (tst_syscall (__NR_landlock_add_rule, - *tc->fd, tc->rule_type, *tc->attr, tc->flags), + *tc->fd, tc->rule_type, *tc->attr, tc->flags), tc->exp_errno,"%s" , tc->msg);
@@ -106,7 +106,7 @@ static void setup(void) ruleset_attr->handled_access_fs =LANDLOCK_ACCESS_FS_EXECUTE ; ruleset_fd =TST_EXP_FD_SILENT (tst_syscall (__NR_landlock_create_ruleset, - ruleset_attr,sizeof (struct landlock_ruleset_attr ),0 )); + ruleset_attr,sizeof (struct tst_landlock_ruleset_attr_abi1 ),0 )); }static void cleanup (void )
@@ -122,7 +122,7 @@ static struct tst_test test = { .cleanup = cleanup, .needs_root = 1, .bufs = (struct tst_buffers []) { - {&ruleset_attr, .size =sizeof (struct landlock_ruleset_attr )}, + {&ruleset_attr, .size =sizeof (struct tst_landlock_ruleset_attr_abi1 )}, {&path_beneath_attr, .size =sizeof (struct landlock_path_beneath_attr )}, {}, },
testcases/kernel/syscalls/landlock/landlock03.c +3 -3
@@ -21,7 +21,7 @@#define MAX_STACKED_RULESETS 16 -static struct landlock_ruleset_attr *ruleset_attr; +static struct tst_landlock_ruleset_attr_abi1 *ruleset_attr;static int ruleset_fd =-1 ;static int ruleset_invalid =-1 ;static int file_fd =-1 ;
@@ -89,7 +89,7 @@ static void setup(void) ruleset_attr->handled_access_fs =LANDLOCK_ACCESS_FS_EXECUTE ; ruleset_fd =TST_EXP_FD_SILENT (tst_syscall (__NR_landlock_create_ruleset, - ruleset_attr,sizeof (struct landlock_ruleset_attr ),0 )); + ruleset_attr,sizeof (struct tst_landlock_ruleset_attr_abi1 ),0 )); file_fd =SAFE_OPEN ("junk.bin" ,O_CREAT ,0777 ); }
@@ -112,7 +112,7 @@ static struct tst_test test = { .needs_root = 1, .forks_child = 1, .bufs = (struct tst_buffers []) { - {&ruleset_attr, .size =sizeof (struct landlock_ruleset_attr )}, + {&ruleset_attr, .size =sizeof (struct tst_landlock_ruleset_attr_abi1 )}, {}, }, .caps = (struct tst_cap []) {
testcases/kernel/syscalls/landlock/landlock04.c +3 -3
@@ -15,7 +15,7 @@#include "landlock_tester.h" #include "tst_safe_stdio.h" -static struct landlock_ruleset_attr *ruleset_attr; +static struct tst_landlock_ruleset_attr_abi1 *ruleset_attr;static struct landlock_path_beneath_attr *path_beneath_attr;static int ruleset_fd =-1 ;
@@ -153,7 +153,7 @@ static void setup(void) ruleset_attr->handled_access_fs =tester_get_all_fs_rules (); ruleset_fd =SAFE_LANDLOCK_CREATE_RULESET ( - ruleset_attr,sizeof (struct landlock_ruleset_attr ),0 ); + ruleset_attr,sizeof (struct tst_landlock_ruleset_attr_abi1 ),0 );/* since our binary is dynamically linked, we need to enable dependences * to be read and executed
@@ -192,7 +192,7 @@ static struct tst_test test = { NULL, }, .bufs = (struct tst_buffers []) { - {&ruleset_attr, .size =sizeof (struct landlock_ruleset_attr )}, + {&ruleset_attr, .size =sizeof (struct tst_landlock_ruleset_attr_abi1 )}, {&path_beneath_attr, .size =sizeof (struct landlock_path_beneath_attr )}, {}, },
testcases/kernel/syscalls/landlock/landlock05.c +5 -5
@@ -28,7 +28,7 @@#define FILENAME2 DIR2"/file"#define FILENAME3 DIR3"/file" -static struct landlock_ruleset_attr *ruleset_attr; +static struct tst_landlock_ruleset_attr_abi1 *ruleset_attr;static struct landlock_path_beneath_attr *path_beneath_attr;static void run (void )
@@ -68,15 +68,15 @@ static void setup(void)LANDLOCK_ACCESS_FS_REFER ; ruleset_fd =SAFE_LANDLOCK_CREATE_RULESET ( - ruleset_attr,sizeof (struct landlock_ruleset_attr ),0 ); + ruleset_attr,sizeof (struct tst_landlock_ruleset_attr_abi1 ),0 ); -apply_landlock_rule ( +apply_landlock_fs_rule ( path_beneath_attr, ruleset_fd,LANDLOCK_ACCESS_FS_REFER ,DIR1 ); - apply_landlock_rule( + apply_landlock_fs_rule( path_beneath_attr, ruleset_fd, LANDLOCK_ACCESS_FS_REFER,
@@ -93,7 +93,7 @@ static struct tst_test test = { .needs_root = 1, .forks_child = 1, .bufs = (struct tst_buffers []) { - {&ruleset_attr, .size =sizeof (struct landlock_ruleset_attr )}, + {&ruleset_attr, .size =sizeof (struct tst_landlock_ruleset_attr_abi1 )}, {&path_beneath_attr, .size =sizeof (struct landlock_path_beneath_attr )}, {}, },
testcases/kernel/syscalls/landlock/landlock06.c +4 -10
@@ -18,7 +18,7 @@#define MNTPOINT "sandbox"#define FILENAME MNTPOINT"/fifo" -static struct landlock_ruleset_attr *ruleset_attr; +static struct tst_landlock_ruleset_attr_abi1 *ruleset_attr;static struct landlock_path_beneath_attr *path_beneath_attr;static int file_fd =-1 ;static int dev_fd =-1 ;
@@ -42,8 +42,6 @@ static void run(void)static void setup (void ) { -int ruleset_fd; -if (verify_landlock_is_enabled () <5 )tst_brk (TCONF ,"LANDLOCK_ACCESS_FS_IOCTL_DEV is not supported" );
@@ -56,17 +54,13 @@ static void setup(void) ruleset_attr->handled_access_fs =LANDLOCK_ACCESS_FS_IOCTL_DEV ; - ruleset_fd =SAFE_LANDLOCK_CREATE_RULESET ( - ruleset_attr,sizeof (struct landlock_ruleset_attr ),0 ); - -apply_landlock_layer ( +apply_landlock_fs_layer ( ruleset_attr, +sizeof (struct tst_landlock_ruleset_attr_abi1 ), path_beneath_attr,MNTPOINT ,LANDLOCK_ACCESS_FS_IOCTL_DEV ); - -SAFE_CLOSE (ruleset_fd); }static void cleanup (void )
@@ -85,7 +79,7 @@ static struct tst_test test = { .needs_root = 1, .forks_child = 1, .bufs = (struct tst_buffers []) { - {&ruleset_attr, .size =sizeof (struct landlock_ruleset_attr )}, + {&ruleset_attr, .size =sizeof (struct tst_landlock_ruleset_attr_abi1 )}, {&path_beneath_attr, .size =sizeof (struct landlock_path_beneath_attr )}, {}, },
testcases/kernel/syscalls/landlock/landlock07.c +3 -3
@@ -25,7 +25,7 @@#include "lapi/prctl.h" #include "landlock_common.h" -static struct landlock_ruleset_attr *ruleset_attr; +static struct tst_landlock_ruleset_attr_abi1 *ruleset_attr;static int ruleset_fd;static pid_t spawn_houdini (void )
@@ -77,7 +77,7 @@ static void setup(void) ruleset_attr->handled_access_fs =LANDLOCK_ACCESS_FS_WRITE_FILE ; ruleset_fd =SAFE_LANDLOCK_CREATE_RULESET ( ruleset_attr, -sizeof (struct landlock_ruleset_attr ), +sizeof (struct tst_landlock_ruleset_attr_abi1 ),0 ); }
@@ -93,7 +93,7 @@ static struct tst_test test = { .cleanup = cleanup, .forks_child = 1, .bufs = (struct tst_buffers []) { - {&ruleset_attr, .size =sizeof (struct landlock_ruleset_attr )}, + {&ruleset_attr, .size =sizeof (struct tst_landlock_ruleset_attr_abi1 )}, {}, }, .caps = (struct tst_cap []) {
testcases/kernel/syscalls/landlock/landlock_common.h +5 -7
@@ -33,7 +33,7 @@ static inline int verify_landlock_is_enabled(void)return abi; } -static inline void apply_landlock_rule( +static inline void apply_landlock_fs_rule( struct landlock_path_beneath_attr *path_beneath_attr, const int ruleset_fd, const int access,
@@ -57,21 +57,19 @@ static inline void enforce_ruleset(const int ruleset_fd) SAFE_LANDLOCK_RESTRICT_SELF(ruleset_fd, 0); } -static inline void apply_landlock_layer ( -struct landlock_ruleset_attr *ruleset_attr, +static inline void apply_landlock_fs_layer ( +void *ruleset_attr,size_t attr_size,struct landlock_path_beneath_attr *path_beneath_attr,const char *path,const int access) {int ruleset_fd; - ruleset_fd =SAFE_LANDLOCK_CREATE_RULESET ( - ruleset_attr,sizeof (struct landlock_ruleset_attr ),0 ); + ruleset_fd =SAFE_LANDLOCK_CREATE_RULESET (ruleset_attr, attr_size,0 ); -apply_landlock_rule (path_beneath_attr, ruleset_fd, access, path); +apply_landlock_fs_rule (path_beneath_attr, ruleset_fd, access, path);enforce_ruleset (ruleset_fd);SAFE_CLOSE (ruleset_fd); } -#endif /* LANDLOCK_COMMON_H__ */
Signature · 5 lines
2.43.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 1/4] Fallback landlock network support
Hi!
Quoted 1 line
+#if !HAVE_DECL_LANDLOCK_RULE_PATH_BENEATH
I asked these to be changed to ifndef since they are more standard and more visible.
include/lapi/landlock.h struct landlock_path_beneath_attr · line 41
Quoted 4 lines
include/lapi/landlock.h +4
-0+# define LANDLOCK_RULE_PATH_BENEATH 1 +#endif + +#if !HAVE_DECL_LANDLOCK_RULE_NET_PORT
Here as well.
Quoted 2 lines
+# define
LANDLOCK_RULE_NET_PORT2
#endif
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 1/4] Fallback landlock network support
Hi!
Quoted 4 lines
Quoted 1 line
+#if !HAVE_DECL_LANDLOCK_RULE_PATH_BENEATH
I asked these to be changed to ifndef since they are more standard and more visible.
And the rest looks fine to me now.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 1/4] Fallback landlock network support
In reply to Cyril HrubisHi Cyril,
you can’t because they are always defined. They can be 0 or 1. Check config.h
Andrea
Quoted 21 lines · Cyril Hrubis
Hi!
Quoted 1 line
+#if !HAVE_DECL_LANDLOCK_RULE_PATH_BENEATH
I asked these to be changed to ifndef since they are more standard and more visible.
include/lapi/landlock.h struct landlock_path_beneath_attr · line 41
Quoted 4 lines
include/lapi/landlock.h +4
-0+# define LANDLOCK_RULE_PATH_BENEATH 1 +#endif + +#if !HAVE_DECL_LANDLOCK_RULE_NET_PORT Here as well.
Quoted 2 lines
+# define
LANDLOCK_RULE_NET_PORT2
#endif--
Cyril Hrubis
[email protected]
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 1/4] Fallback landlock network support
Hi!
Quoted 1 line
you can’t because they are always defined. They can be 0 or 1. Check
config.h
Uff, it seems that indeed the AC_CHECK_DECLS() behaves differently than rest of the checks that either defines the macro or not. I didn't expected that.
Anyways the patchset is fine then.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 1/4] Fallback landlock network support
Pushed, thanks!
Andrea
Quoted 8 lines · Cyril Hrubis
Hi!
Quoted 1 line
you can’t because they are always defined. They can be 0 or 1. Check
config.hUff, it seems that indeed the
AC_CHECK_DECLS()behaves differently than rest of the checks that either defines the macro or not. I didn't expected that.Anyways the patchset is fine then.
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 2/4 Network helpers in landlock suite common functions
In reply to Andrea CervesatoFrom: Andrea Cervesato <[email protected]>
Landlock suite helpers functions don't support network features. This patch adds apply_landlock_net_layer() helper that can be used to apply a network landlock rule in the current sandbox.
--- .../kernel/syscalls/landlock/landlock_common.h | 124 +++++++++++++++++++++ 1 file changed, 124 insertions(+)
testcases/kernel/syscalls/landlock/landlock_common.h +124 -0
@@ -11,6 +11,16 @@#include "lapi/fcntl.h" #include "lapi/landlock.h" +#define IPV4_LOCALHOST "127.0.0.1" +#define IPV6_LOCALHOST "::1" + +struct socket_data { +struct sockaddr_in addr_ipv4; +struct sockaddr_in6 addr_ipv6; +size_t address_size; +int fd; +}; +static inline int verify_landlock_is_enabled (void ) {int abi;
@@ -51,6 +61,22 @@ static inline void apply_landlock_fs_rule(SAFE_CLOSE (path_beneath_attr->parent_fd); } +static inline void apply_landlock_net_rule ( +struct landlock_net_port_attr *net_attr, +const int ruleset_fd, +const uint64_t port, +const uint64_t access) +{ + net_attr->port = port; + net_attr->allowed_access = access; + +SAFE_LANDLOCK_ADD_RULE ( + ruleset_fd, +LANDLOCK_RULE_NET_PORT , + net_attr, +0 ); +} +static inline void enforce_ruleset (const int ruleset_fd) {SAFE_PRCTL (PR_SET_NO_NEW_PRIVS ,1 ,0 ,0 ,0 );
@@ -72,4 +98,102 @@ static inline void apply_landlock_fs_layer(SAFE_CLOSE (ruleset_fd); } + +static inline void apply_landlock_net_layer ( +void *ruleset_attr,size_t attr_size, +struct landlock_net_port_attr *net_port_attr, +const in_port_t port, +const uint64_t access) +{ +int ruleset_fd; + + ruleset_fd =SAFE_LANDLOCK_CREATE_RULESET (ruleset_attr, attr_size,0 ); + +apply_landlock_net_rule (net_port_attr, ruleset_fd, port, access); +enforce_ruleset (ruleset_fd); + +SAFE_CLOSE (ruleset_fd); +} + +static inline in_port_t getsocket_port (struct socket_data *socket, +const int addr_family) +{ +struct sockaddr_in addr_ipv4; +struct sockaddr_in6 addr_ipv6; +socklen_t len; +in_port_t port =0 ; + +switch (addr_family) { +case AF_INET : + len =sizeof (addr_ipv4); +memset (&addr_ipv4,0 , len); + +SAFE_GETSOCKNAME (socket->fd, (struct sockaddr *)&addr_ipv4, &len); + port =ntohs (addr_ipv4.sin_port); +break ; +case AF_INET6 : + len =sizeof (addr_ipv6); +memset (&addr_ipv6,0 , len); + +SAFE_GETSOCKNAME (socket->fd, (struct sockaddr *)&addr_ipv6, &len); + port =ntohs (addr_ipv6.sin6_port); +break ; +default : +tst_brk (TBROK ,"Unsupported protocol" ); +break ; + }; + +return port; +} + +static inline void create_socket (struct socket_data *socket, +const int addr_family,const in_port_t port) +{ +memset (socket,0 ,sizeof (struct socket_data )); + +switch (addr_family) { +case AF_INET : +if (!port) { +tst_init_sockaddr_inet_bin (&socket->addr_ipv4, +INADDR_ANY ,0 ); + }else { +tst_init_sockaddr_inet (&socket->addr_ipv4, +IPV4_LOCALHOST , port); + } + + socket->address_size =sizeof (struct sockaddr_in ); +break ; +case AF_INET6 : +if (!port) { +tst_init_sockaddr_inet6_bin (&socket->addr_ipv6, + &in6addr_any,0 ); + }else { +tst_init_sockaddr_inet6 (&socket->addr_ipv6, +IPV6_LOCALHOST , port); + } + + socket->address_size =sizeof (struct sockaddr_in6 ); +break ; +default : +tst_brk (TBROK ,"Unsupported protocol" ); +return ; + }; + + socket->fd =SAFE_SOCKET (addr_family,SOCK_STREAM |SOCK_CLOEXEC ,0 ); +} + +static inline void getsocket_addr (struct socket_data *socket, +const int addr_family,struct sockaddr **addr) +{ +switch (addr_family) { +case AF_INET : + *addr = (struct sockaddr *)&socket->addr_ipv4; +break ; +case AF_INET6 : + *addr = (struct sockaddr *)&socket->addr_ipv6; +break ; +default : +break ; + }; +}#endif /* LANDLOCK_COMMON_H__ */
Signature · 5 lines
2.43.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 3/4 Add landlock08 test
In reply to Andrea CervesatoFrom: Andrea Cervesato <[email protected]>
Verify the landlock support for bind()/connect() syscalls in IPV4 and IPV6 protocols. In particular, check that bind() is assigning the address only on the TCP port enforced by LANDLOCK_ACCESS_NET_BIND_TCP and check that connect() is connecting only to a specific TCP port enforced by LANDLOCK_ACCESS_NET_CONNECT_TCP.
--- runtest/syscalls | 1 + testcases/kernel/syscalls/landlock/.gitignore | 1 + testcases/kernel/syscalls/landlock/landlock08.c | 209 ++++++++++++++++++++++++ 3 files changed, 211 insertions(+)
runtest/syscalls +1 -0
@@ -708,6 +708,7 @@ landlock04 landlock04 landlock05 landlock05 landlock06 landlock06 landlock07 landlock07 +landlock08 landlock08 lchown01 lchown01 lchown01_16 lchown01_16
testcases/kernel/syscalls/landlock/.gitignore +1 -0
@@ -6,3 +6,4 @@ landlock04 landlock05 landlock06 landlock07 +landlock08
testcases/kernel/syscalls/landlock/landlock08.c new file +209 -0
209 lines not on this page · raw message
Signature · 5 lines
2.43.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 4/4 Add error coverage for landlock network support
In reply to Andrea CervesatoFrom: Andrea Cervesato <[email protected]>
Add two more errors checks inside the landlock02 which is testing landlock_add_rule syscall. In particular, test now verifies when the syscall is raising EINVAL due to invalid network attributes.
--- testcases/kernel/syscalls/landlock/landlock02.c | 93 +++++++++++++++++++------ 1 file changed, 72 insertions(+), 21 deletions(-)
testcases/kernel/syscalls/landlock/landlock02.c +72 -21
@@ -20,93 +20,142 @@#include "landlock_common.h" -static struct tst_landlock_ruleset_attr_abi1 *ruleset_attr; +static struct tst_landlock_ruleset_attr_abi1 *attr_abi1; +static struct tst_landlock_ruleset_attr_abi4 *attr_abi4;static struct landlock_path_beneath_attr *path_beneath_attr;static struct landlock_path_beneath_attr *rule_null; +static struct landlock_net_port_attr *net_port_attr;static int ruleset_fd;static int invalid_fd =-1 ; +static int abi_current;static struct tcase {int *fd; -enum landlock_rule_type rule_type; -struct landlock_path_beneath_attr **attr; +int rule_type; +struct landlock_path_beneath_attr **path_attr; +struct landlock_net_port_attr **net_attr;int access;int parent_fd; +int net_port;uint32_t flags;int exp_errno; +int abi_ver;char *msg; } tcases[] = { { .fd = &ruleset_fd, - .attr = &path_beneath_attr, + .path_attr = &path_beneath_attr, .access =LANDLOCK_ACCESS_FS_EXECUTE , .flags =1 , .exp_errno =EINVAL , + .abi_ver =1 , .msg ="Invalid flags" }, { .fd = &ruleset_fd, - .attr = &path_beneath_attr, + .path_attr = &path_beneath_attr, .access =LANDLOCK_ACCESS_FS_EXECUTE , .exp_errno =EINVAL , + .abi_ver =1 , .msg ="Invalid rule type" }, { .fd = &ruleset_fd, .rule_type =LANDLOCK_RULE_PATH_BENEATH , - .attr = &path_beneath_attr, + .path_attr = &path_beneath_attr, .exp_errno =ENOMSG , + .abi_ver =1 , .msg ="Empty accesses" }, { .fd = &invalid_fd, - .attr = &path_beneath_attr, + .path_attr = &path_beneath_attr, .access =LANDLOCK_ACCESS_FS_EXECUTE , .exp_errno =EBADF , + .abi_ver =1 , .msg ="Invalid file descriptor" }, { .fd = &ruleset_fd, .rule_type =LANDLOCK_RULE_PATH_BENEATH , - .attr = &path_beneath_attr, + .path_attr = &path_beneath_attr, .access =LANDLOCK_ACCESS_FS_EXECUTE , .parent_fd =-1 , .exp_errno =EBADF , + .abi_ver =1 , .msg ="Invalid parent fd" }, { .fd = &ruleset_fd, .rule_type =LANDLOCK_RULE_PATH_BENEATH , - .attr = &rule_null, + .path_attr = &rule_null, .exp_errno =EFAULT , + .abi_ver =1 , .msg ="Invalid rule attr" }, + { + .fd = &ruleset_fd, + .rule_type =LANDLOCK_RULE_NET_PORT , + .net_attr = &net_port_attr, + .access =LANDLOCK_ACCESS_FS_EXECUTE , + .net_port =448 , + .exp_errno =EINVAL , + .abi_ver =4 , + .msg ="Invalid access rule for network type" + }, + { + .fd = &ruleset_fd, + .rule_type =LANDLOCK_RULE_NET_PORT , + .net_attr = &net_port_attr, + .access =LANDLOCK_ACCESS_NET_BIND_TCP , + .net_port =INT16_MAX +1 , + .exp_errno =EINVAL , + .abi_ver =4 , + .msg ="Socket port greater than 65535" + }, };static void run (unsigned int n) {struct tcase *tc = &tcases[n]; +void *attr =NULL ; -if (*tc->attr) { - (*tc->attr)->allowed_access = tc->access; - (*tc->attr)->parent_fd = tc->parent_fd; +if (tc->abi_ver > abi_current) { +tst_res (TCONF ,"Minimum ABI required: %d" , tc->abi_ver); +return ; + } + +if (tc->path_attr && *tc->path_attr) { + (*tc->path_attr)->allowed_access = tc->access; + (*tc->path_attr)->parent_fd = tc->parent_fd; + + attr = *tc->path_attr; + }else if (tc->net_attr && *tc->net_attr) { + (*tc->net_attr)->allowed_access = tc->access; + (*tc->net_attr)->port = tc->net_port; + + attr = *tc->net_attr; }TST_EXP_FAIL (tst_syscall (__NR_landlock_add_rule, - *tc->fd, tc->rule_type, *tc->attr, tc->flags), - tc->exp_errno, -"%s" , - tc->msg); + *tc->fd, tc->rule_type, attr, tc->flags), + tc->exp_errno,"%s" , tc->msg); }static void setup (void ) { -verify_landlock_is_enabled (); + abi_current =verify_landlock_is_enabled (); - ruleset_attr->handled_access_fs =LANDLOCK_ACCESS_FS_EXECUTE ; + attr_abi1->handled_access_fs = + attr_abi4->handled_access_fs =LANDLOCK_ACCESS_FS_EXECUTE ; - ruleset_fd =TST_EXP_FD_SILENT (tst_syscall (__NR_landlock_create_ruleset, - ruleset_attr,sizeof (struct tst_landlock_ruleset_attr_abi1 ),0 )); +if (abi_current <4 ) { + ruleset_fd =TST_EXP_FD_SILENT (tst_syscall (__NR_landlock_create_ruleset, + attr_abi1,sizeof (struct tst_landlock_ruleset_attr_abi1 ),0 )); + }else { + ruleset_fd =TST_EXP_FD_SILENT (tst_syscall (__NR_landlock_create_ruleset, + attr_abi4,sizeof (struct tst_landlock_ruleset_attr_abi4 ),0 )); + } }static void cleanup (void )
@@ -122,8 +171,10 @@ static struct tst_test test = { .cleanup = cleanup, .needs_root = 1, .bufs = (struct tst_buffers []) { - {&ruleset_attr, .size =sizeof (struct tst_landlock_ruleset_attr_abi1 )}, + {&attr_abi1, .size =sizeof (struct tst_landlock_ruleset_attr_abi1 )}, + {&attr_abi4, .size =sizeof (struct tst_landlock_ruleset_attr_abi4 )}, {&path_beneath_attr, .size =sizeof (struct landlock_path_beneath_attr )}, + {&net_port_attr, .size =sizeof (struct landlock_net_port_attr )}, {}, }, .caps = (struct tst_cap []) {
Signature · 5 lines
2.43.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp