From c6d7474c138f92b3cb3992b5c57750af89eb3b77 Mon Sep 17 00:00:00 2001 From: Азалия Смарагдова Date: Tue, 16 Aug 2022 13:30:12 +0500 Subject: tinyLL has been removed as it's no longer needed --- src/include/landlock.h | 70 -------------------------------- src/lib/libtinyll.c | 108 ------------------------------------------------- 2 files changed, 178 deletions(-) delete mode 100644 src/include/landlock.h delete mode 100644 src/lib/libtinyll.c diff --git a/src/include/landlock.h b/src/include/landlock.h deleted file mode 100644 index 5d6b0260e..000000000 --- a/src/include/landlock.h +++ /dev/null @@ -1,70 +0,0 @@ -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include - -int landlock_create_ruleset(struct landlock_ruleset_attr *rsattr,size_t size,__u32 flags) { - return syscall(__NR_landlock_create_ruleset,rsattr,size,flags); -} - -int landlock_add_rule(int fd,enum landlock_rule_type t,void *attr,__u32 flags) { - return syscall(__NR_landlock_add_rule,fd,t,attr,flags); -} - -int landlock_restrict_self(int fd,__u32 flags) { - int result = syscall(__NR_landlock_restrict_self,fd,flags); - if (result!=0) return result; - else { - close(fd); - return 0; - } -} - -int create_full_ruleset() { - struct landlock_ruleset_attr attr; - attr.handled_access_fs = LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR | LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | LANDLOCK_ACCESS_FS_MAKE_CHAR | LANDLOCK_ACCESS_FS_MAKE_DIR | LANDLOCK_ACCESS_FS_MAKE_REG | LANDLOCK_ACCESS_FS_MAKE_SOCK | LANDLOCK_ACCESS_FS_MAKE_FIFO | LANDLOCK_ACCESS_FS_MAKE_BLOCK | LANDLOCK_ACCESS_FS_MAKE_SYM | LANDLOCK_ACCESS_FS_EXECUTE; - return landlock_create_ruleset(&attr,sizeof(attr),0); -} - -int add_read_access_rule_by_path(int rset_fd,char *allowed_path) { - int result; - int allowed_fd = open(allowed_path,O_PATH | O_CLOEXEC); - struct landlock_path_beneath_attr target; - target.parent_fd = allowed_fd; - target.allowed_access = LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR; - result = landlock_add_rule(rset_fd,LANDLOCK_RULE_PATH_BENEATH,&target,0); - close(allowed_fd); - return result; -} - -int add_write_access_rule_by_path(int rset_fd,char *allowed_path,int restricted) { - int result; - int allowed_fd = open(allowed_path,O_PATH | O_CLOEXEC); - struct landlock_path_beneath_attr target; - target.parent_fd = allowed_fd; - if (restricted==0) target.allowed_access = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | LANDLOCK_ACCESS_FS_MAKE_CHAR | LANDLOCK_ACCESS_FS_MAKE_DIR | LANDLOCK_ACCESS_FS_MAKE_REG | LANDLOCK_ACCESS_FS_MAKE_SOCK | LANDLOCK_ACCESS_FS_MAKE_FIFO | LANDLOCK_ACCESS_FS_MAKE_BLOCK | LANDLOCK_ACCESS_FS_MAKE_SYM; - else if (restricted==1) target.allowed_access = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | LANDLOCK_ACCESS_FS_MAKE_CHAR | LANDLOCK_ACCESS_FS_MAKE_DIR | LANDLOCK_ACCESS_FS_MAKE_REG | LANDLOCK_ACCESS_FS_MAKE_SYM; - else { - close(allowed_fd); - return -1; - } - result = landlock_add_rule(rset_fd,LANDLOCK_RULE_PATH_BENEATH,&target,0); - close(allowed_fd); - return result; -} - -int add_execute_rule_by_path(int rset_fd,char *allowed_path) { - int result; - int allowed_fd = open(allowed_path,O_PATH | O_CLOEXEC); - struct landlock_path_beneath_attr target; - target.parent_fd = allowed_fd; - target.allowed_access = LANDLOCK_ACCESS_FS_EXECUTE; - result = landlock_add_rule(rset_fd,LANDLOCK_RULE_PATH_BENEATH,&target,0); - close(allowed_fd); - return result; -} diff --git a/src/lib/libtinyll.c b/src/lib/libtinyll.c deleted file mode 100644 index 9db6f75d7..000000000 --- a/src/lib/libtinyll.c +++ /dev/null @@ -1,108 +0,0 @@ -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int landlock_create_ruleset(struct landlock_ruleset_attr *rsattr,size_t size,__u32 flags) { - return syscall(__NR_landlock_create_ruleset,rsattr,size,flags); -} - -int landlock_add_rule(int fd,enum landlock_rule_type t,void *attr,__u32 flags) { - return syscall(__NR_landlock_add_rule,fd,t,attr,flags); -} - -int landlock_restrict_self(int fd,__u32 flags) { - int result = syscall(__NR_landlock_restrict_self,fd,flags); - if (result!=0) return result; - else { - close(fd); - return 0; - } -} - -int create_full_ruleset() { - struct landlock_ruleset_attr attr; - attr.handled_access_fs = LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR | LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | LANDLOCK_ACCESS_FS_MAKE_CHAR | LANDLOCK_ACCESS_FS_MAKE_DIR | LANDLOCK_ACCESS_FS_MAKE_REG | LANDLOCK_ACCESS_FS_MAKE_SOCK | LANDLOCK_ACCESS_FS_MAKE_FIFO | LANDLOCK_ACCESS_FS_MAKE_BLOCK | LANDLOCK_ACCESS_FS_MAKE_SYM | LANDLOCK_ACCESS_FS_EXECUTE; - return landlock_create_ruleset(&attr,sizeof(attr),0); -} - -int add_read_access_rule(int rset_fd,int allowed_fd) { - int result; - struct landlock_path_beneath_attr target; - target.parent_fd = allowed_fd; - target.allowed_access = LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR; - result = landlock_add_rule(rset_fd,LANDLOCK_RULE_PATH_BENEATH,&target,0); - return result; -} - -int add_read_access_rule_by_path(int rset_fd,char *allowed_path) { - int result; - int allowed_fd = open(allowed_path,O_PATH | O_CLOEXEC); - struct landlock_path_beneath_attr target; - target.parent_fd = allowed_fd; - target.allowed_access = LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR; - result = landlock_add_rule(rset_fd,LANDLOCK_RULE_PATH_BENEATH,&target,0); - close(allowed_fd); - return result; -} - -int add_write_access_rule(int rset_fd,int allowed_fd,int restricted) { - int result; - struct landlock_path_beneath_attr target; - target.parent_fd = allowed_fd; - if (restricted==0) target.allowed_access = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | LANDLOCK_ACCESS_FS_MAKE_CHAR | LANDLOCK_ACCESS_FS_MAKE_DIR | LANDLOCK_ACCESS_FS_MAKE_REG | LANDLOCK_ACCESS_FS_MAKE_SOCK | LANDLOCK_ACCESS_FS_MAKE_FIFO | LANDLOCK_ACCESS_FS_MAKE_BLOCK | LANDLOCK_ACCESS_FS_MAKE_SYM; - else if (restricted==1) target.allowed_access = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | LANDLOCK_ACCESS_FS_MAKE_CHAR | LANDLOCK_ACCESS_FS_MAKE_DIR | LANDLOCK_ACCESS_FS_MAKE_REG | LANDLOCK_ACCESS_FS_MAKE_SYM; - result = landlock_add_rule(rset_fd,LANDLOCK_RULE_PATH_BENEATH,&target,0); - return result; -} - -int add_write_access_rule_by_path(int rset_fd,char *allowed_path,int restricted) { - int result; - int allowed_fd = open(allowed_path,O_PATH | O_CLOEXEC); - struct landlock_path_beneath_attr target; - target.parent_fd = allowed_fd; - if (restricted==0) target.allowed_access = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | LANDLOCK_ACCESS_FS_MAKE_CHAR | LANDLOCK_ACCESS_FS_MAKE_DIR | LANDLOCK_ACCESS_FS_MAKE_REG | LANDLOCK_ACCESS_FS_MAKE_SOCK | LANDLOCK_ACCESS_FS_MAKE_FIFO | LANDLOCK_ACCESS_FS_MAKE_BLOCK | LANDLOCK_ACCESS_FS_MAKE_SYM; - else if (restricted==1) target.allowed_access = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | LANDLOCK_ACCESS_FS_MAKE_CHAR | LANDLOCK_ACCESS_FS_MAKE_DIR | LANDLOCK_ACCESS_FS_MAKE_REG | LANDLOCK_ACCESS_FS_MAKE_SYM; - else { - close(allowed_fd); - return -1; - } - result = landlock_add_rule(rset_fd,LANDLOCK_RULE_PATH_BENEATH,&target,0); - close(allowed_fd); - return result; -} - -int add_execute_rule(int rset_fd,int allowed_fd) { - int result; - struct landlock_path_beneath_attr target; - target.parent_fd = allowed_fd; - target.allowed_access = LANDLOCK_ACCESS_FS_EXECUTE; - result = landlock_add_rule(rset_fd,LANDLOCK_RULE_PATH_BENEATH,&target,0); - return result; -} - -int add_execute_rule_by_path(int rset_fd,char *allowed_path) { - int result; - int allowed_fd = open(allowed_path,O_PATH | O_CLOEXEC); - struct landlock_path_beneath_attr target; - target.parent_fd = allowed_fd; - target.allowed_access = LANDLOCK_ACCESS_FS_EXECUTE; - result = landlock_add_rule(rset_fd,LANDLOCK_RULE_PATH_BENEATH,&target,0); - close(allowed_fd); - return result; -} - -int check_nnp() { - return prctl(PR_GET_NO_NEW_PRIVS,0,0,0,0); -} - -int enable_nnp() { - return prctl(PR_SET_NO_NEW_PRIVS,1,0,0,0); -} -- cgit v1.2.3-70-g09d2