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

Commit 68ad546a authored by simran singhal's avatar simran singhal Committed by Pablo Neira Ayuso
Browse files

netfilter: Remove unnecessary cast on void pointer 



The following Coccinelle script was used to detect this:
@r@
expression x;
void* e;
type T;
identifier f;
@@
(
  *((T *)e)
|
  ((T *)x)[...]
|
  ((T*)x)->f
|

- (T*)
  e
)

Unnecessary parantheses are also remove.

Signed-off-by: default avatarsimran singhal <singhalsimran0@gmail.com>
Reviewed-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent dedb67c4

net/bridge/netfilter/ebtables.c

+1 −1
Original line number Diff line number Diff line
@@ -1713,7 +1713,7 @@ static int compat_copy_entry_to_user(struct ebt_entry *e, void __user **dstptr, 
	if (*size < sizeof(*ce))

		return -EINVAL;



	ce = (struct ebt_entry __user *)*dstptr;

	ce = *dstptr;

	if (copy_to_user(ce, e, sizeof(*ce)))

		return -EFAULT;

net/ipv4/netfilter/arp_tables.c

+8 −13
Original line number Diff line number Diff line
@@ -309,8 +309,7 @@ static int mark_source_chains(const struct xt_table_info *newinfo, 
	 */

	for (hook = 0; hook < NF_ARP_NUMHOOKS; hook++) {

		unsigned int pos = newinfo->hook_entry[hook];

		struct arpt_entry *e

			= (struct arpt_entry *)(entry0 + pos);

		struct arpt_entry *e = entry0 + pos;



		if (!(valid_hooks & (1 << hook)))

			continue;
@@ -354,14 +353,12 @@ static int mark_source_chains(const struct xt_table_info *newinfo, 
					if (pos == oldpos)

						goto next;



					e = (struct arpt_entry *)

						(entry0 + pos);

					e = entry0 + pos;

				} while (oldpos == pos + e->next_offset);



				/* Move along one */

				size = e->next_offset;

				e = (struct arpt_entry *)

					(entry0 + pos + size);

				e = entry0 + pos + size;

				if (pos + size >= newinfo->size)

					return 0;

				e->counters.pcnt = pos;
@@ -376,16 +373,14 @@ static int mark_source_chains(const struct xt_table_info *newinfo, 
					if (!xt_find_jump_offset(offsets, newpos,

								 newinfo->number))

						return 0;

					e = (struct arpt_entry *)

						(entry0 + newpos);

					e = entry0 + newpos;

				} else {

					/* ... this is a fallthru */

					newpos = pos + e->next_offset;

					if (newpos >= newinfo->size)

						return 0;

				}

				e = (struct arpt_entry *)

					(entry0 + newpos);

				e = entry0 + newpos;

				e->counters.pcnt = pos;

				pos = newpos;

			}
@@ -681,7 +676,7 @@ static int copy_entries_to_user(unsigned int total_size, 
	for (off = 0, num = 0; off < total_size; off += e->next_offset, num++){

		const struct xt_entry_target *t;



		e = (struct arpt_entry *)(loc_cpu_entry + off);

		e = loc_cpu_entry + off;

		if (copy_to_user(userptr + off, e, sizeof(*e))) {

			ret = -EFAULT;

			goto free_counters;
@@ -1128,7 +1123,7 @@ compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr, 
	int h;



	origsize = *size;

	de = (struct arpt_entry *)*dstptr;

	de = *dstptr;

	memcpy(de, e, sizeof(struct arpt_entry));

	memcpy(&de->counters, &e->counters, sizeof(e->counters));
@@ -1322,7 +1317,7 @@ static int compat_copy_entry_to_user(struct arpt_entry *e, void __user **dstptr, 
	int ret;



	origsize = *size;

	ce = (struct compat_arpt_entry __user *)*dstptr;

	ce = *dstptr;

	if (copy_to_user(ce, e, sizeof(struct arpt_entry)) != 0 ||

	    copy_to_user(&ce->counters, &counters[i],

	    sizeof(counters[i])) != 0)

net/ipv4/netfilter/ip_tables.c

+8 −12
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ mark_source_chains(const struct xt_table_info *newinfo, 
	   to 0 as we leave), and comefrom to save source hook bitmask */

	for (hook = 0; hook < NF_INET_NUMHOOKS; hook++) {

		unsigned int pos = newinfo->hook_entry[hook];

		struct ipt_entry *e = (struct ipt_entry *)(entry0 + pos);

		struct ipt_entry *e = entry0 + pos;



		if (!(valid_hooks & (1 << hook)))

			continue;
@@ -424,14 +424,12 @@ mark_source_chains(const struct xt_table_info *newinfo, 
					if (pos == oldpos)

						goto next;



					e = (struct ipt_entry *)

						(entry0 + pos);

					e = entry0 + pos;

				} while (oldpos == pos + e->next_offset);



				/* Move along one */

				size = e->next_offset;

				e = (struct ipt_entry *)

					(entry0 + pos + size);

				e = entry0 + pos + size;

				if (pos + size >= newinfo->size)

					return 0;

				e->counters.pcnt = pos;
@@ -446,16 +444,14 @@ mark_source_chains(const struct xt_table_info *newinfo, 
					if (!xt_find_jump_offset(offsets, newpos,

								 newinfo->number))

						return 0;

					e = (struct ipt_entry *)

						(entry0 + newpos);

					e = entry0 + newpos;

				} else {

					/* ... this is a fallthru */

					newpos = pos + e->next_offset;

					if (newpos >= newinfo->size)

						return 0;

				}

				e = (struct ipt_entry *)

					(entry0 + newpos);

				e = entry0 + newpos;

				e->counters.pcnt = pos;

				pos = newpos;

			}
@@ -834,7 +830,7 @@ copy_entries_to_user(unsigned int total_size, 
		const struct xt_entry_match *m;

		const struct xt_entry_target *t;



		e = (struct ipt_entry *)(loc_cpu_entry + off);

		e = loc_cpu_entry + off;

		if (copy_to_user(userptr + off, e, sizeof(*e))) {

			ret = -EFAULT;

			goto free_counters;
@@ -1229,7 +1225,7 @@ compat_copy_entry_to_user(struct ipt_entry *e, void __user **dstptr, 
	int ret = 0;



	origsize = *size;

	ce = (struct compat_ipt_entry __user *)*dstptr;

	ce = *dstptr;

	if (copy_to_user(ce, e, sizeof(struct ipt_entry)) != 0 ||

	    copy_to_user(&ce->counters, &counters[i],

	    sizeof(counters[i])) != 0)
@@ -1366,7 +1362,7 @@ compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr, 
	struct xt_entry_match *ematch;



	origsize = *size;

	de = (struct ipt_entry *)*dstptr;

	de = *dstptr;

	memcpy(de, e, sizeof(struct ipt_entry));

	memcpy(&de->counters, &e->counters, sizeof(e->counters));

net/ipv6/netfilter/ip6_tables.c

+8 −12
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ mark_source_chains(const struct xt_table_info *newinfo, 
	   to 0 as we leave), and comefrom to save source hook bitmask */

	for (hook = 0; hook < NF_INET_NUMHOOKS; hook++) {

		unsigned int pos = newinfo->hook_entry[hook];

		struct ip6t_entry *e = (struct ip6t_entry *)(entry0 + pos);

		struct ip6t_entry *e = entry0 + pos;



		if (!(valid_hooks & (1 << hook)))

			continue;
@@ -453,14 +453,12 @@ mark_source_chains(const struct xt_table_info *newinfo, 
					if (pos == oldpos)

						goto next;



					e = (struct ip6t_entry *)

						(entry0 + pos);

					e = entry0 + pos;

				} while (oldpos == pos + e->next_offset);



				/* Move along one */

				size = e->next_offset;

				e = (struct ip6t_entry *)

					(entry0 + pos + size);

				e = entry0 + pos + size;

				if (pos + size >= newinfo->size)

					return 0;

				e->counters.pcnt = pos;
@@ -475,16 +473,14 @@ mark_source_chains(const struct xt_table_info *newinfo, 
					if (!xt_find_jump_offset(offsets, newpos,

								 newinfo->number))

						return 0;

					e = (struct ip6t_entry *)

						(entry0 + newpos);

					e = entry0 + newpos;

				} else {

					/* ... this is a fallthru */

					newpos = pos + e->next_offset;

					if (newpos >= newinfo->size)

						return 0;

				}

				e = (struct ip6t_entry *)

					(entry0 + newpos);

				e = entry0 + newpos;

				e->counters.pcnt = pos;

				pos = newpos;

			}
@@ -863,7 +859,7 @@ copy_entries_to_user(unsigned int total_size, 
		const struct xt_entry_match *m;

		const struct xt_entry_target *t;



		e = (struct ip6t_entry *)(loc_cpu_entry + off);

		e = loc_cpu_entry + off;

		if (copy_to_user(userptr + off, e, sizeof(*e))) {

			ret = -EFAULT;

			goto free_counters;
@@ -1258,7 +1254,7 @@ compat_copy_entry_to_user(struct ip6t_entry *e, void __user **dstptr, 
	int ret = 0;



	origsize = *size;

	ce = (struct compat_ip6t_entry __user *)*dstptr;

	ce = *dstptr;

	if (copy_to_user(ce, e, sizeof(struct ip6t_entry)) != 0 ||

	    copy_to_user(&ce->counters, &counters[i],

	    sizeof(counters[i])) != 0)
@@ -1394,7 +1390,7 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr, 
	struct xt_entry_match *ematch;



	origsize = *size;

	de = (struct ip6t_entry *)*dstptr;

	de = *dstptr;

	memcpy(de, e, sizeof(struct ip6t_entry));

	memcpy(&de->counters, &e->counters, sizeof(e->counters));

net/netfilter/ipset/ip_set_bitmap_gen.h

+2 −3
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ mtype_list(const struct ip_set *set, 
		if (!test_bit(id, map->members) ||

		    (SET_WITH_TIMEOUT(set) &&

#ifdef IP_SET_BITMAP_STORED_TIMEOUT

		     mtype_is_filled((const struct mtype_elem *)x) &&

		     mtype_is_filled(x) &&

#endif

		     ip_set_timeout_expired(ext_timeout(x, set))))

			continue;
@@ -248,8 +248,7 @@ mtype_list(const struct ip_set *set, 
		}

		if (mtype_do_list(skb, map, id, set->dsize))

			goto nla_put_failure;

		if (ip_set_put_extensions(skb, set, x,

		    mtype_is_filled((const struct mtype_elem *)x)))

		if (ip_set_put_extensions(skb, set, x, mtype_is_filled(x)))

			goto nla_put_failure;

		ipset_nest_end(skb, nested);

	}