Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61e10682 authored by Paul Moore's avatar Paul Moore
Browse files

netlabel: Add a generic way to create ordered linked lists of network addrs 



Create an ordered IP address linked list mechanism similar to the core
kernel's linked list construct.  The idea behind this list functionality
is to create an extensibile linked list ordered by IP address mask to
ease the matching of network addresses.  The linked list is ordered with
larger address masks at the front of the list and shorter address masks
at the end to facilitate overriding network entries with individual host
or subnet entries.

Signed-off-by: default avatarPaul Moore <paul.moore@hp.com>
Reviewed-by: default avatarJames Morris <jmorris@namei.org>
parent b1edeb10

net/netlabel/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
#



# base objects

obj-y	:= netlabel_user.o netlabel_kapi.o netlabel_domainhash.o

obj-y	:= netlabel_user.o netlabel_kapi.o

obj-y	+= netlabel_domainhash.o netlabel_addrlist.o



# management objects

obj-y	+= netlabel_mgmt.o

net/netlabel/netlabel_addrlist.c

0 → 100644
+258 −0
Original line number Diff line number Diff line 
/*

 * NetLabel Network Address Lists

 *

 * This file contains network address list functions used to manage ordered

 * lists of network addresses for use by the NetLabel subsystem.  The NetLabel

 * system manages static and dynamic label mappings for network protocols such

 * as CIPSO and RIPSO.

 *

 * Author: Paul Moore <paul.moore@hp.com>

 *

 */



/*

 * (c) Copyright Hewlett-Packard Development Company, L.P., 2008

 *

 * This program is free software;  you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY;  without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See

 * the GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program;  if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 *

 */



#include <linux/types.h>

#include <linux/rcupdate.h>

#include <linux/list.h>

#include <linux/spinlock.h>

#include <linux/in.h>

#include <linux/in6.h>

#include <linux/ip.h>

#include <linux/ipv6.h>

#include <net/ip.h>

#include <net/ipv6.h>



#include "netlabel_addrlist.h"



/*

 * Address List Functions

 */



/**

 * netlbl_af4list_search - Search for a matching IPv4 address entry

 * @addr: IPv4 address

 * @head: the list head

 *

 * Description:

 * Searches the IPv4 address list given by @head.  If a matching address entry

 * is found it is returned, otherwise NULL is returned.  The caller is

 * responsible for calling the rcu_read_[un]lock() functions.

 *

 */

struct netlbl_af4list *netlbl_af4list_search(__be32 addr,

					     struct list_head *head)

{

	struct netlbl_af4list *iter;



	list_for_each_entry_rcu(iter, head, list)

		if (iter->valid && (addr & iter->mask) == iter->addr)

			return iter;



	return NULL;

}



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

/**

 * netlbl_af6list_search - Search for a matching IPv6 address entry

 * @addr: IPv6 address

 * @head: the list head

 *

 * Description:

 * Searches the IPv6 address list given by @head.  If a matching address entry

 * is found it is returned, otherwise NULL is returned.  The caller is

 * responsible for calling the rcu_read_[un]lock() functions.

 *

 */

struct netlbl_af6list *netlbl_af6list_search(const struct in6_addr *addr,

					     struct list_head *head)

{

	struct netlbl_af6list *iter;



	list_for_each_entry_rcu(iter, head, list)

		if (iter->valid &&

		    ipv6_masked_addr_cmp(&iter->addr, &iter->mask, addr) == 0)

			return iter;



	return NULL;

}

#endif /* IPv6 */



/**

 * netlbl_af4list_add - Add a new IPv4 address entry to a list

 * @entry: address entry

 * @head: the list head

 *

 * Description:

 * Add a new address entry to the list pointed to by @head.  On success zero is

 * returned, otherwise a negative value is returned.  The caller is responsible

 * for calling the necessary locking functions.

 *

 */

int netlbl_af4list_add(struct netlbl_af4list *entry, struct list_head *head)

{

	struct netlbl_af4list *iter;



	iter = netlbl_af4list_search(entry->addr, head);

	if (iter != NULL &&

	    iter->addr == entry->addr && iter->mask == entry->mask)

		return -EEXIST;



	/* in order to speed up address searches through the list (the common

	 * case) we need to keep the list in order based on the size of the

	 * address mask such that the entry with the widest mask (smallest

	 * numerical value) appears first in the list */

	list_for_each_entry_rcu(iter, head, list)

		if (iter->valid &&

		    ntohl(entry->mask) > ntohl(iter->mask)) {

			__list_add_rcu(&entry->list,

				       iter->list.prev,

				       &iter->list);

			return 0;

		}

	list_add_tail_rcu(&entry->list, head);

	return 0;

}



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

/**

 * netlbl_af6list_add - Add a new IPv6 address entry to a list

 * @entry: address entry

 * @head: the list head

 *

 * Description:

 * Add a new address entry to the list pointed to by @head.  On success zero is

 * returned, otherwise a negative value is returned.  The caller is responsible

 * for calling the necessary locking functions.

 *

 */

int netlbl_af6list_add(struct netlbl_af6list *entry, struct list_head *head)

{

	struct netlbl_af6list *iter;



	iter = netlbl_af6list_search(&entry->addr, head);

	if (iter != NULL &&

	    ipv6_addr_equal(&iter->addr, &entry->addr) &&

	    ipv6_addr_equal(&iter->mask, &entry->mask))

		return -EEXIST;



	/* in order to speed up address searches through the list (the common

	 * case) we need to keep the list in order based on the size of the

	 * address mask such that the entry with the widest mask (smallest

	 * numerical value) appears first in the list */

	list_for_each_entry_rcu(iter, head, list)

		if (iter->valid &&

		    ipv6_addr_cmp(&entry->mask, &iter->mask) > 0) {

			__list_add_rcu(&entry->list,

				       iter->list.prev,

				       &iter->list);

			return 0;

		}

	list_add_tail_rcu(&entry->list, head);

	return 0;

}

#endif /* IPv6 */



/**

 * netlbl_af4list_remove_entry - Remove an IPv4 address entry

 * @entry: address entry

 *

 * Description:

 * Remove the specified IP address entry.  The caller is responsible for

 * calling the necessary locking functions.

 *

 */

void netlbl_af4list_remove_entry(struct netlbl_af4list *entry)

{

	entry->valid = 0;

	list_del_rcu(&entry->list);

}



/**

 * netlbl_af4list_remove - Remove an IPv4 address entry

 * @addr: IP address

 * @mask: IP address mask

 * @head: the list head

 *

 * Description:

 * Remove an IP address entry from the list pointed to by @head.  Returns the

 * entry on success, NULL on failure.  The caller is responsible for calling

 * the necessary locking functions.

 *

 */

struct netlbl_af4list *netlbl_af4list_remove(__be32 addr, __be32 mask,

					     struct list_head *head)

{

	struct netlbl_af4list *entry;



	entry = netlbl_af4list_search(addr, head);

	if (entry != NULL && entry->addr == addr && entry->mask == mask) {

		netlbl_af4list_remove_entry(entry);

		return entry;

	}



	return NULL;

}



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

/**

 * netlbl_af6list_remove_entry - Remove an IPv6 address entry

 * @entry: address entry

 *

 * Description:

 * Remove the specified IP address entry.  The caller is responsible for

 * calling the necessary locking functions.

 *

 */

void netlbl_af6list_remove_entry(struct netlbl_af6list *entry)

{

	entry->valid = 0;

	list_del_rcu(&entry->list);

}



/**

 * netlbl_af6list_remove - Remove an IPv6 address entry

 * @addr: IP address

 * @mask: IP address mask

 * @head: the list head

 *

 * Description:

 * Remove an IP address entry from the list pointed to by @head.  Returns the

 * entry on success, NULL on failure.  The caller is responsible for calling

 * the necessary locking functions.

 *

 */

struct netlbl_af6list *netlbl_af6list_remove(const struct in6_addr *addr,

					     const struct in6_addr *mask,

					     struct list_head *head)

{

	struct netlbl_af6list *entry;



	entry = netlbl_af6list_search(addr, head);

	if (entry != NULL &&

	    ipv6_addr_equal(&entry->addr, addr) &&

	    ipv6_addr_equal(&entry->mask, mask)) {

		netlbl_af6list_remove_entry(entry);

		return entry;

	}



	return NULL;

}

#endif /* IPv6 */

net/netlabel/netlabel_addrlist.h

0 → 100644
+174 −0
Original line number Diff line number Diff line 
/*

 * NetLabel Network Address Lists

 *

 * This file contains network address list functions used to manage ordered

 * lists of network addresses for use by the NetLabel subsystem.  The NetLabel

 * system manages static and dynamic label mappings for network protocols such

 * as CIPSO and RIPSO.

 *

 * Author: Paul Moore <paul.moore@hp.com>

 *

 */



/*

 * (c) Copyright Hewlett-Packard Development Company, L.P., 2008

 *

 * This program is free software;  you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY;  without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See

 * the GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program;  if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 *

 */



#ifndef _NETLABEL_ADDRLIST_H

#define _NETLABEL_ADDRLIST_H



#include <linux/types.h>

#include <linux/rcupdate.h>

#include <linux/list.h>

#include <linux/in6.h>



/**

 * struct netlbl_af4list - NetLabel IPv4 address list

 * @addr: IPv4 address

 * @mask: IPv4 address mask

 * @valid: valid flag

 * @list: list structure, used internally

 */

struct netlbl_af4list {

	__be32 addr;

	__be32 mask;



	u32 valid;

	struct list_head list;

};



/**

 * struct netlbl_af6list - NetLabel IPv6 address list

 * @addr: IPv6 address

 * @mask: IPv6 address mask

 * @valid: valid flag

 * @list: list structure, used internally

 */

struct netlbl_af6list {

	struct in6_addr addr;

	struct in6_addr mask;



	u32 valid;

	struct list_head list;

};



#define __af4list_entry(ptr) container_of(ptr, struct netlbl_af4list, list)



static inline struct netlbl_af4list *__af4list_valid(struct list_head *s,

						     struct list_head *h)

{

	struct list_head *i = s;

	struct netlbl_af4list *n = __af4list_entry(s);

	while (i != h && !n->valid) {

		i = i->next;

		n = __af4list_entry(i);

	}

	return n;

}



static inline struct netlbl_af4list *__af4list_valid_rcu(struct list_head *s,

							 struct list_head *h)

{

	struct list_head *i = s;

	struct netlbl_af4list *n = __af4list_entry(s);

	while (i != h && !n->valid) {

		i = rcu_dereference(i->next);

		n = __af4list_entry(i);

	}

	return n;

}



#define netlbl_af4list_foreach(iter, head)				\

	for (iter = __af4list_valid((head)->next, head);		\

	     prefetch(iter->list.next), &iter->list != (head);		\

	     iter = __af4list_valid(iter->list.next, head))



#define netlbl_af4list_foreach_rcu(iter, head)				\

	for (iter = __af4list_valid_rcu((head)->next, head);		\

	     prefetch(iter->list.next),	&iter->list != (head);		\

	     iter = __af4list_valid_rcu(iter->list.next, head))



#define netlbl_af4list_foreach_safe(iter, tmp, head)			\

	for (iter = __af4list_valid((head)->next, head),		\

		     tmp = __af4list_valid(iter->list.next, head);	\

	     &iter->list != (head);					\

	     iter = tmp, tmp = __af4list_valid(iter->list.next, head))



int netlbl_af4list_add(struct netlbl_af4list *entry,

		       struct list_head *head);

struct netlbl_af4list *netlbl_af4list_remove(__be32 addr, __be32 mask,

					     struct list_head *head);

void netlbl_af4list_remove_entry(struct netlbl_af4list *entry);

struct netlbl_af4list *netlbl_af4list_search(__be32 addr,

					     struct list_head *head);



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)



#define __af6list_entry(ptr) container_of(ptr, struct netlbl_af6list, list)



static inline struct netlbl_af6list *__af6list_valid(struct list_head *s,

						     struct list_head *h)

{

	struct list_head *i = s;

	struct netlbl_af6list *n = __af6list_entry(s);

	while (i != h && !n->valid) {

		i = i->next;

		n = __af6list_entry(i);

	}

	return n;

}



static inline struct netlbl_af6list *__af6list_valid_rcu(struct list_head *s,

							 struct list_head *h)

{

	struct list_head *i = s;

	struct netlbl_af6list *n = __af6list_entry(s);

	while (i != h && !n->valid) {

		i = rcu_dereference(i->next);

		n = __af6list_entry(i);

	}

	return n;

}



#define netlbl_af6list_foreach(iter, head)				\

	for (iter = __af6list_valid((head)->next, head);		\

	     prefetch(iter->list.next),	&iter->list != (head);		\

	     iter = __af6list_valid(iter->list.next, head))



#define netlbl_af6list_foreach_rcu(iter, head)				\

	for (iter = __af6list_valid_rcu((head)->next, head);		\

	     prefetch(iter->list.next),	&iter->list != (head);		\

	     iter = __af6list_valid_rcu(iter->list.next, head))



#define netlbl_af6list_foreach_safe(iter, tmp, head)			\

	for (iter = __af6list_valid((head)->next, head),		\

		     tmp = __af6list_valid(iter->list.next, head);	\

	     &iter->list != (head);					\

	     iter = tmp, tmp = __af6list_valid(iter->list.next, head))



int netlbl_af6list_add(struct netlbl_af6list *entry,

		       struct list_head *head);

struct netlbl_af6list *netlbl_af6list_remove(const struct in6_addr *addr,

					     const struct in6_addr *mask,

					     struct list_head *head);

void netlbl_af6list_remove_entry(struct netlbl_af6list *entry);

struct netlbl_af6list *netlbl_af6list_search(const struct in6_addr *addr,

					     struct list_head *head);

#endif /* IPV6 */



#endif

net/netlabel/netlabel_unlabeled.c

+135 −215

File changed.

Preview size limit exceeded, changes collapsed.