page allocator: check only once if the zonelist is suitable for the allocation

[sfrench/cifs-2.6.git] / security / selinux / netif.c

diff --git a/security/selinux/netif.c b/security/selinux/netif.c
index 013d3117a86b78ef57a159bf41de4d360c499029..b4e14bc0bf32bf6d0a9ae948d697912ca11e8769 100644 (file)
--- a/security/selinux/netif.c
+++ b/security/selinux/netif.c
@@ -8,7 +8,7 @@
  *
  * Copyright (C) 2003 Red Hat, Inc., James Morris <jmorris@redhat.com>
  * Copyright (C) 2007 Hewlett-Packard Development Company, L.P.
- *                    Paul Moore <paul.moore@hp.com>
+ *                   Paul Moore <paul.moore@hp.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -31,8 +31,7 @@
 #define SEL_NETIF_HASH_SIZE    64
 #define SEL_NETIF_HASH_MAX     1024
 
-struct sel_netif
-{
+struct sel_netif {
        struct list_head list;
        struct netif_security_struct nsec;
        struct rcu_head rcu_head;
@@ -92,10 +91,10 @@ static inline struct sel_netif *sel_netif_find(int ifindex)
 static int sel_netif_insert(struct sel_netif *netif)
 {
        int idx;
-       
+
        if (sel_netif_total >= SEL_NETIF_HASH_MAX)
                return -ENOSPC;
-       
+
        idx = sel_netif_hashfn(netif->nsec.ifindex);
        list_add_rcu(&netif->list, &sel_netif_hash[idx]);
        sel_netif_total++;
@@ -240,11 +239,13 @@ static void sel_netif_kill(int ifindex)
 {
        struct sel_netif *netif;
 
+       rcu_read_lock();
        spin_lock_bh(&sel_netif_lock);
        netif = sel_netif_find(ifindex);
        if (netif)
                sel_netif_destroy(netif);
        spin_unlock_bh(&sel_netif_lock);
+       rcu_read_unlock();
 }
 
 /**
@@ -267,7 +268,7 @@ static void sel_netif_flush(void)
 }
 
 static int sel_netif_avc_callback(u32 event, u32 ssid, u32 tsid,
-                                  u16 class, u32 perms, u32 *retained)
+                                 u16 class, u32 perms, u32 *retained)
 {
        if (event == AVC_CALLBACK_RESET) {
                sel_netif_flush();
@@ -277,11 +278,11 @@ static int sel_netif_avc_callback(u32 event, u32 ssid, u32 tsid,
 }
 
 static int sel_netif_netdev_notifier_handler(struct notifier_block *this,
-                                             unsigned long event, void *ptr)
+                                            unsigned long event, void *ptr)
 {
        struct net_device *dev = ptr;
 
-       if (dev->nd_net != &init_net)
+       if (dev_net(dev) != &init_net)
                return NOTIFY_DONE;
 
        if (event == NETDEV_DOWN)
@@ -297,7 +298,7 @@ static struct notifier_block sel_netif_netdev_notifier = {
 static __init int sel_netif_init(void)
 {
        int i, err;
-       
+
        if (!selinux_enabled)
                return 0;
 
@@ -305,9 +306,9 @@ static __init int sel_netif_init(void)
                INIT_LIST_HEAD(&sel_netif_hash[i]);
 
        register_netdevice_notifier(&sel_netif_netdev_notifier);
-       
+
        err = avc_add_callback(sel_netif_avc_callback, AVC_CALLBACK_RESET,
-                              SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0);
+                              SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0);
        if (err)
                panic("avc_add_callback() failed, error %d\n", err);