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

Pull selinux updates from Paul Moore:
 "We've got a few SELinux patches for the v5.2 merge window, the
  highlights are below:

   - Add LSM hooks, and the SELinux implementation, for proper labeling
     of kernfs. While we are only including the SELinux implementation
     here, the rest of the LSM folks have given the hooks a thumbs-up.

   - Update the SELinux mdp (Make Dummy Policy) script to actually work
     on a modern system.

   - Disallow userspace to change the LSM credentials via
     /proc/self/attr when the task's credentials are already overridden.

     The change was made in procfs because all the LSM folks agreed this
     was the Right Thing To Do and duplicating it across each LSM was
     going to be annoying"

* tag 'selinux-pr-20190507' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  proc: prevent changes to overridden credentials
  selinux: Check address length before reading address family
  kernfs: fix xattr name handling in LSM helpers
  MAINTAINERS: update SELinux file patterns
  selinux: avoid uninitialized variable warning
  selinux: remove useless assignments
  LSM: lsm_hooks.h - fix missing colon in docstring
  selinux: Make selinux_kernfs_init_security static
  kernfs: initialize security of newly created nodes
  selinux: implement the kernfs_init_security hook
  LSM: add new hook for kernfs node initialization
  kernfs: use simple_xattrs for security attributes
  selinux: try security xattr after genfs for kernfs filesystems
  kernfs: do not alloc iattrs in kernfs_xattr_get
  kernfs: clean up struct kernfs_iattrs
  scripts/selinux: fix build
  selinux: use kernel linux/socket.h for genheaders and mdp
  scripts/selinux: modernize mdp

1 files changed, 5 insertions, 9 deletions

diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c
index 186e727b737b..6fd9954e1c08 100644
--- a/security/selinux/netlabel.c
+++ b/security/selinux/netlabel.c
@@ -288,11 +288,8 @@ int selinux_netlbl_sctp_assoc_request(struct sctp_endpoint *ep,
         int rc;
         struct netlbl_lsm_secattr secattr;
         struct sk_security_struct *sksec = ep->base.sk->sk_security;
-        struct sockaddr *addr;
         struct sockaddr_in addr4;
-#if IS_ENABLED(CONFIG_IPV6)
         struct sockaddr_in6 addr6;
-#endif
 
         if (ep->base.sk->sk_family != PF_INET &&
                                 ep->base.sk->sk_family != PF_INET6)
@@ -310,16 +307,15 @@ int selinux_netlbl_sctp_assoc_request(struct sctp_endpoint *ep,
         if (ip_hdr(skb)->version == 4) {
                 addr4.sin_family = AF_INET;
                 addr4.sin_addr.s_addr = ip_hdr(skb)->saddr;
-                addr = (struct sockaddr *)&addr4;
-#if IS_ENABLED(CONFIG_IPV6)
-        } else {
+                rc = netlbl_conn_setattr(ep->base.sk, (void *)&addr4, &secattr);
+        } else if (IS_ENABLED(CONFIG_IPV6) && ip_hdr(skb)->version == 6) {
                 addr6.sin6_family = AF_INET6;
                 addr6.sin6_addr = ipv6_hdr(skb)->saddr;
-                addr = (struct sockaddr *)&addr6;
-#endif
+                rc = netlbl_conn_setattr(ep->base.sk, (void *)&addr6, &secattr);
+        } else {
+                rc = -EAFNOSUPPORT;
         }
 
-        rc = netlbl_conn_setattr(ep->base.sk, addr, &secattr);
         if (rc == 0)
                 sksec->nlbl_state = NLBL_LABELED;