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

Commit eeb4cb95 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: xt_CT: fix assignation of the generic protocol tracker 



`iptables -p all' uses 0 to match all protocols, while the conntrack
subsystem uses 255. We still need `-p all' to attach the custom
timeout policies for the generic protocol tracker.

Moreover, we may use `iptables -p sctp' while the SCTP tracker is
not loaded. In that case, we have to default on the generic protocol
tracker.

Another possibility is `iptables -p ip' that should be supported
as well. This patch makes sure we validate all possible scenarios.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1ac0bf99

net/netfilter/xt_CT.c

+8 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/netfilter/x_tables.h>

#include <linux/netfilter/xt_CT.h>

#include <net/netfilter/nf_conntrack.h>

#include <net/netfilter/nf_conntrack_l4proto.h>

#include <net/netfilter/nf_conntrack_helper.h>

#include <net/netfilter/nf_conntrack_ecache.h>

#include <net/netfilter/nf_conntrack_l4proto.h>
@@ -224,6 +225,7 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par) 


		if (timeout_find_get) {

			const struct ipt_entry *e = par->entryinfo;

			struct nf_conntrack_l4proto *l4proto;



			if (e->ip.invflags & IPT_INV_PROTO) {

				ret = -EINVAL;
@@ -245,7 +247,12 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par) 
					info->timeout, timeout->l3num);

				goto err4;

			}

			if (timeout->l4proto->l4proto != e->ip.proto) {

			/* Make sure the timeout policy matches any existing

			 * protocol tracker, otherwise default to generic.

			 */

			l4proto = __nf_ct_l4proto_find(par->family,

						       e->ip.proto);

			if (timeout->l4proto->l4proto != l4proto->l4proto) {

				ret = -EINVAL;

				pr_info("Timeout policy `%s' can only be "

					"used by L4 protocol number %d\n",