Merge tag 'lsm-pr-20240105' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm

Pull security module updates from Paul Moore:

 - Add three new syscalls: lsm_list_modules(), lsm_get_self_attr(), and
   lsm_set_self_attr().

   The first syscall simply lists the LSMs enabled, while the second and
   third get and set the current process' LSM attributes. Yes, these
   syscalls may provide similar functionality to what can be found under
   /proc or /sys, but they were designed to support multiple,
   simultaneaous (stacked) LSMs from the start as opposed to the current
   /proc based solutions which were created at a time when only one LSM
   was allowed to be active at a given time.

   We have spent considerable time discussing ways to extend the
   existing /proc interfaces to support multiple, simultaneaous LSMs and
   even our best ideas have been far too ugly to support as a kernel
   API; after +20 years in the kernel, I felt the LSM layer had
   established itself enough to justify a handful of syscalls.

   Support amongst the individual LSM developers has been nearly
   unanimous, with a single objection coming from Tetsuo (TOMOYO) as he
   is worried that the LSM_ID_XXX token concept will make it more
   difficult for out-of-tree LSMs to survive. Several members of the LSM
   community have demonstrated the ability for out-of-tree LSMs to
   continue to exist by picking high/unused LSM_ID values as well as
   pointing out that many kernel APIs rely on integer identifiers, e.g.
   syscalls (!), but unfortunately Tetsuo's objections remain.

   My personal opinion is that while I have no interest in penalizing
   out-of-tree LSMs, I'm not going to penalize in-tree development to
   support out-of-tree development, and I view this as a necessary step
   forward to support the push for expanded LSM stacking and reduce our
   reliance on /proc and /sys which has occassionally been problematic
   for some container users. Finally, we have included the linux-api
   folks on (all?) recent revisions of the patchset and addressed all of
   their concerns.

 - Add a new security_file_ioctl_compat() LSM hook to handle the 32-bit
   ioctls on 64-bit systems problem.

   This patch includes support for all of the existing LSMs which
   provide ioctl hooks, although it turns out only SELinux actually
   cares about the individual ioctls. It is worth noting that while
   Casey (Smack) and Tetsuo (TOMOYO) did not give explicit ACKs to this
   patch, they did both indicate they are okay with the changes.

 - Fix a potential memory leak in the CALIPSO code when IPv6 is disabled
   at boot.

   While it's good that we are fixing this, I doubt this is something
   users are seeing in the wild as you need to both disable IPv6 and
   then attempt to configure IPv6 labeled networking via
   NetLabel/CALIPSO; that just doesn't make much sense.

   Normally this would go through netdev, but Jakub asked me to take
   this patch and of all the trees I maintain, the LSM tree seemed like
   the best fit.

 - Update the LSM MAINTAINERS entry with additional information about
   our process docs, patchwork, bug reporting, etc.

   I also noticed that the Lockdown LSM is missing a dedicated
   MAINTAINERS entry so I've added that to the pull request. I've been
   working with one of the major Lockdown authors/contributors to see if
   they are willing to step up and assume a Lockdown maintainer role;
   hopefully that will happen soon, but in the meantime I'll continue to
   look after it.

 - Add a handful of mailmap entries for Serge Hallyn and myself.

* tag 'lsm-pr-20240105' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm: (27 commits)
  lsm: new security_file_ioctl_compat() hook
  lsm: Add a __counted_by() annotation to lsm_ctx.ctx
  calipso: fix memory leak in netlbl_calipso_add_pass()
  selftests: remove the LSM_ID_IMA check in lsm/lsm_list_modules_test
  MAINTAINERS: add an entry for the lockdown LSM
  MAINTAINERS: update the LSM entry
  mailmap: add entries for Serge Hallyn's dead accounts
  mailmap: update/replace my old email addresses
  lsm: mark the lsm_id variables are marked as static
  lsm: convert security_setselfattr() to use memdup_user()
  lsm: align based on pointer length in lsm_fill_user_ctx()
  lsm: consolidate buffer size handling into lsm_fill_user_ctx()
  lsm: correct error codes in security_getselfattr()
  lsm: cleanup the size counters in security_getselfattr()
  lsm: don't yet account for IMA in LSM_CONFIG_COUNT calculation
  lsm: drop LSM_ID_IMA
  LSM: selftests for Linux Security Module syscalls
  SELinux: Add selfattr hooks
  AppArmor: Add selfattr hooks
  Smack: implement setselfattr and getselfattr hooks
  ...

diff --cc .mailmap
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/alpha/kernel/syscalls/syscall.tbl
index 186e785f5b56c746919e3d9dff146e5f3d8f5ab8,b04af0c9fcbcce20450cac97fe94ade417b94f71..8ff110826ce21d0963869efcc169dd2155f27030
--- 1/arch/alpha/kernel/syscalls/syscall.tbl
--- 2/arch/alpha/kernel/syscalls/syscall.tbl
+++ b/arch/alpha/kernel/syscalls/syscall.tbl
@@@ -496,5 -496,6 +496,8 @@@
  564   common  futex_wake                      sys_futex_wake
  565   common  futex_wait                      sys_futex_wait
  566   common  futex_requeue                   sys_futex_requeue
 -567   common  lsm_get_self_attr               sys_lsm_get_self_attr
 -568   common  lsm_set_self_attr               sys_lsm_set_self_attr
 -569   common  lsm_list_modules                sys_lsm_list_modules
 +567   common  statmount                       sys_statmount
 +568   common  listmount                       sys_listmount
++569   common  lsm_get_self_attr               sys_lsm_get_self_attr
++570   common  lsm_set_self_attr               sys_lsm_set_self_attr
++571   common  lsm_list_modules                sys_lsm_list_modules

diff --cc arch/arm/tools/syscall.tbl
index d6a324dbff2e9818f43efd5701ad0c70484e5b5e,43313beefae778b5935bfa3a3107e51bd50544b2..b6c9e01e14f55965fadfa4d9c8dad6d97f6ce973
--- 1/arch/arm/tools/syscall.tbl
--- 2/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@@ -470,5 -470,6 +470,8 @@@
  454   common  futex_wake                      sys_futex_wake
  455   common  futex_wait                      sys_futex_wait
  456   common  futex_requeue                   sys_futex_requeue
 -457   common  lsm_get_self_attr               sys_lsm_get_self_attr
 -458   common  lsm_set_self_attr               sys_lsm_set_self_attr
 -459   common  lsm_list_modules                sys_lsm_list_modules
 +457   common  statmount                       sys_statmount
 +458   common  listmount                       sys_listmount
++459   common  lsm_get_self_attr               sys_lsm_get_self_attr
++460   common  lsm_set_self_attr               sys_lsm_set_self_attr
++461   common  lsm_list_modules                sys_lsm_list_modules

diff --cc arch/arm64/include/asm/unistd.h
index b63f870debafd42057d364f888e9c41c8aa6973e,abe10a833fcddded2b54bbd2c875b4ddc7646387..491b2b9bd5536f7aaaf9a849214e3b7c7518ef5b
--- 1/arch/arm64/include/asm/unistd.h
--- 2/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@@ -39,7 -39,7 +39,7 @@@
  #define __ARM_NR_compat_set_tls               (__ARM_NR_COMPAT_BASE + 5)
  #define __ARM_NR_COMPAT_END           (__ARM_NR_COMPAT_BASE + 0x800)
  
- #define __NR_compat_syscalls          459
 -#define __NR_compat_syscalls          460
++#define __NR_compat_syscalls          462
  #endif
  
  #define __ARCH_WANT_SYS_CLONE

diff --cc arch/arm64/include/asm/unistd32.h
index 8a191423c316e6c445732f2d990ecdddc3ab289f,ab1a7c2b6653e1707c0544e543c9277cbeeb4871..7118282d1c79768ff3539003c58a729ffc8095ce
--- 1/arch/arm64/include/asm/unistd32.h
--- 2/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@@ -919,10 -919,12 +919,16 @@@ __SYSCALL(__NR_futex_wake, sys_futex_wa
  __SYSCALL(__NR_futex_wait, sys_futex_wait)
  #define __NR_futex_requeue 456
  __SYSCALL(__NR_futex_requeue, sys_futex_requeue)
 -#define __NR_lsm_get_self_attr 457
 +#define __NR_statmount 457
 +__SYSCALL(__NR_statmount, sys_statmount)
 +#define __NR_listmount 458
 +__SYSCALL(__NR_listmount, sys_listmount)
++#define __NR_lsm_get_self_attr 459
+ __SYSCALL(__NR_lsm_get_self_attr, sys_lsm_get_self_attr)
 -#define __NR_lsm_set_self_attr 458
++#define __NR_lsm_set_self_attr 460
+ __SYSCALL(__NR_lsm_set_self_attr, sys_lsm_set_self_attr)
 -#define __NR_lsm_list_modules 459
++#define __NR_lsm_list_modules 461
+ __SYSCALL(__NR_lsm_list_modules, sys_lsm_list_modules)
  
  /*
   * Please add new compat syscalls above this comment and update

diff --cc arch/m68k/kernel/syscalls/syscall.tbl
index 37db1a810b67b899b7fca5a475b3355cd4652685,90629ffc6732291198f0b07a7a6d0d4c2ef88c1a..7fd43fd4c9f2e272c099c6e595d1ea928a6d211f
--- 1/arch/m68k/kernel/syscalls/syscall.tbl
--- 2/arch/m68k/kernel/syscalls/syscall.tbl
+++ b/arch/m68k/kernel/syscalls/syscall.tbl
@@@ -456,5 -456,6 +456,8 @@@
  454   common  futex_wake                      sys_futex_wake
  455   common  futex_wait                      sys_futex_wait
  456   common  futex_requeue                   sys_futex_requeue
 -457   common  lsm_get_self_attr               sys_lsm_get_self_attr
 -458   common  lsm_set_self_attr               sys_lsm_set_self_attr
 -459   common  lsm_list_modules                sys_lsm_list_modules
 +457   common  statmount                       sys_statmount
 +458   common  listmount                       sys_listmount
++459   common  lsm_get_self_attr               sys_lsm_get_self_attr
++460   common  lsm_set_self_attr               sys_lsm_set_self_attr
++461   common  lsm_list_modules                sys_lsm_list_modules

diff --cc arch/microblaze/kernel/syscalls/syscall.tbl
index 07fff5ad1c9c3e1f45975ad7166838cea7661c41,c395dece73b4d198eab437007abe091cc9860b13..b00ab2cabab92a4c275b777cc54e2d498d2f206e
--- 1/arch/microblaze/kernel/syscalls/syscall.tbl
--- 2/arch/microblaze/kernel/syscalls/syscall.tbl
+++ b/arch/microblaze/kernel/syscalls/syscall.tbl
@@@ -462,5 -462,6 +462,8 @@@
  454   common  futex_wake                      sys_futex_wake
  455   common  futex_wait                      sys_futex_wait
  456   common  futex_requeue                   sys_futex_requeue
 -457   common  lsm_get_self_attr               sys_lsm_get_self_attr
 -458   common  lsm_set_self_attr               sys_lsm_set_self_attr
 -459   common  lsm_list_modules                sys_lsm_list_modules
 +457   common  statmount                       sys_statmount
 +458   common  listmount                       sys_listmount
++459   common  lsm_get_self_attr               sys_lsm_get_self_attr
++460   common  lsm_set_self_attr               sys_lsm_set_self_attr
++461   common  lsm_list_modules                sys_lsm_list_modules

diff --cc arch/mips/kernel/syscalls/syscall_n32.tbl
index 134ea054b1c7d0301cfaaf57310252a2e64b0a4d,4a876c4e77d6af892fcb9c5e33fa39bf90a1378a..83cfc9eb6b88e670e67d74e4149929978af3039a
--- 1/arch/mips/kernel/syscalls/syscall_n32.tbl
--- 2/arch/mips/kernel/syscalls/syscall_n32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n32.tbl
@@@ -395,5 -395,6 +395,8 @@@
  454   n32     futex_wake                      sys_futex_wake
  455   n32     futex_wait                      sys_futex_wait
  456   n32     futex_requeue                   sys_futex_requeue
 -457   n32     lsm_get_self_attr               sys_lsm_get_self_attr
 -458   n32     lsm_set_self_attr               sys_lsm_set_self_attr
 -459   n32     lsm_list_modules                sys_lsm_list_modules
 +457   n32     statmount                       sys_statmount
 +458   n32     listmount                       sys_listmount
++459   n32     lsm_get_self_attr               sys_lsm_get_self_attr
++460   n32     lsm_set_self_attr               sys_lsm_set_self_attr
++461   n32     lsm_list_modules                sys_lsm_list_modules

diff --cc arch/mips/kernel/syscalls/syscall_n64.tbl
index 959a21664703b4b1a028d15913262fd1a84dd847,b74c8571f063257169e441e1361bf40fecc6bb40..532b855df589577bb13728670b5c6cbee3b6e31a
--- 1/arch/mips/kernel/syscalls/syscall_n64.tbl
--- 2/arch/mips/kernel/syscalls/syscall_n64.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n64.tbl
@@@ -371,5 -371,6 +371,8 @@@
  454   n64     futex_wake                      sys_futex_wake
  455   n64     futex_wait                      sys_futex_wait
  456   n64     futex_requeue                   sys_futex_requeue
 -457   n64     lsm_get_self_attr               sys_lsm_get_self_attr
 -458   n64     lsm_set_self_attr               sys_lsm_set_self_attr
 -459   n64     lsm_list_modules                sys_lsm_list_modules
 +457   n64     statmount                       sys_statmount
 +458   n64     listmount                       sys_listmount
++459   n64     lsm_get_self_attr               sys_lsm_get_self_attr
++460   n64     lsm_set_self_attr               sys_lsm_set_self_attr
++461   n64     lsm_list_modules                sys_lsm_list_modules

diff --cc arch/mips/kernel/syscalls/syscall_o32.tbl
index e55bc1d4bf0f9e3895cd7ed6f37c2211e9c72564,bf41906e1f688818a0501a2e3d062153a550ae9b..f45c9530ea93a1eaefcab09e6cc6af7ded426bf4
--- 1/arch/mips/kernel/syscalls/syscall_o32.tbl
--- 2/arch/mips/kernel/syscalls/syscall_o32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_o32.tbl
@@@ -444,5 -444,6 +444,8 @@@
  454   o32     futex_wake                      sys_futex_wake
  455   o32     futex_wait                      sys_futex_wait
  456   o32     futex_requeue                   sys_futex_requeue
 -457   o32     lsm_get_self_attr               sys_lsm_get_self_attr
 -458   032     lsm_set_self_attr               sys_lsm_set_self_attr
 -459   o32     lsm_list_modules                sys_lsm_list_modules
 +457   o32     statmount                       sys_statmount
 +458   o32     listmount                       sys_listmount
++459   o32     lsm_get_self_attr               sys_lsm_get_self_attr
++460   o32     lsm_set_self_attr               sys_lsm_set_self_attr
++461   o32     lsm_list_modules                sys_lsm_list_modules

diff --cc arch/parisc/kernel/syscalls/syscall.tbl
index 9c84470c31c79b6afcb1f0ad6fbc33653dbf5558,ccc0a679e774bdef46ed1a5b83431d4ec10e990b..b236a84c4e127e3cb64291a47056789982c70476
--- 1/arch/parisc/kernel/syscalls/syscall.tbl
--- 2/arch/parisc/kernel/syscalls/syscall.tbl
+++ b/arch/parisc/kernel/syscalls/syscall.tbl
@@@ -455,5 -455,6 +455,8 @@@
  454   common  futex_wake                      sys_futex_wake
  455   common  futex_wait                      sys_futex_wait
  456   common  futex_requeue                   sys_futex_requeue
 -457   common  lsm_get_self_attr               sys_lsm_get_self_attr
 -458   common  lsm_set_self_attr               sys_lsm_set_self_attr
 -459   common  lsm_list_modules                sys_lsm_list_modules
 +457   common  statmount                       sys_statmount
 +458   common  listmount                       sys_listmount
++459   common  lsm_get_self_attr               sys_lsm_get_self_attr
++460   common  lsm_set_self_attr               sys_lsm_set_self_attr
++461   common  lsm_list_modules                sys_lsm_list_modules

diff --cc arch/powerpc/kernel/syscalls/syscall.tbl
index 6988ecbc316e4bae0f1cb3597033813b40ca56ee,a6f37e2333cbe369302dbf9972f74e731c046609..17173b82ca21dca24c2b7aa68da9ffe0c149c6bf
--- 1/arch/powerpc/kernel/syscalls/syscall.tbl
--- 2/arch/powerpc/kernel/syscalls/syscall.tbl
+++ b/arch/powerpc/kernel/syscalls/syscall.tbl
@@@ -543,5 -543,6 +543,8 @@@
  454   common  futex_wake                      sys_futex_wake
  455   common  futex_wait                      sys_futex_wait
  456   common  futex_requeue                   sys_futex_requeue
 -457   common  lsm_get_self_attr               sys_lsm_get_self_attr
 -458   common  lsm_set_self_attr               sys_lsm_set_self_attr
 -459   common  lsm_list_modules                sys_lsm_list_modules
 +457   common  statmount                       sys_statmount
 +458   common  listmount                       sys_listmount
++459   common  lsm_get_self_attr               sys_lsm_get_self_attr
++460   common  lsm_set_self_attr               sys_lsm_set_self_attr
++461   common  lsm_list_modules                sys_lsm_list_modules

diff --cc arch/s390/kernel/syscalls/syscall.tbl
index 5f5cd20ebb3480f654622b4e4ff6325417ea33b7,4b818e9ee832cbdc849c372d7852caf5e7ee7ada..095bb86339a7d3781062787a20d8aacc2d03400a
--- 1/arch/s390/kernel/syscalls/syscall.tbl
--- 2/arch/s390/kernel/syscalls/syscall.tbl
+++ b/arch/s390/kernel/syscalls/syscall.tbl
@@@ -459,5 -459,6 +459,8 @@@
  454  common   futex_wake              sys_futex_wake                  sys_futex_wake
  455  common   futex_wait              sys_futex_wait                  sys_futex_wait
  456  common   futex_requeue           sys_futex_requeue               sys_futex_requeue
 -457  common   lsm_get_self_attr       sys_lsm_get_self_attr           sys_lsm_get_self_attr
 -458  common   lsm_set_self_attr       sys_lsm_set_self_attr           sys_lsm_set_self_attr
 -459  common   lsm_list_modules        sys_lsm_list_modules            sys_lsm_list_modules
 +457  common   statmount               sys_statmount                   sys_statmount
 +458  common   listmount               sys_listmount                   sys_listmount
++459  common   lsm_get_self_attr       sys_lsm_get_self_attr           sys_lsm_get_self_attr
++460  common   lsm_set_self_attr       sys_lsm_set_self_attr           sys_lsm_set_self_attr
++461  common   lsm_list_modules        sys_lsm_list_modules            sys_lsm_list_modules

diff --cc arch/sh/kernel/syscalls/syscall.tbl
index 3103ebd2e4cbacf23ad813ce53c5b58078e251e4,1a3d88d1a07ffa36a1a52d165a74caeb884b19d5..86fe269f02203b226719134c65bd083b120bcdc6
--- 1/arch/sh/kernel/syscalls/syscall.tbl
--- 2/arch/sh/kernel/syscalls/syscall.tbl
+++ b/arch/sh/kernel/syscalls/syscall.tbl
@@@ -459,5 -459,6 +459,8 @@@
  454   common  futex_wake                      sys_futex_wake
  455   common  futex_wait                      sys_futex_wait
  456   common  futex_requeue                   sys_futex_requeue
 -457   common  lsm_get_self_attr               sys_lsm_get_self_attr
 -458   common  lsm_set_self_attr               sys_lsm_set_self_attr
 -459   common  lsm_list_modules                sys_lsm_list_modules
 +457   common  statmount                       sys_statmount
 +458   common  listmount                       sys_listmount
++459   common  lsm_get_self_attr               sys_lsm_get_self_attr
++460   common  lsm_set_self_attr               sys_lsm_set_self_attr
++461   common  lsm_list_modules                sys_lsm_list_modules

diff --cc arch/sparc/kernel/syscalls/syscall.tbl
index ba147d7ad19aa524098d2a5d9c8fd6ace6bf7f6b,e0e8cec623583615edb630a6f6f5cff6b71cf36f..b23d59313589aa0f19e79e9c356c4d5bf18f7669
--- 1/arch/sparc/kernel/syscalls/syscall.tbl
--- 2/arch/sparc/kernel/syscalls/syscall.tbl
+++ b/arch/sparc/kernel/syscalls/syscall.tbl
@@@ -502,5 -502,6 +502,8 @@@
  454   common  futex_wake                      sys_futex_wake
  455   common  futex_wait                      sys_futex_wait
  456   common  futex_requeue                   sys_futex_requeue
 -457   common  lsm_get_self_attr               sys_lsm_get_self_attr
 -458   common  lsm_set_self_attr               sys_lsm_set_self_attr
 -459   common  lsm_list_modules                sys_lsm_list_modules
 +457   common  statmount                       sys_statmount
 +458   common  listmount                       sys_listmount
++459   common  lsm_get_self_attr               sys_lsm_get_self_attr
++460   common  lsm_set_self_attr               sys_lsm_set_self_attr
++461   common  lsm_list_modules                sys_lsm_list_modules

diff --cc arch/x86/entry/syscalls/syscall_32.tbl
index 56e6c2f3ee9c7f0bddb6bb895c5c442519138cc1,6e45e693f3390b8690c36deaa116d1e99e6f7224..5f8591ce7f25e77f25c548e5f7c4534debff9611
--- 1/arch/x86/entry/syscalls/syscall_32.tbl
--- 2/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@@ -461,5 -461,6 +461,8 @@@
  454   i386    futex_wake              sys_futex_wake
  455   i386    futex_wait              sys_futex_wait
  456   i386    futex_requeue           sys_futex_requeue
 -457   i386    lsm_get_self_attr       sys_lsm_get_self_attr
 -458   i386    lsm_set_self_attr       sys_lsm_set_self_attr
 -459   i386    lsm_list_modules        sys_lsm_list_modules
 +457   i386    statmount               sys_statmount
 +458   i386    listmount               sys_listmount
++459   i386    lsm_get_self_attr       sys_lsm_get_self_attr
++460   i386    lsm_set_self_attr       sys_lsm_set_self_attr
++461   i386    lsm_list_modules        sys_lsm_list_modules

diff --cc arch/x86/entry/syscalls/syscall_64.tbl
index 3a22eef585c2855382a229dddfae50a4d5861558,d3b41d059d4dbabb03705ba58f0f96ec16c69160..7e8d46f4147f574111962c214119af2dd2b62b4a
--- 1/arch/x86/entry/syscalls/syscall_64.tbl
--- 2/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/arch/x86/entry/syscalls/syscall_64.tbl
@@@ -378,8 -378,9 +378,11 @@@
  454   common  futex_wake              sys_futex_wake
  455   common  futex_wait              sys_futex_wait
  456   common  futex_requeue           sys_futex_requeue
 -457   common  lsm_get_self_attr       sys_lsm_get_self_attr
 -458   common  lsm_set_self_attr       sys_lsm_set_self_attr
 -459   common  lsm_list_modules        sys_lsm_list_modules
 +457   common  statmount               sys_statmount
 +458   common  listmount               sys_listmount
++459   common  lsm_get_self_attr       sys_lsm_get_self_attr
++460   common  lsm_set_self_attr       sys_lsm_set_self_attr
++461   common  lsm_list_modules        sys_lsm_list_modules
  
  #
  # Due to a historical design error, certain syscalls are numbered differently

diff --cc arch/xtensa/kernel/syscalls/syscall.tbl
index 497b5d32f45794097a6f31f85f7300677391b041,284784ea5a468d7c464b1570da214cb409b0a6c6..dd116598fb2517c177174a6885f76e0912fc1aac
--- 1/arch/xtensa/kernel/syscalls/syscall.tbl
--- 2/arch/xtensa/kernel/syscalls/syscall.tbl
+++ b/arch/xtensa/kernel/syscalls/syscall.tbl
@@@ -427,5 -427,6 +427,8 @@@
  454   common  futex_wake                      sys_futex_wake
  455   common  futex_wait                      sys_futex_wait
  456   common  futex_requeue                   sys_futex_requeue
 -457   common  lsm_get_self_attr               sys_lsm_get_self_attr
 -458   common  lsm_set_self_attr               sys_lsm_set_self_attr
 -459   common  lsm_list_modules                sys_lsm_list_modules
 +457   common  statmount                       sys_statmount
 +458   common  listmount                       sys_listmount
++459   common  lsm_get_self_attr               sys_lsm_get_self_attr
++460   common  lsm_set_self_attr               sys_lsm_set_self_attr
++461   common  lsm_list_modules                sys_lsm_list_modules

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

diff --cc include/uapi/asm-generic/unistd.h
index b67b18e71fbd3f8614c581bc3b5173d67b6f73fd,55cc0bcfb58d5f600082ae5c7615540b8f48ea34..75f00965ab1586cd64d00928217596de5034bd25
--- 1/include/uapi/asm-generic/unistd.h
--- 2/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@@ -829,14 -829,15 +829,21 @@@ __SYSCALL(__NR_futex_wait, sys_futex_wa
  #define __NR_futex_requeue 456
  __SYSCALL(__NR_futex_requeue, sys_futex_requeue)
  
 -#define __NR_lsm_get_self_attr 457
 +#define __NR_statmount   457
 +__SYSCALL(__NR_statmount, sys_statmount)
 +
 +#define __NR_listmount   458
 +__SYSCALL(__NR_listmount, sys_listmount)
 +
++#define __NR_lsm_get_self_attr 459
+ __SYSCALL(__NR_lsm_get_self_attr, sys_lsm_get_self_attr)
 -#define __NR_lsm_set_self_attr 458
++#define __NR_lsm_set_self_attr 460
+ __SYSCALL(__NR_lsm_set_self_attr, sys_lsm_set_self_attr)
 -#define __NR_lsm_list_modules 459
++#define __NR_lsm_list_modules 461
+ __SYSCALL(__NR_lsm_list_modules, sys_lsm_list_modules)
+ 
  #undef __NR_syscalls
- #define __NR_syscalls 459
 -#define __NR_syscalls 460
++#define __NR_syscalls 462
  
  /*
   * 32 bit systems traditionally used different

diff --cc kernel/sys_ni.c
Simple merge

diff --cc security/security.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge

diff --cc tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl
index 116ff501bf9263ac82a184e4fa408205e52292dd,81c772c0f5c8ec881881a4b7341138c09b6bd4fa..532b855df589577bb13728670b5c6cbee3b6e31a
--- 1/tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl
--- 2/tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl
+++ b/tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl
@@@ -367,7 -367,6 +367,12 @@@
  450   common  set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   n64     cachestat                       sys_cachestat
  452   n64     fchmodat2                       sys_fchmodat2
 -453   n64     lsm_get_self_attr               sys_lsm_get_self_attr
 -454   n64     lsm_set_self_attr               sys_lsm_set_self_attr
 -455   n64     lsm_list_modules                sys_lsm_list_modules
 +453   n64     map_shadow_stack                sys_map_shadow_stack
 +454   n64     futex_wake                      sys_futex_wake
 +455   n64     futex_wait                      sys_futex_wait
 +456   n64     futex_requeue                   sys_futex_requeue
++457   n64     statmount                       sys_statmount
++458   n64     listmount                       sys_listmount
++459   n64     lsm_get_self_attr               sys_lsm_get_self_attr
++460   n64     lsm_set_self_attr               sys_lsm_set_self_attr
++461   n64     lsm_list_modules                sys_lsm_list_modules

diff --cc tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
index 7fab411378f2dd7dda7b136e8fec9b28186e0fea,861c6ca0a8c34ac75bb9200e4ea87750266feff1..17173b82ca21dca24c2b7aa68da9ffe0c149c6bf
--- 1/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
--- 2/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
+++ b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
@@@ -539,7 -539,6 +539,12 @@@
  450   nospu   set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   common  cachestat                       sys_cachestat
  452   common  fchmodat2                       sys_fchmodat2
 -453   common  lsm_get_self_attr               sys_lsm_get_self_attr
 -454   common  lsm_set_self_attr               sys_lsm_set_self_attr
 -455   common  lsm_list_modules                sys_lsm_list_modules
 +453   common  map_shadow_stack                sys_ni_syscall
 +454   common  futex_wake                      sys_futex_wake
 +455   common  futex_wait                      sys_futex_wait
 +456   common  futex_requeue                   sys_futex_requeue
++457   common  statmount                       sys_statmount
++458   common  listmount                       sys_listmount
++459   common  lsm_get_self_attr               sys_lsm_get_self_attr
++460   common  lsm_set_self_attr               sys_lsm_set_self_attr
++461   common  lsm_list_modules                sys_lsm_list_modules

diff --cc tools/perf/arch/s390/entry/syscalls/syscall.tbl
index 86fec9b080f61bd0a5ef09395649cf15a9c90502,5a422443cb162ab3f1fadb4118d301131057fa30..095bb86339a7d3781062787a20d8aacc2d03400a
--- 1/tools/perf/arch/s390/entry/syscalls/syscall.tbl
--- 2/tools/perf/arch/s390/entry/syscalls/syscall.tbl
+++ b/tools/perf/arch/s390/entry/syscalls/syscall.tbl
@@@ -455,7 -455,6 +455,12 @@@
  450  common   set_mempolicy_home_node sys_set_mempolicy_home_node     sys_set_mempolicy_home_node
  451  common   cachestat               sys_cachestat                   sys_cachestat
  452  common   fchmodat2               sys_fchmodat2                   sys_fchmodat2
 -453  common   lsm_get_self_attr       sys_lsm_get_self_attr   sys_lsm_get_self_attr
 -454  common   lsm_set_self_attr       sys_lsm_set_self_attr   sys_lsm_set_self_attr
 -455  common   lsm_list_modules        sys_lsm_list_modules    sys_lsm_list_modules
 +453  common   map_shadow_stack        sys_map_shadow_stack            sys_map_shadow_stack
 +454  common   futex_wake              sys_futex_wake                  sys_futex_wake
 +455  common   futex_wait              sys_futex_wait                  sys_futex_wait
 +456  common   futex_requeue           sys_futex_requeue               sys_futex_requeue
++457  common   statmount               sys_statmount                   sys_statmount
++458  common   listmount               sys_listmount                   sys_listmount
++459  common   lsm_get_self_attr       sys_lsm_get_self_attr           sys_lsm_get_self_attr
++460  common   lsm_set_self_attr       sys_lsm_set_self_attr           sys_lsm_set_self_attr
++461  common   lsm_list_modules        sys_lsm_list_modules            sys_lsm_list_modules

diff --cc tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
index 8cb8bf68721cf6fab663bdeaf0299899784ee0bf,e692c88105a60d18165a772af91f2d0d9760094e..7e8d46f4147f574111962c214119af2dd2b62b4a
--- 1/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
--- 2/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
@@@ -375,9 -375,9 +375,14 @@@
  451   common  cachestat               sys_cachestat
  452   common  fchmodat2               sys_fchmodat2
  453   64      map_shadow_stack        sys_map_shadow_stack
 -454   common  lsm_get_self_attr       sys_lsm_get_self_attr
 -455   common  lsm_set_self_attr       sys_lsm_set_self_attr
 -456   common  lsm_list_modules        sys_lsm_list_modules
 +454   common  futex_wake              sys_futex_wake
 +455   common  futex_wait              sys_futex_wait
 +456   common  futex_requeue           sys_futex_requeue
++457   common  statmount               sys_statmount
++458   common  listmount               sys_listmount
++459   common  lsm_get_self_attr       sys_lsm_get_self_attr
++460   common  lsm_set_self_attr       sys_lsm_set_self_attr
++461   common  lsm_list_modules        sys_lsm_list_modules
  
  #
  # Due to a historical design error, certain syscalls are numbered differently

diff --cc tools/testing/selftests/Makefile
Simple merge