7 files changed, 20 insertions, 53 deletions

diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c
index c6ca8662a468..f66baf44f32d 100644
--- a/security/keys/user_defined.c
+++ b/security/keys/user_defined.c
@@ -69,18 +69,6 @@ error:
 EXPORT_SYMBOL_GPL(user_instantiate);
 
 /*
- * dispose of the old data from an updated user defined key
- */
-static void user_update_rcu_disposal(struct rcu_head *rcu)
-{
-        struct user_key_payload *upayload;
-
-        upayload = container_of(rcu, struct user_key_payload, rcu);
-
-        kfree(upayload);
-}
-
-/*
  * update a user defined key
  * - the key's semaphore is write-locked
  */
@@ -114,7 +102,7 @@ int user_update(struct key *key, const void *data, size_t datalen)
                 key->expiry = 0;
         }
 
-        call_rcu(&zap->rcu, user_update_rcu_disposal);
+        kfree_rcu(zap, rcu);
 
 error:
         return ret;
@@ -145,7 +133,7 @@ void user_revoke(struct key *key)
 
         if (upayload) {
                 rcu_assign_pointer(key->payload.data, NULL);
-                call_rcu(&upayload->rcu, user_update_rcu_disposal);
+                kfree_rcu(upayload, rcu);
         }
 }
 
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 1d027e29ce8d..3d2715fd35ea 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -38,11 +38,7 @@
 #define AVC_CACHE_RECLAIM               16
 
 #ifdef CONFIG_SECURITY_SELINUX_AVC_STATS
-#define avc_cache_stats_incr(field)                             \
-do {                                                            \
-        per_cpu(avc_cache_stats, get_cpu()).field++;            \
-        put_cpu();                                              \
-} while (0)
+#define avc_cache_stats_incr(field)     this_cpu_inc(avc_cache_stats.field)
 #else
 #define avc_cache_stats_incr(field)     do {} while (0)
 #endif
@@ -347,11 +343,10 @@ static struct avc_node *avc_lookup(u32 ssid, u32 tsid, u16 tclass)
         node = avc_search_node(ssid, tsid, tclass);
 
         if (node)
-                avc_cache_stats_incr(hits);
-        else
-                avc_cache_stats_incr(misses);
+                return node;
 
-        return node;
+        avc_cache_stats_incr(misses);
+        return NULL;
 }
 
 static int avc_latest_notif_update(int seqno, int is_insert)
@@ -769,7 +764,7 @@ int avc_has_perm_noaudit(u32 ssid, u32 tsid,
         rcu_read_lock();
 
         node = avc_lookup(ssid, tsid, tclass);
-        if (!node) {
+        if (unlikely(!node)) {
                 rcu_read_unlock();
 
                 if (in_avd)
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index f7cf0ea6faea..8fb248843009 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1578,7 +1578,8 @@ static int may_create(struct inode *dir,
                 return rc;
 
         if (!newsid || !(sbsec->flags & SE_SBLABELSUPP)) {
-                rc = security_transition_sid(sid, dsec->sid, tclass, NULL, &newsid);
+                rc = security_transition_sid(sid, dsec->sid, tclass,
+                                             &dentry->d_name, &newsid);
                 if (rc)
                         return rc;
         }
diff --git a/security/selinux/include/avc.h b/security/selinux/include/avc.h
index e77b2ac2908b..47fda963495d 100644
--- a/security/selinux/include/avc.h
+++ b/security/selinux/include/avc.h
@@ -41,7 +41,6 @@ struct sk_buff;
  */
 struct avc_cache_stats {
         unsigned int lookups;
-        unsigned int hits;
         unsigned int misses;
         unsigned int allocations;
         unsigned int reclaims;
diff --git a/security/selinux/netif.c b/security/selinux/netif.c
index d6095d63d831..58cc481c93d5 100644
--- a/security/selinux/netif.c
+++ b/security/selinux/netif.c
@@ -104,22 +104,6 @@ static int sel_netif_insert(struct sel_netif *netif)
 }
 
 /**
- * sel_netif_free - Frees an interface entry
- * @p: the entry's RCU field
- *
- * Description:
- * This function is designed to be used as a callback to the call_rcu()
- * function so that memory allocated to a hash table interface entry can be
- * released safely.
- *
- */
-static void sel_netif_free(struct rcu_head *p)
-{
-        struct sel_netif *netif = container_of(p, struct sel_netif, rcu_head);
-        kfree(netif);
-}
-
-/**
  * sel_netif_destroy - Remove an interface record from the table
  * @netif: the existing interface record
  *
@@ -131,7 +115,7 @@ static void sel_netif_destroy(struct sel_netif *netif)
 {
         list_del_rcu(&netif->list);
         sel_netif_total--;
-        call_rcu(&netif->rcu_head, sel_netif_free);
+        kfree_rcu(netif, rcu_head);
 }
 
 /**
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 47b7d624a6e1..2d3373b2e256 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -1380,10 +1380,14 @@ static int sel_avc_stats_seq_show(struct seq_file *seq, void *v)
         if (v == SEQ_START_TOKEN)
                 seq_printf(seq, "lookups hits misses allocations reclaims "
                            "frees\n");
-        else
-                seq_printf(seq, "%u %u %u %u %u %u\n", st->lookups,
-                           st->hits, st->misses, st->allocations,
+        else {
+                unsigned int lookups = st->lookups;
+                unsigned int misses = st->misses;
+                unsigned int hits = lookups - misses;
+                seq_printf(seq, "%u %u %u %u %u %u\n", lookups,
+                           hits, misses, st->allocations,
                            st->reclaims, st->frees);
+        }
         return 0;
 }
 
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index e7b850ad57ee..7102457661d6 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -502,7 +502,7 @@ static int policydb_index(struct policydb *p)
                 goto out;
 
         rc = flex_array_prealloc(p->type_val_to_struct_array, 0,
-                                 p->p_types.nprim - 1, GFP_KERNEL | __GFP_ZERO);
+                                 p->p_types.nprim, GFP_KERNEL | __GFP_ZERO);
         if (rc)
                 goto out;
 
@@ -519,7 +519,7 @@ static int policydb_index(struct policydb *p)
                         goto out;
 
                 rc = flex_array_prealloc(p->sym_val_to_name[i],
-                                         0, p->symtab[i].nprim - 1,
+                                         0, p->symtab[i].nprim,
                                          GFP_KERNEL | __GFP_ZERO);
                 if (rc)
                         goto out;
@@ -1819,8 +1819,6 @@ static int filename_trans_read(struct policydb *p, void *fp)
                 goto out;
         nel = le32_to_cpu(buf[0]);
 
-        printk(KERN_ERR "%s: nel=%d\n", __func__, nel);
-
         last = p->filename_trans;
         while (last && last->next)
                 last = last->next;
@@ -1857,8 +1855,6 @@ static int filename_trans_read(struct policydb *p, void *fp)
                         goto out;
                 name[len] = 0;
 
-                printk(KERN_ERR "%s: ft=%p ft->name=%p ft->name=%s\n", __func__, ft, ft->name, ft->name);
-
                 rc = next_entry(buf, fp, sizeof(u32) * 4);
                 if (rc)
                         goto out;
@@ -2375,7 +2371,7 @@ int policydb_read(struct policydb *p, void *fp)
                 goto bad;
 
         /* preallocate so we don't have to worry about the put ever failing */
-        rc = flex_array_prealloc(p->type_attr_map_array, 0, p->p_types.nprim - 1,
+        rc = flex_array_prealloc(p->type_attr_map_array, 0, p->p_types.nprim,
                                  GFP_KERNEL | __GFP_ZERO);
         if (rc)
                 goto bad;