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

Commit 3666ed1c authored by Joe Perches's avatar Joe Perches Committed by Patrick McHardy
Browse files

netfilter: net/ipv[46]/netfilter: Move && and || to end of previous line 



Compile tested only.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 3a042929

net/ipv4/netfilter/arp_tables.c

+11 −11
Original line number Diff line number Diff line
@@ -384,11 +384,11 @@ static int mark_source_chains(struct xt_table_info *newinfo, 
				|= ((1 << hook) | (1 << NF_ARP_NUMHOOKS));



			/* Unconditional return/END. */

			if ((e->target_offset == sizeof(struct arpt_entry)

			    && (strcmp(t->target.u.user.name,

				       ARPT_STANDARD_TARGET) == 0)

			    && t->verdict < 0

			    && unconditional(&e->arp)) || visited) {

			if ((e->target_offset == sizeof(struct arpt_entry) &&

			     (strcmp(t->target.u.user.name,

				     ARPT_STANDARD_TARGET) == 0) &&

			     t->verdict < 0 && unconditional(&e->arp)) ||

			    visited) {

				unsigned int oldpos, size;



				if ((strcmp(t->target.u.user.name,
@@ -427,8 +427,8 @@ static int mark_source_chains(struct xt_table_info *newinfo, 
				int newpos = t->verdict;



				if (strcmp(t->target.u.user.name,

					   ARPT_STANDARD_TARGET) == 0

				    && newpos >= 0) {

					   ARPT_STANDARD_TARGET) == 0 &&

				    newpos >= 0) {

					if (newpos > newinfo->size -

						sizeof(struct arpt_entry)) {

						duprintf("mark_source_chains: "
@@ -559,8 +559,8 @@ static inline int check_entry_size_and_hooks(struct arpt_entry *e, 
{

	unsigned int h;



	if ((unsigned long)e % __alignof__(struct arpt_entry) != 0

	    || (unsigned char *)e + sizeof(struct arpt_entry) >= limit) {

	if ((unsigned long)e % __alignof__(struct arpt_entry) != 0 ||

	    (unsigned char *)e + sizeof(struct arpt_entry) >= limit) {

		duprintf("Bad offset %p\n", e);

		return -EINVAL;

	}
@@ -1251,8 +1251,8 @@ check_compat_entry_size_and_hooks(struct compat_arpt_entry *e, 
	int ret, off, h;



	duprintf("check_compat_entry_size_and_hooks %p\n", e);

	if ((unsigned long)e % __alignof__(struct compat_arpt_entry) != 0

	    || (unsigned char *)e + sizeof(struct compat_arpt_entry) >= limit) {

	if ((unsigned long)e % __alignof__(struct compat_arpt_entry) != 0 ||

	    (unsigned char *)e + sizeof(struct compat_arpt_entry) >= limit) {

		duprintf("Bad offset %p, limit = %p\n", e, limit);

		return -EINVAL;

	}

net/ipv4/netfilter/ip_tables.c

+23 −23
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ ip_packet_match(const struct iphdr *ip, 
#define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))



	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,

		  IPT_INV_SRCIP)

	    || FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,

		  IPT_INV_SRCIP) ||

	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,

		  IPT_INV_DSTIP)) {

		dprintf("Source or dest mismatch.\n");
@@ -122,8 +122,8 @@ ip_packet_match(const struct iphdr *ip, 
	}



	/* Check specific protocol */

	if (ipinfo->proto

	    && FWINV(ip->protocol != ipinfo->proto, IPT_INV_PROTO)) {

	if (ipinfo->proto &&

	    FWINV(ip->protocol != ipinfo->proto, IPT_INV_PROTO)) {

		dprintf("Packet protocol %hi does not match %hi.%s\n",

			ip->protocol, ipinfo->proto,

			ipinfo->invflags&IPT_INV_PROTO ? " (INV)":"");
@@ -246,11 +246,11 @@ get_chainname_rulenum(struct ipt_entry *s, struct ipt_entry *e, 
	} else if (s == e) {

		(*rulenum)++;



		if (s->target_offset == sizeof(struct ipt_entry)

		   && strcmp(t->target.u.kernel.target->name,

			     IPT_STANDARD_TARGET) == 0

		   && t->verdict < 0

		   && unconditional(&s->ip)) {

		if (s->target_offset == sizeof(struct ipt_entry) &&

		    strcmp(t->target.u.kernel.target->name,

			   IPT_STANDARD_TARGET) == 0 &&

		   t->verdict < 0 &&

		   unconditional(&s->ip)) {

			/* Tail of chains: STANDARD target (return/policy) */

			*comment = *chainname == hookname

				? comments[NF_IP_TRACE_COMMENT_POLICY]
@@ -388,8 +388,8 @@ ipt_do_table(struct sk_buff *skb, 
				back = get_entry(table_base, back->comefrom);

				continue;

			}

			if (table_base + v != ipt_next_entry(e)

			    && !(e->ip.flags & IPT_F_GOTO)) {

			if (table_base + v != ipt_next_entry(e) &&

			    !(e->ip.flags & IPT_F_GOTO)) {

				/* Save old back ptr in next entry */

				struct ipt_entry *next = ipt_next_entry(e);

				next->comefrom = (void *)back - table_base;
@@ -473,11 +473,11 @@ mark_source_chains(struct xt_table_info *newinfo, 
			e->comefrom |= ((1 << hook) | (1 << NF_INET_NUMHOOKS));



			/* Unconditional return/END. */

			if ((e->target_offset == sizeof(struct ipt_entry)

			    && (strcmp(t->target.u.user.name,

				       IPT_STANDARD_TARGET) == 0)

			    && t->verdict < 0

			    && unconditional(&e->ip)) || visited) {

			if ((e->target_offset == sizeof(struct ipt_entry) &&

			     (strcmp(t->target.u.user.name,

				     IPT_STANDARD_TARGET) == 0) &&

			     t->verdict < 0 && unconditional(&e->ip)) ||

			    visited) {

				unsigned int oldpos, size;



				if ((strcmp(t->target.u.user.name,
@@ -524,8 +524,8 @@ mark_source_chains(struct xt_table_info *newinfo, 
				int newpos = t->verdict;



				if (strcmp(t->target.u.user.name,

					   IPT_STANDARD_TARGET) == 0

				    && newpos >= 0) {

					   IPT_STANDARD_TARGET) == 0 &&

				    newpos >= 0) {

					if (newpos > newinfo->size -

						sizeof(struct ipt_entry)) {

						duprintf("mark_source_chains: "
@@ -735,8 +735,8 @@ check_entry_size_and_hooks(struct ipt_entry *e, 
{

	unsigned int h;



	if ((unsigned long)e % __alignof__(struct ipt_entry) != 0

	    || (unsigned char *)e + sizeof(struct ipt_entry) >= limit) {

	if ((unsigned long)e % __alignof__(struct ipt_entry) != 0 ||

	    (unsigned char *)e + sizeof(struct ipt_entry) >= limit) {

		duprintf("Bad offset %p\n", e);

		return -EINVAL;

	}
@@ -1548,8 +1548,8 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e, 
	int ret, off, h;



	duprintf("check_compat_entry_size_and_hooks %p\n", e);

	if ((unsigned long)e % __alignof__(struct compat_ipt_entry) != 0

	    || (unsigned char *)e + sizeof(struct compat_ipt_entry) >= limit) {

	if ((unsigned long)e % __alignof__(struct compat_ipt_entry) != 0 ||

	    (unsigned char *)e + sizeof(struct compat_ipt_entry) >= limit) {

		duprintf("Bad offset %p, limit = %p\n", e, limit);

		return -EINVAL;

	}

net/ipv4/netfilter/ipt_CLUSTERIP.c

+10 −10
Original line number Diff line number Diff line
@@ -303,9 +303,9 @@ clusterip_tg(struct sk_buff *skb, const struct xt_target_param *par) 


	/* special case: ICMP error handling. conntrack distinguishes between

	 * error messages (RELATED) and information requests (see below) */

	if (ip_hdr(skb)->protocol == IPPROTO_ICMP

	    && (ctinfo == IP_CT_RELATED

		|| ctinfo == IP_CT_RELATED+IP_CT_IS_REPLY))

	if (ip_hdr(skb)->protocol == IPPROTO_ICMP &&

	    (ctinfo == IP_CT_RELATED ||

	     ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY))

		return XT_CONTINUE;



	/* ip_conntrack_icmp guarantees us that we only have ICMP_ECHO,
@@ -362,8 +362,8 @@ static bool clusterip_tg_check(const struct xt_tgchk_param *par) 
		return false;



	}

	if (e->ip.dmsk.s_addr != htonl(0xffffffff)

	    || e->ip.dst.s_addr == 0) {

	if (e->ip.dmsk.s_addr != htonl(0xffffffff) ||

	    e->ip.dst.s_addr == 0) {

		printk(KERN_ERR "CLUSTERIP: Please specify destination IP\n");

		return false;

	}
@@ -495,14 +495,14 @@ arp_mangle(unsigned int hook, 
	struct clusterip_config *c;



	/* we don't care about non-ethernet and non-ipv4 ARP */

	if (arp->ar_hrd != htons(ARPHRD_ETHER)

	    || arp->ar_pro != htons(ETH_P_IP)

	    || arp->ar_pln != 4 || arp->ar_hln != ETH_ALEN)

	if (arp->ar_hrd != htons(ARPHRD_ETHER) ||

	    arp->ar_pro != htons(ETH_P_IP) ||

	    arp->ar_pln != 4 || arp->ar_hln != ETH_ALEN)

		return NF_ACCEPT;



	/* we only want to mangle arp requests and replies */

	if (arp->ar_op != htons(ARPOP_REPLY)

	    && arp->ar_op != htons(ARPOP_REQUEST))

	if (arp->ar_op != htons(ARPOP_REPLY) &&

	    arp->ar_op != htons(ARPOP_REQUEST))

		return NF_ACCEPT;



	payload = (void *)(arp+1);

net/ipv4/netfilter/ipt_ECN.c

+4 −4
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ ecn_tg(struct sk_buff *skb, const struct xt_target_param *par) 
		if (!set_ect_ip(skb, einfo))

			return NF_DROP;



	if (einfo->operation & (IPT_ECN_OP_SET_ECE | IPT_ECN_OP_SET_CWR)

	    && ip_hdr(skb)->protocol == IPPROTO_TCP)

	if (einfo->operation & (IPT_ECN_OP_SET_ECE | IPT_ECN_OP_SET_CWR) &&

	    ip_hdr(skb)->protocol == IPPROTO_TCP)

		if (!set_ect_tcp(skb, einfo))

			return NF_DROP;
@@ -108,8 +108,8 @@ static bool ecn_tg_check(const struct xt_tgchk_param *par) 
			einfo->ip_ect);

		return false;

	}

	if ((einfo->operation & (IPT_ECN_OP_SET_ECE|IPT_ECN_OP_SET_CWR))

	    && (e->ip.proto != IPPROTO_TCP || (e->ip.invflags & XT_INV_PROTO))) {

	if ((einfo->operation & (IPT_ECN_OP_SET_ECE|IPT_ECN_OP_SET_CWR)) &&

	    (e->ip.proto != IPPROTO_TCP || (e->ip.invflags & XT_INV_PROTO))) {

		printk(KERN_WARNING "ECN: cannot use TCP operations on a "

		       "non-tcp rule\n");

		return false;

net/ipv4/netfilter/ipt_LOG.c

+11 −11
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ static void dump_packet(const struct nf_loginfo *info, 
	if (ntohs(ih->frag_off) & IP_OFFSET)

		printk("FRAG:%u ", ntohs(ih->frag_off) & IP_OFFSET);



	if ((logflags & IPT_LOG_IPOPT)

	    && ih->ihl * 4 > sizeof(struct iphdr)) {

	if ((logflags & IPT_LOG_IPOPT) &&

	    ih->ihl * 4 > sizeof(struct iphdr)) {

		const unsigned char *op;

		unsigned char _opt[4 * 15 - sizeof(struct iphdr)];

		unsigned int i, optsize;
@@ -146,8 +146,8 @@ static void dump_packet(const struct nf_loginfo *info, 
		/* Max length: 11 "URGP=65535 " */

		printk("URGP=%u ", ntohs(th->urg_ptr));



		if ((logflags & IPT_LOG_TCPOPT)

		    && th->doff * 4 > sizeof(struct tcphdr)) {

		if ((logflags & IPT_LOG_TCPOPT) &&

		    th->doff * 4 > sizeof(struct tcphdr)) {

			unsigned char _opt[4 * 15 - sizeof(struct tcphdr)];

			const unsigned char *op;

			unsigned int i, optsize;
@@ -238,9 +238,9 @@ static void dump_packet(const struct nf_loginfo *info, 
		printk("TYPE=%u CODE=%u ", ich->type, ich->code);



		/* Max length: 25 "INCOMPLETE [65535 bytes] " */

		if (ich->type <= NR_ICMP_TYPES

		    && required_len[ich->type]

		    && skb->len-iphoff-ih->ihl*4 < required_len[ich->type]) {

		if (ich->type <= NR_ICMP_TYPES &&

		    required_len[ich->type] &&

		    skb->len-iphoff-ih->ihl*4 < required_len[ich->type]) {

			printk("INCOMPLETE [%u bytes] ",

			       skb->len - iphoff - ih->ihl*4);

			break;
@@ -276,8 +276,8 @@ static void dump_packet(const struct nf_loginfo *info, 
			}



			/* Max length: 10 "MTU=65535 " */

			if (ich->type == ICMP_DEST_UNREACH

			    && ich->code == ICMP_FRAG_NEEDED)

			if (ich->type == ICMP_DEST_UNREACH &&

			    ich->code == ICMP_FRAG_NEEDED)

				printk("MTU=%u ", ntohs(ich->un.frag.mtu));

		}

		break;
@@ -407,8 +407,8 @@ ipt_log_packet(u_int8_t pf, 
	if (in && !out) {

		/* MAC logging for input chain only. */

		printk("MAC=");

		if (skb->dev && skb->dev->hard_header_len

		    && skb->mac_header != skb->network_header) {

		if (skb->dev && skb->dev->hard_header_len &&

		    skb->mac_header != skb->network_header) {

			int i;

			const unsigned char *p = skb_mac_header(skb);

			for (i = 0; i < skb->dev->hard_header_len; i++,p++)