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

Commit 38bdbd8e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

parents 773c3e75 6b4ff2d7

net/ipv4/netfilter/arp_tables.c

+14 −9
Original line number Diff line number Diff line
@@ -644,7 +644,9 @@ static int translate_table(struct xt_table_info *newinfo, void *entry0, 
	/* Walk through entries, checking offsets. */

	xt_entry_foreach(iter, entry0, newinfo->size) {

		ret = check_entry_size_and_hooks(iter, newinfo, entry0,

		      entry0 + repl->size, repl->hook_entry, repl->underflow,

						 entry0 + repl->size,

						 repl->hook_entry,

						 repl->underflow,

						 repl->valid_hooks);

		if (ret != 0)

			break;
@@ -1356,7 +1358,10 @@ static int translate_compat_table(const char *name, 
	/* Walk through entries, checking offsets. */

	xt_entry_foreach(iter0, entry0, total_size) {

		ret = check_compat_entry_size_and_hooks(iter0, info, &size,

		      entry0, entry0 + total_size, hook_entries, underflows,

							entry0,

							entry0 + total_size,

							hook_entries,

							underflows,

							name);

		if (ret != 0)

			goto out_unlock;
@@ -1401,8 +1406,8 @@ static int translate_compat_table(const char *name, 
	pos = entry1;

	size = total_size;

	xt_entry_foreach(iter0, entry0, total_size) {

		ret = compat_copy_entry_from_user(iter0, &pos,

		      &size, name, newinfo, entry1);

		ret = compat_copy_entry_from_user(iter0, &pos, &size,

						  name, newinfo, entry1);

		if (ret != 0)

			break;

	}

net/ipv4/netfilter/ip_tables.c

+15 −10
Original line number Diff line number Diff line
@@ -836,7 +836,9 @@ translate_table(struct net *net, struct xt_table_info *newinfo, void *entry0, 
	/* Walk through entries, checking offsets. */

	xt_entry_foreach(iter, entry0, newinfo->size) {

		ret = check_entry_size_and_hooks(iter, newinfo, entry0,

		      entry0 + repl->size, repl->hook_entry, repl->underflow,

						 entry0 + repl->size,

						 repl->hook_entry,

						 repl->underflow,

						 repl->valid_hooks);

		if (ret != 0)

			return ret;
@@ -1701,7 +1703,10 @@ translate_compat_table(struct net *net, 
	/* Walk through entries, checking offsets. */

	xt_entry_foreach(iter0, entry0, total_size) {

		ret = check_compat_entry_size_and_hooks(iter0, info, &size,

		      entry0, entry0 + total_size, hook_entries, underflows,

							entry0,

							entry0 + total_size,

							hook_entries,

							underflows,

							name);

		if (ret != 0)

			goto out_unlock;
@@ -1746,8 +1751,8 @@ translate_compat_table(struct net *net, 
	pos = entry1;

	size = total_size;

	xt_entry_foreach(iter0, entry0, total_size) {

		ret = compat_copy_entry_from_user(iter0, &pos,

		      &size, name, newinfo, entry1);

		ret = compat_copy_entry_from_user(iter0, &pos, &size,

						  name, newinfo, entry1);

		if (ret != 0)

			break;

	}

net/ipv6/netfilter/ip6_tables.c

+15 −10
Original line number Diff line number Diff line
@@ -866,7 +866,9 @@ translate_table(struct net *net, struct xt_table_info *newinfo, void *entry0, 
	/* Walk through entries, checking offsets. */

	xt_entry_foreach(iter, entry0, newinfo->size) {

		ret = check_entry_size_and_hooks(iter, newinfo, entry0,

		      entry0 + repl->size, repl->hook_entry, repl->underflow,

						 entry0 + repl->size,

						 repl->hook_entry,

						 repl->underflow,

						 repl->valid_hooks);

		if (ret != 0)

			return ret;
@@ -1734,7 +1736,10 @@ translate_compat_table(struct net *net, 
	/* Walk through entries, checking offsets. */

	xt_entry_foreach(iter0, entry0, total_size) {

		ret = check_compat_entry_size_and_hooks(iter0, info, &size,

		      entry0, entry0 + total_size, hook_entries, underflows,

							entry0,

							entry0 + total_size,

							hook_entries,

							underflows,

							name);

		if (ret != 0)

			goto out_unlock;
@@ -1779,8 +1784,8 @@ translate_compat_table(struct net *net, 
	pos = entry1;

	size = total_size;

	xt_entry_foreach(iter0, entry0, total_size) {

		ret = compat_copy_entry_from_user(iter0, &pos,

		      &size, name, newinfo, entry1);

		ret = compat_copy_entry_from_user(iter0, &pos, &size,

						  name, newinfo, entry1);

		if (ret != 0)

			break;

	}

net/netfilter/ipvs/ip_vs_lblcr.c

+21 −23
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <linux/kernel.h>

#include <linux/skbuff.h>

#include <linux/jiffies.h>

#include <linux/list.h>



/* for sysctl */

#include <linux/fs.h>
@@ -85,25 +86,25 @@ static int sysctl_ip_vs_lblcr_expiration = 24*60*60*HZ; 
/*

 *      IPVS destination set structure and operations

 */

struct ip_vs_dest_list {

	struct ip_vs_dest_list  *next;          /* list link */

struct ip_vs_dest_set_elem {

	struct list_head	list;          /* list link */

	struct ip_vs_dest       *dest;          /* destination server */

};



struct ip_vs_dest_set {

	atomic_t                size;           /* set size */

	unsigned long           lastmod;        /* last modified time */

	struct ip_vs_dest_list  *list;          /* destination list */

	struct list_head	list;           /* destination list */

	rwlock_t	        lock;           /* lock for this list */

};





static struct ip_vs_dest_list *

static struct ip_vs_dest_set_elem *

ip_vs_dest_set_insert(struct ip_vs_dest_set *set, struct ip_vs_dest *dest)

{

	struct ip_vs_dest_list *e;

	struct ip_vs_dest_set_elem *e;



	for (e=set->list; e!=NULL; e=e->next) {

	list_for_each_entry(e, &set->list, list) {

		if (e->dest == dest)

			/* already existed */

			return NULL;
@@ -118,9 +119,7 @@ ip_vs_dest_set_insert(struct ip_vs_dest_set *set, struct ip_vs_dest *dest) 
	atomic_inc(&dest->refcnt);

	e->dest = dest;



	/* link it to the list */

	e->next = set->list;

	set->list = e;

	list_add(&e->list, &set->list);

	atomic_inc(&set->size);



	set->lastmod = jiffies;
@@ -130,34 +129,33 @@ ip_vs_dest_set_insert(struct ip_vs_dest_set *set, struct ip_vs_dest *dest) 
static void

ip_vs_dest_set_erase(struct ip_vs_dest_set *set, struct ip_vs_dest *dest)

{

	struct ip_vs_dest_list *e, **ep;

	struct ip_vs_dest_set_elem *e;



	for (ep=&set->list, e=*ep; e!=NULL; e=*ep) {

	list_for_each_entry(e, &set->list, list) {

		if (e->dest == dest) {

			/* HIT */

			*ep = e->next;

			atomic_dec(&set->size);

			set->lastmod = jiffies;

			atomic_dec(&e->dest->refcnt);

			list_del(&e->list);

			kfree(e);

			break;

		}

		ep = &e->next;

	}

}



static void ip_vs_dest_set_eraseall(struct ip_vs_dest_set *set)

{

	struct ip_vs_dest_list *e, **ep;

	struct ip_vs_dest_set_elem *e, *ep;



	write_lock(&set->lock);

	for (ep=&set->list, e=*ep; e!=NULL; e=*ep) {

		*ep = e->next;

	list_for_each_entry_safe(e, ep, &set->list, list) {

		/*

		 * We don't kfree dest because it is refered either

		 * by its service or by the trash dest list.

		 */

		atomic_dec(&e->dest->refcnt);

		list_del(&e->list);

		kfree(e);

	}

	write_unlock(&set->lock);
@@ -166,7 +164,7 @@ static void ip_vs_dest_set_eraseall(struct ip_vs_dest_set *set) 
/* get weighted least-connection node in the destination set */

static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set)

{

	register struct ip_vs_dest_list *e;

	register struct ip_vs_dest_set_elem *e;

	struct ip_vs_dest *dest, *least;

	int loh, doh;
@@ -174,7 +172,7 @@ static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set) 
		return NULL;



	/* select the first destination server, whose weight > 0 */

	for (e=set->list; e!=NULL; e=e->next) {

	list_for_each_entry(e, &set->list, list) {

		least = e->dest;

		if (least->flags & IP_VS_DEST_F_OVERLOAD)

			continue;
@@ -190,7 +188,7 @@ static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set) 


	/* find the destination with the weighted least load */

  nextstage:

	for (e=e->next; e!=NULL; e=e->next) {

	list_for_each_entry(e, &set->list, list) {

		dest = e->dest;

		if (dest->flags & IP_VS_DEST_F_OVERLOAD)

			continue;
@@ -220,7 +218,7 @@ static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set) 
/* get weighted most-connection node in the destination set */

static inline struct ip_vs_dest *ip_vs_dest_set_max(struct ip_vs_dest_set *set)

{

	register struct ip_vs_dest_list *e;

	register struct ip_vs_dest_set_elem *e;

	struct ip_vs_dest *dest, *most;

	int moh, doh;
@@ -228,7 +226,7 @@ static inline struct ip_vs_dest *ip_vs_dest_set_max(struct ip_vs_dest_set *set) 
		return NULL;



	/* select the first destination server, whose weight > 0 */

	for (e=set->list; e!=NULL; e=e->next) {

	list_for_each_entry(e, &set->list, list) {

		most = e->dest;

		if (atomic_read(&most->weight) > 0) {

			moh = atomic_read(&most->activeconns) * 50
@@ -240,7 +238,7 @@ static inline struct ip_vs_dest *ip_vs_dest_set_max(struct ip_vs_dest_set *set) 


	/* find the destination with the weighted most load */

  nextstage:

	for (e=e->next; e!=NULL; e=e->next) {

	list_for_each_entry(e, &set->list, list) {

		dest = e->dest;

		doh = atomic_read(&dest->activeconns) * 50

			+ atomic_read(&dest->inactconns);
@@ -389,7 +387,7 @@ ip_vs_lblcr_new(struct ip_vs_lblcr_table *tbl, const union nf_inet_addr *daddr, 


		/* initilize its dest set */

		atomic_set(&(en->set.size), 0);

		en->set.list = NULL;

		INIT_LIST_HEAD(&en->set.list);

		rwlock_init(&en->set.lock);



		ip_vs_lblcr_hash(tbl, en);

net/netfilter/nfnetlink_log.c

+1 −1
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb, 
			}



			instance_destroy(inst);

			goto out;

			goto out_put;

		default:

			ret = -ENOTSUPP;

			break;