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

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

Merge branch 'master' of git://1984.lsi.us.es/nf 



Pablo Neira Ayuso says:

====================
* One to get the timeout special parameter for the SET target back working
  (this was introduced while trying to fix another bug in 3.4) from
  Jozsef Kadlecsik.

* One crash fix if containers and nf_conntrack are used reported by Hans
  Schillstrom by myself.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 054581e6 6bd0405b

include/net/netfilter/nf_conntrack_ecache.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct) 
	struct net *net = nf_ct_net(ct);

	struct nf_conntrack_ecache *e;



	if (net->ct.nf_conntrack_event_cb == NULL)

	if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb))

		return;



	e = nf_ct_ecache_find(ct);

net/netfilter/xt_set.c

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include <linux/netfilter/x_tables.h>

#include <linux/netfilter/xt_set.h>

#include <linux/netfilter/ipset/ip_set_timeout.h>



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
@@ -310,7 +311,8 @@ set_target_v2(struct sk_buff *skb, const struct xt_action_param *par) 
		info->del_set.flags, 0, UINT_MAX);



	/* Normalize to fit into jiffies */

	if (add_opt.timeout > UINT_MAX/MSEC_PER_SEC)

	if (add_opt.timeout != IPSET_NO_TIMEOUT &&

	    add_opt.timeout > UINT_MAX/MSEC_PER_SEC)

		add_opt.timeout = UINT_MAX/MSEC_PER_SEC;

	if (info->add_set.index != IPSET_INVALID_ID)

		ip_set_add(info->add_set.index, skb, par, &add_opt);