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

Pull selinux updates from Paul Moore:

 - Add LSM hooks, and SELinux access control hooks, for dnotify,
   fanotify, and inotify watches. This has been discussed with both the
   LSM and fs/notify folks and everybody is good with these new hooks.

 - The LSM stacking changes missed a few calls to current_security() in
   the SELinux code; we fix those and remove current_security() for
   good.

 - Improve our network object labeling cache so that we always return
   the object's label, even when under memory pressure. Previously we
   would return an error if we couldn't allocate a new cache entry, now
   we always return the label even if we can't create a new cache entry
   for it.

 - Convert the sidtab atomic_t counter to a normal u32 with
   READ/WRITE_ONCE() and memory barrier protection.

 - A few patches to policydb.c to clean things up (remove forward
   declarations, long lines, bad variable names, etc)

* tag 'selinux-pr-20190917' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  lsm: remove current_security()
  selinux: fix residual uses of current_security() for the SELinux blob
  selinux: avoid atomic_t usage in sidtab
  fanotify, inotify, dnotify, security: add security hook for fs notifications
  selinux: always return a secid from the network caches if we find one
  selinux: policydb - rename type_val_to_struct_array
  selinux: policydb - fix some checkpatch.pl warnings
  selinux: shuffle around policydb.c to get rid of forward declarations

1 files changed, 13 insertions, 18 deletions

diff --git a/security/selinux/netif.c b/security/selinux/netif.c
index 9cb83eeee1d9..e40fecd73752 100644
--- a/security/selinux/netif.c
+++ b/security/selinux/netif.c
@@ -132,9 +132,9 @@ static void sel_netif_destroy(struct sel_netif *netif)
  */
 static int sel_netif_sid_slow(struct net *ns, int ifindex, u32 *sid)
 {
-        int ret;
+        int ret = 0;
         struct sel_netif *netif;
-        struct sel_netif *new = NULL;
+        struct sel_netif *new;
         struct net_device *dev;
 
         /* NOTE: we always use init's network namespace since we don't
@@ -151,32 +151,27 @@ static int sel_netif_sid_slow(struct net *ns, int ifindex, u32 *sid)
         netif = sel_netif_find(ns, ifindex);
         if (netif != NULL) {
                 *sid = netif->nsec.sid;
-                ret = 0;
                 goto out;
         }
-        new = kzalloc(sizeof(*new), GFP_ATOMIC);
-        if (new == NULL) {
-                ret = -ENOMEM;
-                goto out;
-        }
-        ret = security_netif_sid(&selinux_state, dev->name, &new->nsec.sid);
-        if (ret != 0)
-                goto out;
-        new->nsec.ns = ns;
-        new->nsec.ifindex = ifindex;
-        ret = sel_netif_insert(new);
+
+        ret = security_netif_sid(&selinux_state, dev->name, sid);
         if (ret != 0)
                 goto out;
-        *sid = new->nsec.sid;
+        new = kzalloc(sizeof(*new), GFP_ATOMIC);
+        if (new) {
+                new->nsec.ns = ns;
+                new->nsec.ifindex = ifindex;
+                new->nsec.sid = *sid;
+                if (sel_netif_insert(new))
+                        kfree(new);
+        }
 
 out:
         spin_unlock_bh(&sel_netif_lock);
         dev_put(dev);
-        if (unlikely(ret)) {
+        if (unlikely(ret))
                 pr_warn("SELinux: failure in %s(), unable to determine network interface label (%d)\n",
                         __func__, ifindex);
-                kfree(new);
-        }
         return ret;
 }