Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #3]
  Revert "CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #2]"
  SELinux: shrink sizeof av_inhert selinux_class_perm and context
  CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #2]
  keys: fix sparse warning by adding __user annotation to cast
  smack: Add support for unlabeled network hosts and networks
  selinux: Deprecate and schedule the removal of the the compat_net functionality
  netlabel: Update kernel configuration API

7 files changed, 469 insertions, 137 deletions

diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index e52799047a5..6bb2635b5de 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -38,6 +38,7 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/jhash.h>
+#include <linux/audit.h>
 #include <net/ip.h>
 #include <net/icmp.h>
 #include <net/tcp.h>
@@ -449,6 +450,7 @@ static struct cipso_v4_doi *cipso_v4_doi_search(u32 doi)
 /**
  * cipso_v4_doi_add - Add a new DOI to the CIPSO protocol engine
  * @doi_def: the DOI structure
+ * @audit_info: NetLabel audit information
  *
  * Description:
  * The caller defines a new DOI for use by the CIPSO engine and calls this
@@ -458,50 +460,78 @@ static struct cipso_v4_doi *cipso_v4_doi_search(u32 doi)
  * zero on success and non-zero on failure.
  *
  */
-int cipso_v4_doi_add(struct cipso_v4_doi *doi_def)
+int cipso_v4_doi_add(struct cipso_v4_doi *doi_def,
+                     struct netlbl_audit *audit_info)
 {
+        int ret_val = -EINVAL;
         u32 iter;
+        u32 doi;
+        u32 doi_type;
+        struct audit_buffer *audit_buf;
+
+        doi = doi_def->doi;
+        doi_type = doi_def->type;
 
         if (doi_def == NULL || doi_def->doi == CIPSO_V4_DOI_UNKNOWN)
-                return -EINVAL;
+                goto doi_add_return;
         for (iter = 0; iter < CIPSO_V4_TAG_MAXCNT; iter++) {
                 switch (doi_def->tags[iter]) {
                 case CIPSO_V4_TAG_RBITMAP:
                         break;
                 case CIPSO_V4_TAG_RANGE:
-                        if (doi_def->type != CIPSO_V4_MAP_PASS)
-                                return -EINVAL;
-                        break;
-                case CIPSO_V4_TAG_INVALID:
-                        if (iter == 0)
-                                return -EINVAL;
-                        break;
                 case CIPSO_V4_TAG_ENUM:
                         if (doi_def->type != CIPSO_V4_MAP_PASS)
-                                return -EINVAL;
+                                goto doi_add_return;
                         break;
                 case CIPSO_V4_TAG_LOCAL:
                         if (doi_def->type != CIPSO_V4_MAP_LOCAL)
-                                return -EINVAL;
+                                goto doi_add_return;
+                        break;
+                case CIPSO_V4_TAG_INVALID:
+                        if (iter == 0)
+                                goto doi_add_return;
                         break;
                 default:
-                        return -EINVAL;
+                        goto doi_add_return;
                 }
         }
 
         atomic_set(&doi_def->refcount, 1);
 
         spin_lock(&cipso_v4_doi_list_lock);
-        if (cipso_v4_doi_search(doi_def->doi) != NULL)
-                goto doi_add_failure;
+        if (cipso_v4_doi_search(doi_def->doi) != NULL) {
+                spin_unlock(&cipso_v4_doi_list_lock);
+                ret_val = -EEXIST;
+                goto doi_add_return;
+        }
         list_add_tail_rcu(&doi_def->list, &cipso_v4_doi_list);
         spin_unlock(&cipso_v4_doi_list_lock);
+        ret_val = 0;
 
-        return 0;
+doi_add_return:
+        audit_buf = netlbl_audit_start(AUDIT_MAC_CIPSOV4_ADD, audit_info);
+        if (audit_buf != NULL) {
+                const char *type_str;
+                switch (doi_type) {
+                case CIPSO_V4_MAP_TRANS:
+                        type_str = "trans";
+                        break;
+                case CIPSO_V4_MAP_PASS:
+                        type_str = "pass";
+                        break;
+                case CIPSO_V4_MAP_LOCAL:
+                        type_str = "local";
+                        break;
+                default:
+                        type_str = "(unknown)";
+                }
+                audit_log_format(audit_buf,
+                                 " cipso_doi=%u cipso_type=%s res=%u",
+                                 doi, type_str, ret_val == 0 ? 1 : 0);
+                audit_log_end(audit_buf);
+        }
 
-doi_add_failure:
-        spin_unlock(&cipso_v4_doi_list_lock);
-        return -EEXIST;
+        return ret_val;
 }
 
 /**
@@ -559,25 +589,39 @@ static void cipso_v4_doi_free_rcu(struct rcu_head *entry)
  */
 int cipso_v4_doi_remove(u32 doi, struct netlbl_audit *audit_info)
 {
+        int ret_val;
         struct cipso_v4_doi *doi_def;
+        struct audit_buffer *audit_buf;
 
         spin_lock(&cipso_v4_doi_list_lock);
         doi_def = cipso_v4_doi_search(doi);
         if (doi_def == NULL) {
                 spin_unlock(&cipso_v4_doi_list_lock);
-                return -ENOENT;
+                ret_val = -ENOENT;
+                goto doi_remove_return;
         }
         if (!atomic_dec_and_test(&doi_def->refcount)) {
                 spin_unlock(&cipso_v4_doi_list_lock);
-                return -EBUSY;
+                ret_val = -EBUSY;
+                goto doi_remove_return;
         }
         list_del_rcu(&doi_def->list);
         spin_unlock(&cipso_v4_doi_list_lock);
 
         cipso_v4_cache_invalidate();
         call_rcu(&doi_def->rcu, cipso_v4_doi_free_rcu);
+        ret_val = 0;
+
+doi_remove_return:
+        audit_buf = netlbl_audit_start(AUDIT_MAC_CIPSOV4_DEL, audit_info);
+        if (audit_buf != NULL) {
+                audit_log_format(audit_buf,
+                                 " cipso_doi=%u res=%u",
+                                 doi, ret_val == 0 ? 1 : 0);
+                audit_log_end(audit_buf);
+        }
 
-        return 0;
+        return ret_val;
 }
 
 /**
diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c
index fff32b70efa..bf1ab1a6790 100644
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
@@ -130,6 +130,7 @@ static int netlbl_cipsov4_add_common(struct genl_info *info,
 /**
  * netlbl_cipsov4_add_std - Adds a CIPSO V4 DOI definition
  * @info: the Generic NETLINK info block
+ * @audit_info: NetLabel audit information
  *
  * Description:
  * Create a new CIPSO_V4_MAP_TRANS DOI definition based on the given ADD
@@ -137,7 +138,8 @@ static int netlbl_cipsov4_add_common(struct genl_info *info,
  * non-zero on error.
  *
  */
-static int netlbl_cipsov4_add_std(struct genl_info *info)
+static int netlbl_cipsov4_add_std(struct genl_info *info,
+                                  struct netlbl_audit *audit_info)
 {
         int ret_val = -EINVAL;
         struct cipso_v4_doi *doi_def = NULL;
@@ -316,7 +318,7 @@ static int netlbl_cipsov4_add_std(struct genl_info *info)
                         }
         }
 
-        ret_val = cipso_v4_doi_add(doi_def);
+        ret_val = cipso_v4_doi_add(doi_def, audit_info);
         if (ret_val != 0)
                 goto add_std_failure;
         return 0;
@@ -330,6 +332,7 @@ add_std_failure:
 /**
  * netlbl_cipsov4_add_pass - Adds a CIPSO V4 DOI definition
  * @info: the Generic NETLINK info block
+ * @audit_info: NetLabel audit information
  *
  * Description:
  * Create a new CIPSO_V4_MAP_PASS DOI definition based on the given ADD message
@@ -337,7 +340,8 @@ add_std_failure:
  * error.
  *
  */
-static int netlbl_cipsov4_add_pass(struct genl_info *info)
+static int netlbl_cipsov4_add_pass(struct genl_info *info,
+                                   struct netlbl_audit *audit_info)
 {
         int ret_val;
         struct cipso_v4_doi *doi_def = NULL;
@@ -354,7 +358,7 @@ static int netlbl_cipsov4_add_pass(struct genl_info *info)
         if (ret_val != 0)
                 goto add_pass_failure;
 
-        ret_val = cipso_v4_doi_add(doi_def);
+        ret_val = cipso_v4_doi_add(doi_def, audit_info);
         if (ret_val != 0)
                 goto add_pass_failure;
         return 0;
@@ -367,6 +371,7 @@ add_pass_failure:
 /**
  * netlbl_cipsov4_add_local - Adds a CIPSO V4 DOI definition
  * @info: the Generic NETLINK info block
+ * @audit_info: NetLabel audit information
  *
  * Description:
  * Create a new CIPSO_V4_MAP_LOCAL DOI definition based on the given ADD
@@ -374,7 +379,8 @@ add_pass_failure:
  * non-zero on error.
  *
  */
-static int netlbl_cipsov4_add_local(struct genl_info *info)
+static int netlbl_cipsov4_add_local(struct genl_info *info,
+                                    struct netlbl_audit *audit_info)
 {
         int ret_val;
         struct cipso_v4_doi *doi_def = NULL;
@@ -391,7 +397,7 @@ static int netlbl_cipsov4_add_local(struct genl_info *info)
         if (ret_val != 0)
                 goto add_local_failure;
 
-        ret_val = cipso_v4_doi_add(doi_def);
+        ret_val = cipso_v4_doi_add(doi_def, audit_info);
         if (ret_val != 0)
                 goto add_local_failure;
         return 0;
@@ -415,48 +421,31 @@ static int netlbl_cipsov4_add(struct sk_buff *skb, struct genl_info *info)
 
 {
         int ret_val = -EINVAL;
-        u32 type;
-        u32 doi;
         const char *type_str = "(unknown)";
-        struct audit_buffer *audit_buf;
         struct netlbl_audit audit_info;
 
         if (!info->attrs[NLBL_CIPSOV4_A_DOI] ||
             !info->attrs[NLBL_CIPSOV4_A_MTYPE])
                 return -EINVAL;
 
-        doi = nla_get_u32(info->attrs[NLBL_CIPSOV4_A_DOI]);
         netlbl_netlink_auditinfo(skb, &audit_info);
-
-        type = nla_get_u32(info->attrs[NLBL_CIPSOV4_A_MTYPE]);
-        switch (type) {
+        switch (nla_get_u32(info->attrs[NLBL_CIPSOV4_A_MTYPE])) {
         case CIPSO_V4_MAP_TRANS:
                 type_str = "trans";
-                ret_val = netlbl_cipsov4_add_std(info);
+                ret_val = netlbl_cipsov4_add_std(info, &audit_info);
                 break;
         case CIPSO_V4_MAP_PASS:
                 type_str = "pass";
-                ret_val = netlbl_cipsov4_add_pass(info);
+                ret_val = netlbl_cipsov4_add_pass(info, &audit_info);
                 break;
         case CIPSO_V4_MAP_LOCAL:
                 type_str = "local";
-                ret_val = netlbl_cipsov4_add_local(info);
+                ret_val = netlbl_cipsov4_add_local(info, &audit_info);
                 break;
         }
         if (ret_val == 0)
                 atomic_inc(&netlabel_mgmt_protocount);
 
-        audit_buf = netlbl_audit_start_common(AUDIT_MAC_CIPSOV4_ADD,
-                                              &audit_info);
-        if (audit_buf != NULL) {
-                audit_log_format(audit_buf,
-                                 " cipso_doi=%u cipso_type=%s res=%u",
-                                 doi,
-                                 type_str,
-                                 ret_val == 0 ? 1 : 0);
-                audit_log_end(audit_buf);
-        }
-
         return ret_val;
 }
 
@@ -725,9 +714,7 @@ static int netlbl_cipsov4_remove_cb(struct netlbl_dom_map *entry, void *arg)
 static int netlbl_cipsov4_remove(struct sk_buff *skb, struct genl_info *info)
 {
         int ret_val = -EINVAL;
-        u32 doi = 0;
         struct netlbl_domhsh_walk_arg cb_arg;
-        struct audit_buffer *audit_buf;
         struct netlbl_audit audit_info;
         u32 skip_bkt = 0;
         u32 skip_chain = 0;
@@ -735,29 +722,17 @@ static int netlbl_cipsov4_remove(struct sk_buff *skb, struct genl_info *info)
         if (!info->attrs[NLBL_CIPSOV4_A_DOI])
                 return -EINVAL;
 
-        doi = nla_get_u32(info->attrs[NLBL_CIPSOV4_A_DOI]);
         netlbl_netlink_auditinfo(skb, &audit_info);
-
-        cb_arg.doi = doi;
+        cb_arg.doi = nla_get_u32(info->attrs[NLBL_CIPSOV4_A_DOI]);
         cb_arg.audit_info = &audit_info;
         ret_val = netlbl_domhsh_walk(&skip_bkt, &skip_chain,
                                      netlbl_cipsov4_remove_cb, &cb_arg);
         if (ret_val == 0 || ret_val == -ENOENT) {
-                ret_val = cipso_v4_doi_remove(doi, &audit_info);
+                ret_val = cipso_v4_doi_remove(cb_arg.doi, &audit_info);
                 if (ret_val == 0)
                         atomic_dec(&netlabel_mgmt_protocount);
         }
 
-        audit_buf = netlbl_audit_start_common(AUDIT_MAC_CIPSOV4_DEL,
-                                              &audit_info);
-        if (audit_buf != NULL) {
-                audit_log_format(audit_buf,
-                                 " cipso_doi=%u res=%u",
-                                 doi,
-                                 ret_val == 0 ? 1 : 0);
-                audit_log_end(audit_buf);
-        }
-
         return ret_val;
 }
 
diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c
index 5fadf10e5dd..7a10bbe02c1 100644
--- a/net/netlabel/netlabel_domainhash.c
+++ b/net/netlabel/netlabel_domainhash.c
@@ -483,6 +483,73 @@ int netlbl_domhsh_remove_entry(struct netlbl_dom_map *entry,
 }
 
 /**
+ * netlbl_domhsh_remove_af4 - Removes an address selector entry
+ * @domain: the domain
+ * @addr: IPv4 address
+ * @mask: IPv4 address mask
+ * @audit_info: NetLabel audit information
+ *
+ * Description:
+ * Removes an individual address selector from a domain mapping and potentially
+ * the entire mapping if it is empty.  Returns zero on success, negative values
+ * on failure.
+ *
+ */
+int netlbl_domhsh_remove_af4(const char *domain,
+                             const struct in_addr *addr,
+                             const struct in_addr *mask,
+                             struct netlbl_audit *audit_info)
+{
+        struct netlbl_dom_map *entry_map;
+        struct netlbl_af4list *entry_addr;
+        struct netlbl_af4list *iter4;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        struct netlbl_af6list *iter6;
+#endif /* IPv6 */
+        struct netlbl_domaddr4_map *entry;
+
+        rcu_read_lock();
+
+        if (domain)
+                entry_map = netlbl_domhsh_search(domain);
+        else
+                entry_map = netlbl_domhsh_search_def(domain);
+        if (entry_map == NULL || entry_map->type != NETLBL_NLTYPE_ADDRSELECT)
+                goto remove_af4_failure;
+
+        spin_lock(&netlbl_domhsh_lock);
+        entry_addr = netlbl_af4list_remove(addr->s_addr, mask->s_addr,
+                                           &entry_map->type_def.addrsel->list4);
+        spin_unlock(&netlbl_domhsh_lock);
+
+        if (entry_addr == NULL)
+                goto remove_af4_failure;
+        netlbl_af4list_foreach_rcu(iter4, &entry_map->type_def.addrsel->list4)
+                goto remove_af4_single_addr;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        netlbl_af6list_foreach_rcu(iter6, &entry_map->type_def.addrsel->list6)
+                goto remove_af4_single_addr;
+#endif /* IPv6 */
+        /* the domain mapping is empty so remove it from the mapping table */
+        netlbl_domhsh_remove_entry(entry_map, audit_info);
+
+remove_af4_single_addr:
+        rcu_read_unlock();
+        /* yick, we can't use call_rcu here because we don't have a rcu head
+         * pointer but hopefully this should be a rare case so the pause
+         * shouldn't be a problem */
+        synchronize_rcu();
+        entry = netlbl_domhsh_addr4_entry(entry_addr);
+        cipso_v4_doi_putdef(entry->type_def.cipsov4);
+        kfree(entry);
+        return 0;
+
+remove_af4_failure:
+        rcu_read_unlock();
+        return -ENOENT;
+}
+
+/**
  * netlbl_domhsh_remove - Removes an entry from the domain hash table
  * @domain: the domain to remove
  * @audit_info: NetLabel audit information
diff --git a/net/netlabel/netlabel_domainhash.h b/net/netlabel/netlabel_domainhash.h
index bfcb6763a1a..0261dda3f2d 100644
--- a/net/netlabel/netlabel_domainhash.h
+++ b/net/netlabel/netlabel_domainhash.h
@@ -90,6 +90,10 @@ int netlbl_domhsh_add_default(struct netlbl_dom_map *entry,
                               struct netlbl_audit *audit_info);
 int netlbl_domhsh_remove_entry(struct netlbl_dom_map *entry,
                                struct netlbl_audit *audit_info);
+int netlbl_domhsh_remove_af4(const char *domain,
+                             const struct in_addr *addr,
+                             const struct in_addr *mask,
+                             struct netlbl_audit *audit_info);
 int netlbl_domhsh_remove(const char *domain, struct netlbl_audit *audit_info);
 int netlbl_domhsh_remove_default(struct netlbl_audit *audit_info);
 struct netlbl_dom_map *netlbl_domhsh_getentry(const char *domain);
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index b32eceb3ab0..fd9229db075 100644
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -31,7 +31,10 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/audit.h>
+#include <linux/in.h>
+#include <linux/in6.h>
 #include <net/ip.h>
+#include <net/ipv6.h>
 #include <net/netlabel.h>
 #include <net/cipso_ipv4.h>
 #include <asm/bug.h>
@@ -42,6 +45,7 @@
 #include "netlabel_cipso_v4.h"
 #include "netlabel_user.h"
 #include "netlabel_mgmt.h"
+#include "netlabel_addrlist.h"
 
 /*
  * Configuration Functions
@@ -50,6 +54,9 @@
 /**
  * netlbl_cfg_map_del - Remove a NetLabel/LSM domain mapping
  * @domain: the domain mapping to remove
+ * @family: address family
+ * @addr: IP address
+ * @mask: IP address mask
  * @audit_info: NetLabel audit information
  *
  * Description:
@@ -58,14 +65,32 @@
  * values on failure.
  *
  */
-int netlbl_cfg_map_del(const char *domain, struct netlbl_audit *audit_info)
+int netlbl_cfg_map_del(const char *domain,
+                       u16 family,
+                       const void *addr,
+                       const void *mask,
+                       struct netlbl_audit *audit_info)
 {
-        return netlbl_domhsh_remove(domain, audit_info);
+        if (addr == NULL && mask == NULL) {
+                return netlbl_domhsh_remove(domain, audit_info);
+        } else if (addr != NULL && mask != NULL) {
+                switch (family) {
+                case AF_INET:
+                        return netlbl_domhsh_remove_af4(domain, addr, mask,
+                                                        audit_info);
+                default:
+                        return -EPFNOSUPPORT;
+                }
+        } else
+                return -EINVAL;
 }
 
 /**
- * netlbl_cfg_unlbl_add_map - Add an unlabeled NetLabel/LSM domain mapping
+ * netlbl_cfg_unlbl_map_add - Add a new unlabeled mapping
  * @domain: the domain mapping to add
+ * @family: address family
+ * @addr: IP address
+ * @mask: IP address mask
  * @audit_info: NetLabel audit information
  *
  * Description:
@@ -74,11 +99,19 @@ int netlbl_cfg_map_del(const char *domain, struct netlbl_audit *audit_info)
  * negative values on failure.
  *
  */
-int netlbl_cfg_unlbl_add_map(const char *domain,
+int netlbl_cfg_unlbl_map_add(const char *domain,
+                             u16 family,
+                             const void *addr,
+                             const void *mask,
                              struct netlbl_audit *audit_info)
 {
         int ret_val = -ENOMEM;
         struct netlbl_dom_map *entry;
+        struct netlbl_domaddr_map *addrmap = NULL;
+        struct netlbl_domaddr4_map *map4 = NULL;
+        struct netlbl_domaddr6_map *map6 = NULL;
+        const struct in_addr *addr4, *mask4;
+        const struct in6_addr *addr6, *mask6;
 
         entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
         if (entry == NULL)
@@ -86,49 +119,225 @@ int netlbl_cfg_unlbl_add_map(const char *domain,
         if (domain != NULL) {
                 entry->domain = kstrdup(domain, GFP_ATOMIC);
                 if (entry->domain == NULL)
-                        goto cfg_unlbl_add_map_failure;
+                        goto cfg_unlbl_map_add_failure;
+        }
+
+        if (addr == NULL && mask == NULL)
+                entry->type = NETLBL_NLTYPE_UNLABELED;
+        else if (addr != NULL && mask != NULL) {
+                addrmap = kzalloc(sizeof(*addrmap), GFP_ATOMIC);
+                if (addrmap == NULL)
+                        goto cfg_unlbl_map_add_failure;
+                INIT_LIST_HEAD(&addrmap->list4);
+                INIT_LIST_HEAD(&addrmap->list6);
+
+                switch (family) {
+                case AF_INET:
+                        addr4 = addr;
+                        mask4 = mask;
+                        map4 = kzalloc(sizeof(*map4), GFP_ATOMIC);
+                        if (map4 == NULL)
+                                goto cfg_unlbl_map_add_failure;
+                        map4->type = NETLBL_NLTYPE_UNLABELED;
+                        map4->list.addr = addr4->s_addr & mask4->s_addr;
+                        map4->list.mask = mask4->s_addr;
+                        map4->list.valid = 1;
+                        ret_val = netlbl_af4list_add(&map4->list,
+                                                     &addrmap->list4);
+                        if (ret_val != 0)
+                                goto cfg_unlbl_map_add_failure;
+                        break;
+                case AF_INET6:
+                        addr6 = addr;
+                        mask6 = mask;
+                        map6 = kzalloc(sizeof(*map6), GFP_ATOMIC);
+                        if (map4 == NULL)
+                                goto cfg_unlbl_map_add_failure;
+                        map6->type = NETLBL_NLTYPE_UNLABELED;
+                        ipv6_addr_copy(&map6->list.addr, addr6);
+                        map6->list.addr.s6_addr32[0] &= mask6->s6_addr32[0];
+                        map6->list.addr.s6_addr32[1] &= mask6->s6_addr32[1];
+                        map6->list.addr.s6_addr32[2] &= mask6->s6_addr32[2];
+                        map6->list.addr.s6_addr32[3] &= mask6->s6_addr32[3];
+                        ipv6_addr_copy(&map6->list.mask, mask6);
+                        map6->list.valid = 1;
+                        ret_val = netlbl_af4list_add(&map4->list,
+                                                     &addrmap->list4);
+                        if (ret_val != 0)
+                                goto cfg_unlbl_map_add_failure;
+                        break;
+                default:
+                        goto cfg_unlbl_map_add_failure;
+                        break;
+                }
+
+                entry->type_def.addrsel = addrmap;
+                entry->type = NETLBL_NLTYPE_ADDRSELECT;
+        } else {
+                ret_val = -EINVAL;
+                goto cfg_unlbl_map_add_failure;
         }
-        entry->type = NETLBL_NLTYPE_UNLABELED;
 
         ret_val = netlbl_domhsh_add(entry, audit_info);
         if (ret_val != 0)
-                goto cfg_unlbl_add_map_failure;
+                goto cfg_unlbl_map_add_failure;
 
         return 0;
 
-cfg_unlbl_add_map_failure:
+cfg_unlbl_map_add_failure:
         if (entry != NULL)
                 kfree(entry->domain);
         kfree(entry);
+        kfree(addrmap);
+        kfree(map4);
+        kfree(map6);
         return ret_val;
 }
 
+
+/**
+ * netlbl_cfg_unlbl_static_add - Adds a new static label
+ * @net: network namespace
+ * @dev_name: interface name
+ * @addr: IP address in network byte order (struct in[6]_addr)
+ * @mask: address mask in network byte order (struct in[6]_addr)
+ * @family: address family
+ * @secid: LSM secid value for the entry
+ * @audit_info: NetLabel audit information
+ *
+ * Description:
+ * Adds a new NetLabel static label to be used when protocol provided labels
+ * are not present on incoming traffic.  If @dev_name is NULL then the default
+ * interface will be used.  Returns zero on success, negative values on failure.
+ *
+ */
+int netlbl_cfg_unlbl_static_add(struct net *net,
+                                const char *dev_name,
+                                const void *addr,
+                                const void *mask,
+                                u16 family,
+                                u32 secid,
+                                struct netlbl_audit *audit_info)
+{
+        u32 addr_len;
+
+        switch (family) {
+        case AF_INET:
+                addr_len = sizeof(struct in_addr);
+                break;
+        case AF_INET6:
+                addr_len = sizeof(struct in6_addr);
+                break;
+        default:
+                return -EPFNOSUPPORT;
+        }
+
+        return netlbl_unlhsh_add(net,
+                                 dev_name, addr, mask, addr_len,
+                                 secid, audit_info);
+}
+
+/**
+ * netlbl_cfg_unlbl_static_del - Removes an existing static label
+ * @net: network namespace
+ * @dev_name: interface name
+ * @addr: IP address in network byte order (struct in[6]_addr)
+ * @mask: address mask in network byte order (struct in[6]_addr)
+ * @family: address family
+ * @secid: LSM secid value for the entry
+ * @audit_info: NetLabel audit information
+ *
+ * Description:
+ * Removes an existing NetLabel static label used when protocol provided labels
+ * are not present on incoming traffic.  If @dev_name is NULL then the default
+ * interface will be used.  Returns zero on success, negative values on failure.
+ *
+ */
+int netlbl_cfg_unlbl_static_del(struct net *net,
+                                const char *dev_name,
+                                const void *addr,
+                                const void *mask,
+                                u16 family,
+                                struct netlbl_audit *audit_info)
+{
+        u32 addr_len;
+
+        switch (family) {
+        case AF_INET:
+                addr_len = sizeof(struct in_addr);
+                break;
+        case AF_INET6:
+                addr_len = sizeof(struct in6_addr);
+                break;
+        default:
+                return -EPFNOSUPPORT;
+        }
+
+        return netlbl_unlhsh_remove(net,
+                                    dev_name, addr, mask, addr_len,
+                                    audit_info);
+}
+
+/**
+ * netlbl_cfg_cipsov4_add - Add a new CIPSOv4 DOI definition
+ * @doi_def: CIPSO DOI definition
+ * @audit_info: NetLabel audit information
+ *
+ * Description:
+ * Add a new CIPSO DOI definition as defined by @doi_def.  Returns zero on
+ * success and negative values on failure.
+ *
+ */
+int netlbl_cfg_cipsov4_add(struct cipso_v4_doi *doi_def,
+                           struct netlbl_audit *audit_info)
+{
+        return cipso_v4_doi_add(doi_def, audit_info);
+}
+
+/**
+ * netlbl_cfg_cipsov4_del - Remove an existing CIPSOv4 DOI definition
+ * @doi: CIPSO DOI
+ * @audit_info: NetLabel audit information
+ *
+ * Description:
+ * Remove an existing CIPSO DOI definition matching @doi.  Returns zero on
+ * success and negative values on failure.
+ *
+ */
+void netlbl_cfg_cipsov4_del(u32 doi, struct netlbl_audit *audit_info)
+{
+        cipso_v4_doi_remove(doi, audit_info);
+}
+
 /**
- * netlbl_cfg_cipsov4_add_map - Add a new CIPSOv4 DOI definition and mapping
- * @doi_def: the DOI definition
+ * netlbl_cfg_cipsov4_map_add - Add a new CIPSOv4 DOI mapping
+ * @doi: the CIPSO DOI
  * @domain: the domain mapping to add
+ * @addr: IP address
+ * @mask: IP address mask
  * @audit_info: NetLabel audit information
  *
  * Description:
- * Add a new CIPSOv4 DOI definition and NetLabel/LSM domain mapping for this
- * new DOI definition to the NetLabel subsystem.  A @domain value of NULL adds
- * a new default domain mapping.  Returns zero on success, negative values on
- * failure.
+ * Add a new NetLabel/LSM domain mapping for the given CIPSO DOI to the NetLabel
+ * subsystem.  A @domain value of NULL adds a new default domain mapping.
+ * Returns zero on success, negative values on failure.
  *
  */
-int netlbl_cfg_cipsov4_add_map(struct cipso_v4_doi *doi_def,
+int netlbl_cfg_cipsov4_map_add(u32 doi,
                                const char *domain,
+                               const struct in_addr *addr,
+                               const struct in_addr *mask,
                                struct netlbl_audit *audit_info)
 {
         int ret_val = -ENOMEM;
-        u32 doi;
-        u32 doi_type;
+        struct cipso_v4_doi *doi_def;
         struct netlbl_dom_map *entry;
-        const char *type_str;
-        struct audit_buffer *audit_buf;
+        struct netlbl_domaddr_map *addrmap = NULL;
+        struct netlbl_domaddr4_map *addrinfo = NULL;
 
-        doi = doi_def->doi;
-        doi_type = doi_def->type;
+        doi_def = cipso_v4_doi_getdef(doi);
+        if (doi_def == NULL)
+                return -ENOENT;
 
         entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
         if (entry == NULL)
@@ -136,56 +345,52 @@ int netlbl_cfg_cipsov4_add_map(struct cipso_v4_doi *doi_def,
         if (domain != NULL) {
                 entry->domain = kstrdup(domain, GFP_ATOMIC);
                 if (entry->domain == NULL)
-                        goto cfg_cipsov4_add_map_failure;
+                        goto cfg_cipsov4_map_add_failure;
         }
 
-        ret_val = cipso_v4_doi_add(doi_def);
-        if (ret_val != 0)
-                goto cfg_cipsov4_add_map_failure_remove_doi;
-        entry->type = NETLBL_NLTYPE_CIPSOV4;
-        entry->type_def.cipsov4 = cipso_v4_doi_getdef(doi);
-        if (entry->type_def.cipsov4 == NULL) {
-                ret_val = -ENOENT;
-                goto cfg_cipsov4_add_map_failure_remove_doi;
+        if (addr == NULL && mask == NULL) {
+                entry->type_def.cipsov4 = doi_def;
+                entry->type = NETLBL_NLTYPE_CIPSOV4;
+        } else if (addr != NULL && mask != NULL) {
+                addrmap = kzalloc(sizeof(*addrmap), GFP_ATOMIC);
+                if (addrmap == NULL)
+                        goto cfg_cipsov4_map_add_failure;
+                INIT_LIST_HEAD(&addrmap->list4);
+                INIT_LIST_HEAD(&addrmap->list6);
+
+                addrinfo = kzalloc(sizeof(*addrinfo), GFP_ATOMIC);
+                if (addrinfo == NULL)
+                        goto cfg_cipsov4_map_add_failure;
+                addrinfo->type_def.cipsov4 = doi_def;
+                addrinfo->type = NETLBL_NLTYPE_CIPSOV4;
+                addrinfo->list.addr = addr->s_addr & mask->s_addr;
+                addrinfo->list.mask = mask->s_addr;
+                addrinfo->list.valid = 1;
+                ret_val = netlbl_af4list_add(&addrinfo->list, &addrmap->list4);
+                if (ret_val != 0)
+                        goto cfg_cipsov4_map_add_failure;
+
+                entry->type_def.addrsel = addrmap;
+                entry->type = NETLBL_NLTYPE_ADDRSELECT;
+        } else {
+                ret_val = -EINVAL;
+                goto cfg_cipsov4_map_add_failure;
         }
+
         ret_val = netlbl_domhsh_add(entry, audit_info);
         if (ret_val != 0)
-                goto cfg_cipsov4_add_map_failure_release_doi;
-
-cfg_cipsov4_add_map_return:
-        audit_buf = netlbl_audit_start_common(AUDIT_MAC_CIPSOV4_ADD,
-                                              audit_info);
-        if (audit_buf != NULL) {
-                switch (doi_type) {
-                case CIPSO_V4_MAP_TRANS:
-                        type_str = "trans";
-                        break;
-                case CIPSO_V4_MAP_PASS:
-                        type_str = "pass";
-                        break;
-                case CIPSO_V4_MAP_LOCAL:
-                        type_str = "local";
-                        break;
-                default:
-                        type_str = "(unknown)";
-                }
-                audit_log_format(audit_buf,
-                                 " cipso_doi=%u cipso_type=%s res=%u",
-                                 doi, type_str, ret_val == 0 ? 1 : 0);
-                audit_log_end(audit_buf);
-        }
+                goto cfg_cipsov4_map_add_failure;
 
-        return ret_val;
+        return 0;
 
-cfg_cipsov4_add_map_failure_release_doi:
+cfg_cipsov4_map_add_failure:
         cipso_v4_doi_putdef(doi_def);
-cfg_cipsov4_add_map_failure_remove_doi:
-        cipso_v4_doi_remove(doi, audit_info);
-cfg_cipsov4_add_map_failure:
         if (entry != NULL)
                 kfree(entry->domain);
         kfree(entry);
-        goto cfg_cipsov4_add_map_return;
+        kfree(addrmap);
+        kfree(addrinfo);
+        return ret_val;
 }
 
 /*
@@ -691,6 +896,28 @@ int netlbl_cache_add(const struct sk_buff *skb,
 }
 
 /*
+ * Protocol Engine Functions
+ */
+
+/**
+ * netlbl_audit_start - Start an audit message
+ * @type: audit message type
+ * @audit_info: NetLabel audit information
+ *
+ * Description:
+ * Start an audit message using the type specified in @type and fill the audit
+ * message with some fields common to all NetLabel audit messages.  This
+ * function should only be used by protocol engines, not LSMs.  Returns a
+ * pointer to the audit buffer on success, NULL on failure.
+ *
+ */
+struct audit_buffer *netlbl_audit_start(int type,
+                                        struct netlbl_audit *audit_info)
+{
+        return netlbl_audit_start_common(type, audit_info);
+}
+
+/*
  * Setup Functions
  */
 
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index 8c030803217..f3c5c68c684 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -450,13 +450,13 @@ add_iface_failure:
  * success, negative values on failure.
  *
  */
-static int netlbl_unlhsh_add(struct net *net,
-                             const char *dev_name,
-                             const void *addr,
-                             const void *mask,
-                             u32 addr_len,
-                             u32 secid,
-                             struct netlbl_audit *audit_info)
+int netlbl_unlhsh_add(struct net *net,
+                      const char *dev_name,
+                      const void *addr,
+                      const void *mask,
+                      u32 addr_len,
+                      u32 secid,
+                      struct netlbl_audit *audit_info)
 {
         int ret_val;
         int ifindex;
@@ -720,12 +720,12 @@ unlhsh_condremove_failure:
  * Returns zero on success, negative values on failure.
  *
  */
-static int netlbl_unlhsh_remove(struct net *net,
-                                const char *dev_name,
-                                const void *addr,
-                                const void *mask,
-                                u32 addr_len,
-                                struct netlbl_audit *audit_info)
+int netlbl_unlhsh_remove(struct net *net,
+                         const char *dev_name,
+                         const void *addr,
+                         const void *mask,
+                         u32 addr_len,
+                         struct netlbl_audit *audit_info)
 {
         int ret_val;
         struct net_device *dev;
diff --git a/net/netlabel/netlabel_unlabeled.h b/net/netlabel/netlabel_unlabeled.h
index 06b1301ac07..7aba6359513 100644
--- a/net/netlabel/netlabel_unlabeled.h
+++ b/net/netlabel/netlabel_unlabeled.h
@@ -221,6 +221,21 @@ int netlbl_unlabel_genl_init(void);
 /* General Unlabeled init function */
 int netlbl_unlabel_init(u32 size);
 
+/* Static/Fallback label management functions */
+int netlbl_unlhsh_add(struct net *net,
+                      const char *dev_name,
+                      const void *addr,
+                      const void *mask,
+                      u32 addr_len,
+                      u32 secid,
+                      struct netlbl_audit *audit_info);
+int netlbl_unlhsh_remove(struct net *net,
+                         const char *dev_name,
+                         const void *addr,
+                         const void *mask,
+                         u32 addr_len,
+                         struct netlbl_audit *audit_info);
+
 /* Process Unlabeled incoming network packets */
 int netlbl_unlabel_getattr(const struct sk_buff *skb,
                            u16 family,