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

Commit aa5fa318 authored by Jan Engelhardt's avatar Jan Engelhardt
Browse files

netfilter: xtables: make use of caller family rather than match family 



The matches can have .family = NFPROTO_UNSPEC, and though that is not
the case for the touched modules, it seems better to just use the
nfproto from the caller.

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent 115bc8f2

net/netfilter/xt_dscp.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static bool tos_mt(const struct sk_buff *skb, const struct xt_match_param *par) 
{

	const struct xt_tos_match_info *info = par->matchinfo;



	if (par->match->family == NFPROTO_IPV4)

	if (par->family == NFPROTO_IPV4)

		return ((ip_hdr(skb)->tos & info->tos_mask) ==

		       info->tos_value) ^ !!info->invert;

	else

net/netfilter/xt_hashlimit.c

+5 −5
Original line number Diff line number Diff line
@@ -703,8 +703,8 @@ static bool hashlimit_mt_check_v0(const struct xt_mtchk_param *par) 
		return false;



	mutex_lock(&hashlimit_mutex);

	r->hinfo = htable_find_get(net, r->name, par->match->family);

	if (!r->hinfo && htable_create_v0(net, r, par->match->family) != 0) {

	r->hinfo = htable_find_get(net, r->name, par->family);

	if (!r->hinfo && htable_create_v0(net, r, par->family) != 0) {

		mutex_unlock(&hashlimit_mutex);

		return false;

	}
@@ -730,7 +730,7 @@ static bool hashlimit_mt_check(const struct xt_mtchk_param *par) 
		return false;

	if (info->name[sizeof(info->name)-1] != '\0')

		return false;

	if (par->match->family == NFPROTO_IPV4) {

	if (par->family == NFPROTO_IPV4) {

		if (info->cfg.srcmask > 32 || info->cfg.dstmask > 32)

			return false;

	} else {
@@ -739,8 +739,8 @@ static bool hashlimit_mt_check(const struct xt_mtchk_param *par) 
	}



	mutex_lock(&hashlimit_mutex);

	info->hinfo = htable_find_get(net, info->name, par->match->family);

	if (!info->hinfo && htable_create(net, info, par->match->family) != 0) {

	info->hinfo = htable_find_get(net, info->name, par->family);

	if (!info->hinfo && htable_create(net, info, par->family) != 0) {

		mutex_unlock(&hashlimit_mutex);

		return false;

	}

net/netfilter/xt_policy.c

+2 −2
Original line number Diff line number Diff line
@@ -116,9 +116,9 @@ policy_mt(const struct sk_buff *skb, const struct xt_match_param *par) 
	int ret;



	if (info->flags & XT_POLICY_MATCH_IN)

		ret = match_policy_in(skb, info, par->match->family);

		ret = match_policy_in(skb, info, par->family);

	else

		ret = match_policy_out(skb, info, par->match->family);

		ret = match_policy_out(skb, info, par->family);



	if (ret < 0)

		ret = info->flags & XT_POLICY_MATCH_NONE ? true : false;

net/netfilter/xt_recent.c

+3 −3
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ recent_mt(const struct sk_buff *skb, const struct xt_match_param *par) 
	u_int8_t ttl;

	bool ret = info->invert;



	if (par->match->family == NFPROTO_IPV4) {

	if (par->family == NFPROTO_IPV4) {

		const struct iphdr *iph = ip_hdr(skb);



		if (info->side == XT_RECENT_DEST)
@@ -259,12 +259,12 @@ recent_mt(const struct sk_buff *skb, const struct xt_match_param *par) 


	spin_lock_bh(&recent_lock);

	t = recent_table_lookup(recent_net, info->name);

	e = recent_entry_lookup(t, &addr, par->match->family,

	e = recent_entry_lookup(t, &addr, par->family,

				(info->check_set & XT_RECENT_TTL) ? ttl : 0);

	if (e == NULL) {

		if (!(info->check_set & XT_RECENT_SET))

			goto out;

		e = recent_entry_init(t, &addr, par->match->family, ttl);

		e = recent_entry_init(t, &addr, par->family, ttl);

		if (e == NULL)

			*par->hotdrop = true;

		ret = !ret;

net/netfilter/xt_state.c

+3 −3
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ state_mt(const struct sk_buff *skb, const struct xt_match_param *par) 


static bool state_mt_check(const struct xt_mtchk_param *par)

{

	if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {

	if (nf_ct_l3proto_try_module_get(par->family) < 0) {

		printk(KERN_WARNING "can't load conntrack support for "

				    "proto=%u\n", par->match->family);

				    "proto=%u\n", par->family);

		return false;

	}

	return true;
@@ -49,7 +49,7 @@ static bool state_mt_check(const struct xt_mtchk_param *par) 


static void state_mt_destroy(const struct xt_mtdtor_param *par)

{

	nf_ct_l3proto_module_put(par->match->family);

	nf_ct_l3proto_module_put(par->family);

}



static struct xt_match state_mt_reg[] __read_mostly = {