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

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

netfilter: xtables: change matches to return error code 



The following semantic patch does part of the transformation:
// <smpl>
@ rule1 @
struct xt_match ops;
identifier check;
@@
 ops.checkentry = check;

@@
identifier rule1.check;
@@
 check(...) { <...
-return true;
+return 0;
 ...> }

@@
identifier rule1.check;
@@
 check(...) { <...
-return false;
+return -EINVAL;
 ...> }
// </smpl>

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

net/bridge/netfilter/ebt_802_3.c

+2 −2
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ static int ebt_802_3_mt_check(const struct xt_mtchk_param *par) 
	const struct ebt_802_3_info *info = par->matchinfo;



	if (info->bitmask & ~EBT_802_3_MASK || info->invflags & ~EBT_802_3_MASK)

		return false;

		return -EINVAL;



	return true;

	return 0;

}



static struct xt_match ebt_802_3_mt_reg __read_mostly = {

net/bridge/netfilter/ebt_among.c

+4 −4
Original line number Diff line number Diff line
@@ -190,17 +190,17 @@ static int ebt_among_mt_check(const struct xt_mtchk_param *par) 
		pr_info("wrong size: %d against expected %d, rounded to %Zd\n",

			em->match_size, expected_length,

			EBT_ALIGN(expected_length));

		return false;

		return -EINVAL;

	}

	if (wh_dst && (err = ebt_mac_wormhash_check_integrity(wh_dst))) {

		pr_info("dst integrity fail: %x\n", -err);

		return false;

		return -EINVAL;

	}

	if (wh_src && (err = ebt_mac_wormhash_check_integrity(wh_src))) {

		pr_info("src integrity fail: %x\n", -err);

		return false;

		return -EINVAL;

	}

	return true;

	return 0;

}



static struct xt_match ebt_among_mt_reg __read_mostly = {

net/bridge/netfilter/ebt_arp.c

+3 −3
Original line number Diff line number Diff line
@@ -108,10 +108,10 @@ static int ebt_arp_mt_check(const struct xt_mtchk_param *par) 
	if ((e->ethproto != htons(ETH_P_ARP) &&

	   e->ethproto != htons(ETH_P_RARP)) ||

	   e->invflags & EBT_IPROTO)

		return false;

		return -EINVAL;

	if (info->bitmask & ~EBT_ARP_MASK || info->invflags & ~EBT_ARP_MASK)

		return false;

	return true;

		return -EINVAL;

	return 0;

}



static struct xt_match ebt_arp_mt_reg __read_mostly = {

net/bridge/netfilter/ebt_ip.c

+7 −7
Original line number Diff line number Diff line
@@ -84,24 +84,24 @@ static int ebt_ip_mt_check(const struct xt_mtchk_param *par) 


	if (e->ethproto != htons(ETH_P_IP) ||

	   e->invflags & EBT_IPROTO)

		return false;

		return -EINVAL;

	if (info->bitmask & ~EBT_IP_MASK || info->invflags & ~EBT_IP_MASK)

		return false;

		return -EINVAL;

	if (info->bitmask & (EBT_IP_DPORT | EBT_IP_SPORT)) {

		if (info->invflags & EBT_IP_PROTO)

			return false;

			return -EINVAL;

		if (info->protocol != IPPROTO_TCP &&

		    info->protocol != IPPROTO_UDP &&

		    info->protocol != IPPROTO_UDPLITE &&

		    info->protocol != IPPROTO_SCTP &&

		    info->protocol != IPPROTO_DCCP)

			 return false;

			 return -EINVAL;

	}

	if (info->bitmask & EBT_IP_DPORT && info->dport[0] > info->dport[1])

		return false;

		return -EINVAL;

	if (info->bitmask & EBT_IP_SPORT && info->sport[0] > info->sport[1])

		return false;

	return true;

		return -EINVAL;

	return 0;

}



static struct xt_match ebt_ip_mt_reg __read_mostly = {

net/bridge/netfilter/ebt_ip6.c

+7 −7
Original line number Diff line number Diff line
@@ -86,24 +86,24 @@ static int ebt_ip6_mt_check(const struct xt_mtchk_param *par) 
	struct ebt_ip6_info *info = par->matchinfo;



	if (e->ethproto != htons(ETH_P_IPV6) || e->invflags & EBT_IPROTO)

		return false;

		return -EINVAL;

	if (info->bitmask & ~EBT_IP6_MASK || info->invflags & ~EBT_IP6_MASK)

		return false;

		return -EINVAL;

	if (info->bitmask & (EBT_IP6_DPORT | EBT_IP6_SPORT)) {

		if (info->invflags & EBT_IP6_PROTO)

			return false;

			return -EINVAL;

		if (info->protocol != IPPROTO_TCP &&

		    info->protocol != IPPROTO_UDP &&

		    info->protocol != IPPROTO_UDPLITE &&

		    info->protocol != IPPROTO_SCTP &&

		    info->protocol != IPPROTO_DCCP)

			return false;

			return -EINVAL;

	}

	if (info->bitmask & EBT_IP6_DPORT && info->dport[0] > info->dport[1])

		return false;

		return -EINVAL;

	if (info->bitmask & EBT_IP6_SPORT && info->sport[0] > info->sport[1])

		return false;

	return true;

		return -EINVAL;

	return 0;

}



static struct xt_match ebt_ip6_mt_reg __read_mostly = {