Merge remote-tracking branch 'security/next-testing'

# Conflicts:
#	arch/alpha/kernel/syscalls/syscall.tbl
#	arch/arm/tools/syscall.tbl
#	arch/arm64/include/asm/unistd.h
#	arch/arm64/include/asm/unistd32.h
#	arch/ia64/kernel/syscalls/syscall.tbl
#	arch/m68k/kernel/syscalls/syscall.tbl
#	arch/microblaze/kernel/syscalls/syscall.tbl
#	arch/mips/kernel/syscalls/syscall_n32.tbl
#	arch/mips/kernel/syscalls/syscall_n64.tbl
#	arch/mips/kernel/syscalls/syscall_o32.tbl
#	arch/parisc/kernel/syscalls/syscall.tbl
#	arch/powerpc/kernel/syscalls/syscall.tbl
#	arch/s390/kernel/syscalls/syscall.tbl
#	arch/sh/kernel/syscalls/syscall.tbl
#	arch/sparc/kernel/syscalls/syscall.tbl
#	arch/x86/entry/syscalls/syscall_32.tbl
#	arch/x86/entry/syscalls/syscall_64.tbl
#	arch/xtensa/kernel/syscalls/syscall.tbl
#	include/uapi/asm-generic/unistd.h

diff --cc Documentation/userspace-api/index.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/Kconfig
Simple merge

diff --cc arch/alpha/kernel/syscalls/syscall.tbl
index c5f7e595adab48d44a59e21fdfaf81d35434883a,4240f21b10b33d5063e77d3f92548cb96532c61c..5622578742fdde44e9c6a28955923438795f1b4e
--- 1/arch/alpha/kernel/syscalls/syscall.tbl
--- 2/arch/alpha/kernel/syscalls/syscall.tbl
+++ b/arch/alpha/kernel/syscalls/syscall.tbl
@@@ -482,4 -482,6 +482,7 @@@
  550   common  process_madvise                 sys_process_madvise
  551   common  epoll_pwait2                    sys_epoll_pwait2
  552   common  mount_setattr                   sys_mount_setattr
 +553   common  quotactl_path                   sys_quotactl_path
+ 554   common  landlock_create_ruleset         sys_landlock_create_ruleset
+ 555   common  landlock_add_rule               sys_landlock_add_rule
+ 556   common  landlock_restrict_self          sys_landlock_restrict_self

diff --cc arch/arm/tools/syscall.tbl
index 90cbe207cf3e7160b5ab12ff418efb760c48cdfb,161423a5d773b973771deafc4f378426f6319048..c7679d7db98b0cf689b9d549569effb71ca72128
--- 1/arch/arm/tools/syscall.tbl
--- 2/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@@ -456,4 -456,6 +456,7 @@@
  440   common  process_madvise                 sys_process_madvise
  441   common  epoll_pwait2                    sys_epoll_pwait2
  442   common  mount_setattr                   sys_mount_setattr
 +443   common  quotactl_path                   sys_quotactl_path
+ 444   common  landlock_create_ruleset         sys_landlock_create_ruleset
+ 445   common  landlock_add_rule               sys_landlock_add_rule
+ 446   common  landlock_restrict_self          sys_landlock_restrict_self

diff --cc arch/arm64/include/asm/unistd32.h
index 8361c5138e5f975cf5683a1546b4ca7ea5413539,fdfe06bae3fcace3aeacff49ac59659996ed9e58..7859749d6628a5d0bf4ed758d03b25e5d3c0ac19
--- 1/arch/arm64/include/asm/unistd32.h
--- 2/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@@ -893,8 -893,12 +893,14 @@@ __SYSCALL(__NR_process_madvise, sys_pro
  __SYSCALL(__NR_epoll_pwait2, compat_sys_epoll_pwait2)
  #define __NR_mount_setattr 442
  __SYSCALL(__NR_mount_setattr, sys_mount_setattr)
 +#define __NR_quotactl_path 443
 +__SYSCALL(__NR_quotactl_path, sys_quotactl_path)
+ #define __NR_landlock_create_ruleset 444
+ __SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)
+ #define __NR_landlock_add_rule 445
+ __SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule)
+ #define __NR_landlock_restrict_self 446
+ __SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)
  
  /*
   * Please add new compat syscalls above this comment and update

diff --cc arch/ia64/kernel/syscalls/syscall.tbl
index c072cd459bb5472ac621096d45e2fd1a6f46e66d,48dbbc95a01fa64167d46b93b86d6082d4cf59c0..1ee8e736a48e37d73c5137e17154741777292a61
--- 1/arch/ia64/kernel/syscalls/syscall.tbl
--- 2/arch/ia64/kernel/syscalls/syscall.tbl
+++ b/arch/ia64/kernel/syscalls/syscall.tbl
@@@ -363,4 -363,6 +363,7 @@@
  440   common  process_madvise                 sys_process_madvise
  441   common  epoll_pwait2                    sys_epoll_pwait2
  442   common  mount_setattr                   sys_mount_setattr
 +443   common  quotactl_path                   sys_quotactl_path
+ 444   common  landlock_create_ruleset         sys_landlock_create_ruleset
+ 445   common  landlock_add_rule               sys_landlock_add_rule
+ 446   common  landlock_restrict_self          sys_landlock_restrict_self

diff --cc arch/m68k/kernel/syscalls/syscall.tbl
index 5e9f81073ff4f1bdb6e1d964594ff4e982867c8b,595108bbbe428e3c5fa8146df2af8ee3bdd863b6..0dd019dc21362d18360269261f4f69977aa1cf3b
--- 1/arch/m68k/kernel/syscalls/syscall.tbl
--- 2/arch/m68k/kernel/syscalls/syscall.tbl
+++ b/arch/m68k/kernel/syscalls/syscall.tbl
@@@ -442,4 -442,6 +442,7 @@@
  440   common  process_madvise                 sys_process_madvise
  441   common  epoll_pwait2                    sys_epoll_pwait2
  442   common  mount_setattr                   sys_mount_setattr
 +443   common  quotactl_path                   sys_quotactl_path
+ 444   common  landlock_create_ruleset         sys_landlock_create_ruleset
+ 445   common  landlock_add_rule               sys_landlock_add_rule
+ 446   common  landlock_restrict_self          sys_landlock_restrict_self

diff --cc arch/microblaze/kernel/syscalls/syscall.tbl
index 8e74d690c64d248d421d958884baeba798c865c9,db23d65871f9be741167b9013b2aba438c6ed0cf..2ac716984ca2869112ad4847c56eda8803dc83f7
--- 1/arch/microblaze/kernel/syscalls/syscall.tbl
--- 2/arch/microblaze/kernel/syscalls/syscall.tbl
+++ b/arch/microblaze/kernel/syscalls/syscall.tbl
@@@ -448,4 -448,6 +448,7 @@@
  440   common  process_madvise                 sys_process_madvise
  441   common  epoll_pwait2                    sys_epoll_pwait2
  442   common  mount_setattr                   sys_mount_setattr
 +443   common  quotactl_path                   sys_quotactl_path
+ 444   common  landlock_create_ruleset         sys_landlock_create_ruleset
+ 445   common  landlock_add_rule               sys_landlock_add_rule
+ 446   common  landlock_restrict_self          sys_landlock_restrict_self

diff --cc arch/mips/kernel/syscalls/syscall_n32.tbl
index 6f397e56926f196e61d3b56fb9afb488a32d59f0,5028839225fa6213a32f4489f3dd1e06231b1603..5e009665725104d960b1c0a1d066a4470f324abc
--- 1/arch/mips/kernel/syscalls/syscall_n32.tbl
--- 2/arch/mips/kernel/syscalls/syscall_n32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n32.tbl
@@@ -381,4 -381,6 +381,7 @@@
  440   n32     process_madvise                 sys_process_madvise
  441   n32     epoll_pwait2                    compat_sys_epoll_pwait2
  442   n32     mount_setattr                   sys_mount_setattr
 +443   n32     quotactl_path                   sys_quotactl_path
+ 444   n32     landlock_create_ruleset         sys_landlock_create_ruleset
+ 445   n32     landlock_add_rule               sys_landlock_add_rule
+ 446   n32     landlock_restrict_self          sys_landlock_restrict_self

diff --cc arch/mips/kernel/syscalls/syscall_n64.tbl
index ab85a357c4fa6db6670e50f3d699ccebf9354f25,ec9c68b75e234e5a8e605f241e233619e5276252..9974f5f8e49bce05819434ff65479b98caf85b91
--- 1/arch/mips/kernel/syscalls/syscall_n64.tbl
--- 2/arch/mips/kernel/syscalls/syscall_n64.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n64.tbl
@@@ -357,4 -357,6 +357,7 @@@
  440   n64     process_madvise                 sys_process_madvise
  441   n64     epoll_pwait2                    sys_epoll_pwait2
  442   n64     mount_setattr                   sys_mount_setattr
 +443   n64     quotactl_path                   sys_quotactl_path
+ 444   n64     landlock_create_ruleset         sys_landlock_create_ruleset
+ 445   n64     landlock_add_rule               sys_landlock_add_rule
+ 446   n64     landlock_restrict_self          sys_landlock_restrict_self

diff --cc arch/mips/kernel/syscalls/syscall_o32.tbl
index 9c4cd2b40b38393f6a51ba94cd1d58fbf6797a1a,24afd33e3e495afc66c40f024bdefa75e2921188..39d6e71e57b608866fda81de210974076d0ca8cb
--- 1/arch/mips/kernel/syscalls/syscall_o32.tbl
--- 2/arch/mips/kernel/syscalls/syscall_o32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_o32.tbl
@@@ -430,4 -430,6 +430,7 @@@
  440   o32     process_madvise                 sys_process_madvise
  441   o32     epoll_pwait2                    sys_epoll_pwait2                compat_sys_epoll_pwait2
  442   o32     mount_setattr                   sys_mount_setattr
 +443   o32     quotactl_path                   sys_quotactl_path
+ 444   o32     landlock_create_ruleset         sys_landlock_create_ruleset
+ 445   o32     landlock_add_rule               sys_landlock_add_rule
+ 446   o32     landlock_restrict_self          sys_landlock_restrict_self

diff --cc arch/parisc/kernel/syscalls/syscall.tbl
index 80fba3f7d47b2868e71f22b2c9ff53e59c8f429a,8ddd0b82d7670222b79d7ef30007fe459e1e955f..5ac80b83d745e19020d37af6175b6da495a9a1ca
--- 1/arch/parisc/kernel/syscalls/syscall.tbl
--- 2/arch/parisc/kernel/syscalls/syscall.tbl
+++ b/arch/parisc/kernel/syscalls/syscall.tbl
@@@ -440,4 -440,6 +440,7 @@@
  440   common  process_madvise                 sys_process_madvise
  441   common  epoll_pwait2                    sys_epoll_pwait2                compat_sys_epoll_pwait2
  442   common  mount_setattr                   sys_mount_setattr
 +443   common  quotactl_path                   sys_quotactl_path
+ 444   common  landlock_create_ruleset         sys_landlock_create_ruleset
+ 445   common  landlock_add_rule               sys_landlock_add_rule
+ 446   common  landlock_restrict_self          sys_landlock_restrict_self

diff --cc arch/powerpc/kernel/syscalls/syscall.tbl
index f66f9c9b9d6cf4b7af7029e6da1710bd5efd8e21,02150894b1cfe4924f240ad33ec727a6b4497b77..2e68fbb57cc66de2e451c9e9721d425d9d76d9c1
--- 1/arch/powerpc/kernel/syscalls/syscall.tbl
--- 2/arch/powerpc/kernel/syscalls/syscall.tbl
+++ b/arch/powerpc/kernel/syscalls/syscall.tbl
@@@ -522,4 -522,6 +522,7 @@@
  440   common  process_madvise                 sys_process_madvise
  441   common  epoll_pwait2                    sys_epoll_pwait2                compat_sys_epoll_pwait2
  442   common  mount_setattr                   sys_mount_setattr
 +443   common  quotactl_path                   sys_quotactl_path
+ 444   common  landlock_create_ruleset         sys_landlock_create_ruleset
+ 445   common  landlock_add_rule               sys_landlock_add_rule
+ 446   common  landlock_restrict_self          sys_landlock_restrict_self

diff --cc arch/s390/kernel/syscalls/syscall.tbl
index a421905c36e884a47e33e6877255961e7e6adf42,331663efd3e704f218026ec483831211347ce1d2..7e4a2aba366df088e153856f93f94cb0be0a2b4e
--- 1/arch/s390/kernel/syscalls/syscall.tbl
--- 2/arch/s390/kernel/syscalls/syscall.tbl
+++ b/arch/s390/kernel/syscalls/syscall.tbl
@@@ -445,4 -445,6 +445,7 @@@
  440  common   process_madvise         sys_process_madvise             sys_process_madvise
  441  common   epoll_pwait2            sys_epoll_pwait2                compat_sys_epoll_pwait2
  442  common   mount_setattr           sys_mount_setattr               sys_mount_setattr
 +443  common   quotactl_path           sys_quotactl_path               sys_quotactl_path
+ 444  common   landlock_create_ruleset sys_landlock_create_ruleset     sys_landlock_create_ruleset
+ 445  common   landlock_add_rule       sys_landlock_add_rule           sys_landlock_add_rule
+ 446  common   landlock_restrict_self  sys_landlock_restrict_self      sys_landlock_restrict_self

diff --cc arch/sh/kernel/syscalls/syscall.tbl
index f68517aaa4f1866d131848bf22572ba04f53fbd0,6ada711f4b72a6a452803e886b8b26abbd6faeb5..f47a0dc5544551961efff6287c860ab347f90f05
--- 1/arch/sh/kernel/syscalls/syscall.tbl
--- 2/arch/sh/kernel/syscalls/syscall.tbl
+++ b/arch/sh/kernel/syscalls/syscall.tbl
@@@ -445,4 -445,6 +445,7 @@@
  440   common  process_madvise                 sys_process_madvise
  441   common  epoll_pwait2                    sys_epoll_pwait2
  442   common  mount_setattr                   sys_mount_setattr
 +443   common  quotactl_path                   sys_quotactl_path
+ 444   common  landlock_create_ruleset         sys_landlock_create_ruleset
+ 445   common  landlock_add_rule               sys_landlock_add_rule
+ 446   common  landlock_restrict_self          sys_landlock_restrict_self

diff --cc arch/sparc/kernel/syscalls/syscall.tbl
index 3ee82321504d3995283d6d6ee8495f946b9454f8,1dbe3239a638121aa8ac49e5489bcdbc7bc2a47b..b9e1c0e735b72b6ea50a862e401dd3afa39eb7f7
--- 1/arch/sparc/kernel/syscalls/syscall.tbl
--- 2/arch/sparc/kernel/syscalls/syscall.tbl
+++ b/arch/sparc/kernel/syscalls/syscall.tbl
@@@ -488,4 -488,6 +488,7 @@@
  440   common  process_madvise                 sys_process_madvise
  441   common  epoll_pwait2                    sys_epoll_pwait2                compat_sys_epoll_pwait2
  442   common  mount_setattr                   sys_mount_setattr
 +443   common  quotactl_path                   sys_quotactl_path
+ 444   common  landlock_create_ruleset         sys_landlock_create_ruleset
+ 445   common  landlock_add_rule               sys_landlock_add_rule
+ 446   common  landlock_restrict_self          sys_landlock_restrict_self

diff --cc arch/x86/entry/syscalls/syscall_32.tbl
index f52a443eede017558604e78487a673b489cce723,782c310de1dad2a7402cd175e2268700dd1b1589..28a1423ce32ee54e4e9b193d8f104b828acb5c96
--- 1/arch/x86/entry/syscalls/syscall_32.tbl
--- 2/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@@ -447,4 -447,6 +447,7 @@@
  440   i386    process_madvise         sys_process_madvise
  441   i386    epoll_pwait2            sys_epoll_pwait2                compat_sys_epoll_pwait2
  442   i386    mount_setattr           sys_mount_setattr
 +443   i386    quotactl_path           sys_quotactl_path
+ 444   i386    landlock_create_ruleset sys_landlock_create_ruleset
+ 445   i386    landlock_add_rule       sys_landlock_add_rule
+ 446   i386    landlock_restrict_self  sys_landlock_restrict_self

diff --cc arch/x86/entry/syscalls/syscall_64.tbl
index 7eb007b8cab5978b11ada91581954ea214c25768,8604ee4bfff9b8cc12dcf09e6f720e41795f95da..ecd551b08d05256af7235764c72d711460b2d58a
--- 1/arch/x86/entry/syscalls/syscall_64.tbl
--- 2/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/arch/x86/entry/syscalls/syscall_64.tbl
@@@ -364,7 -364,9 +364,10 @@@
  440   common  process_madvise         sys_process_madvise
  441   common  epoll_pwait2            sys_epoll_pwait2
  442   common  mount_setattr           sys_mount_setattr
 +443   common  quotactl_path           sys_quotactl_path
+ 444   common  landlock_create_ruleset sys_landlock_create_ruleset
+ 445   common  landlock_add_rule       sys_landlock_add_rule
+ 446   common  landlock_restrict_self  sys_landlock_restrict_self
  
  #
  # Due to a historical design error, certain syscalls are numbered differently

diff --cc arch/xtensa/kernel/syscalls/syscall.tbl
index c71cc45633deca15654abdfeae378429b503adca,2fad056a32e84e75f1452ba16c664ce123713087..9d76d433d3d67012b73ae48fc7232e0294a92973
--- 1/arch/xtensa/kernel/syscalls/syscall.tbl
--- 2/arch/xtensa/kernel/syscalls/syscall.tbl
+++ b/arch/xtensa/kernel/syscalls/syscall.tbl
@@@ -413,4 -413,6 +413,7 @@@
  440   common  process_madvise                 sys_process_madvise
  441   common  epoll_pwait2                    sys_epoll_pwait2
  442   common  mount_setattr                   sys_mount_setattr
 +443   common  quotactl_path                   sys_quotactl_path
+ 444   common  landlock_create_ruleset         sys_landlock_create_ruleset
+ 445   common  landlock_add_rule               sys_landlock_add_rule
+ 446   common  landlock_restrict_self          sys_landlock_restrict_self

diff --cc include/linux/syscalls.h
Simple merge

diff --cc include/uapi/asm-generic/unistd.h
index 739c839d28fef3500d02a2b8f3bfec1f3f1d5eef,300608b052263b47972fd86570b3075aa5e3c392..67093382a4e682bfa30271e14b4a1eeaf1370363
--- 1/include/uapi/asm-generic/unistd.h
--- 2/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@@ -863,11 -863,15 +863,17 @@@ __SYSCALL(__NR_process_madvise, sys_pro
  __SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)
  #define __NR_mount_setattr 442
  __SYSCALL(__NR_mount_setattr, sys_mount_setattr)
 +#define __NR_quotactl_path 443
 +__SYSCALL(__NR_quotactl_path, sys_quotactl_path)
+ #define __NR_landlock_create_ruleset 444
+ __SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)
+ #define __NR_landlock_add_rule 445
+ __SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule)
+ #define __NR_landlock_restrict_self 446
+ __SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)
  
  #undef __NR_syscalls
- #define __NR_syscalls 444
+ #define __NR_syscalls 447
  
  /*
   * 32 bit systems traditionally used different

diff --cc kernel/sys_ni.c
Simple merge

diff --cc security/selinux/ss/services.c
index 30163314504053e8a97943f1ef8a049cdf3e7e22,9cea2e6c809ff438799003504feea1288ae261e7..eeee854da9c194e03d8ddf203c4fb0434ac6da66
--- 1/security/selinux/ss/services.c
--- 2/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@@ -2953,9 -2874,9 +2954,9 @@@ int security_fs_use(struct selinux_stat
        struct selinux_policy *policy;
        struct policydb *policydb;
        struct sidtab *sidtab;
 -      int rc = 0;
 +      int rc;
        struct ocontext *c;
-       struct superblock_security_struct *sbsec = sb->s_security;
+       struct superblock_security_struct *sbsec = selinux_superblock(sb);
        const char *fstype = sb->s_type->name;
  
        if (!selinux_initialized(state)) {