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

Pull lsm updates from Paul Moore:

 - Improve the error handling in the device cgroup such that memory
   allocation failures when updating the access policy do not
   potentially alter the policy.

 - Some minor fixes to reiserfs to ensure that it properly releases
   LSM-related xattr values.

 - Update the security_socket_getpeersec_stream() LSM hook to take
   sockptr_t values.

   Previously the net/BPF folks updated the getsockopt code in the
   network stack to leverage the sockptr_t type to make it easier to
   pass both kernel and __user pointers, but unfortunately when they did
   so they didn't convert the LSM hook.

   While there was/is no immediate risk by not converting the LSM hook,
   it seems like this is a mistake waiting to happen so this patch
   proactively does the LSM hook conversion.

 - Convert vfs_getxattr_alloc() to return an int instead of a ssize_t
   and cleanup the callers. Internally the function was never going to
   return anything larger than an int and the callers were doing some
   very odd things casting the return value; this patch fixes all that
   and helps bring a bit of sanity to vfs_getxattr_alloc() and its
   callers.

 - More verbose, and helpful, LSM debug output when the system is booted
   with "lsm.debug" on the command line. There are examples in the
   commit description, but the quick summary is that this patch provides
   better information about which LSMs are enabled and the ordering in
   which they are processed.

 - General comment and kernel-doc fixes and cleanups.

* tag 'lsm-pr-20221212' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
  lsm: Fix description of fs_context_parse_param
  lsm: Add/fix return values in lsm_hooks.h and fix formatting
  lsm: Clarify documentation of vm_enough_memory hook
  reiserfs: Add missing calls to reiserfs_security_free()
  lsm,fs: fix vfs_getxattr_alloc() return type and caller error paths
  device_cgroup: Roll back to original exceptions after copy failure
  LSM: Better reporting of actual LSMs at boot
  lsm: make security_socket_getpeersec_stream() sockptr_t safe
  audit: Fix some kernel-doc warnings
  lsm: remove obsoleted comments for security hooks
  fs: edit a comment made in bad taste

diff --cc fs/reiserfs/namei.c
Simple merge

diff --cc fs/xattr.c
Simple merge

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

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

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

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

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

diff --cc security/apparmor/domain.c
Simple merge

diff --cc security/apparmor/lsm.c
Simple merge

diff --cc security/commoncap.c
index 5d9570f54a1c9ea566a49d702bdd568bedc5728d,d4fc8909551346b1c2fdd60f165aaddec9a70ef0..1164278b97fd6bf6d52efba9917b27951be71b18
--- 1/security/commoncap.c
--- 2/security/commoncap.c
+++ b/security/commoncap.c
@@@ -381,9 -379,8 +381,9 @@@ int cap_inode_getsecurity(struct user_n
                          struct inode *inode, const char *name, void **buffer,
                          bool alloc)
  {
-       int size, ret;
+       int size;
        kuid_t kroot;
 +      vfsuid_t vfsroot;
        u32 nsmagic, magic;
        uid_t root, mappedroot;
        char *tmpbuf = NULL;

diff --cc security/integrity/evm/evm_main.c
index e01cfd4ad896ac6a2cd7a28a3dafdabbc0b394f4,bce72e80fd1237ab48ebae0b66bbd76fd96f3714..f02e609460e2f095248dc99afc02d9bf00441dc3
--- 1/security/integrity/evm/evm_main.c
--- 2/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
@@@ -453,10 -513,16 +453,12 @@@ static int evm_xattr_change(struct user
        char *xattr_data = NULL;
        int rc = 0;
  
 -      if (posix_xattr_acl(xattr_name))
 -              return evm_xattr_acl_change(mnt_userns, dentry, xattr_name,
 -                                          xattr_value, xattr_value_len);
 -
        rc = vfs_getxattr_alloc(&init_user_ns, dentry, xattr_name, &xattr_data,
                                0, GFP_NOFS);
-       if (rc < 0)
-               return 1;
+       if (rc < 0) {
+               rc = 1;
+               goto out;
+       }
  
        if (rc == xattr_value_len)
                rc = !!memcmp(xattr_value, xattr_data, rc);

diff --cc security/integrity/ima/ima_appraise.c
Simple merge

diff --cc security/security.c
Simple merge

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

diff --cc security/smack/smack_lsm.c
Simple merge