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: simran singhal <singhalsimran0@gmail.com>
Reviewed-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 79b69917f5210c0065ab5c9c37a497ede7cc273b..bdc629eb02075bf2978bcba9ed5a80577b635609 100644 (file)
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -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;
 

diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index f17dab1dee6e171148a386302081188c0e83ee5d..0bc3c3d73e61e00a04d73f32800256a62c8943a5 100644 (file)
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -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)

diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 384b85713e062881d3d2554b0828f08ff28f443d..2a55a40211cbfb94a9ade41c33678bba4be2a7e4 100644 (file)
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -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));
 

diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 1e15c54fd5e27dbafaf4d4b0b3de9008a724559f..d862e34719358c7226326c63cbc14668f0469702 100644 (file)
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -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));
 

diff --git a/net/netfilter/ipset/ip_set_bitmap_gen.h b/net/netfilter/ipset/ip_set_bitmap_gen.h
index 6f09a99298cdf6aaf18c1ff947c76db2d4985865..8ad2b52a0b328249688656c1fa80a7135b932c02 100644 (file)
--- a/net/netfilter/ipset/ip_set_bitmap_gen.h
+++ b/net/netfilter/ipset/ip_set_bitmap_gen.h
@@ -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);
        }

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 731ba9c0cf9b531eb5900919c00de2040c9c55a3..c637710d861c6d851bb26991292a7147b98d508e 100644 (file)
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -1915,7 +1915,7 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len)
                ret = -EFAULT;
                goto done;
        }
-       op = (unsigned int *)data;
+       op = data;
 
        if (*op < IP_SET_OP_VERSION) {
                /* Check the version at the beginning of operations */

diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
index 2d6ee18034159d12603e50c694541a9bdda147fc..1329e090fd5e54aee668c9a6eecacd6780094543 100644 (file)
--- a/net/netfilter/nf_conntrack_proto.c
+++ b/net/netfilter/nf_conntrack_proto.c
@@ -202,7 +202,7 @@ static int kill_l3proto(struct nf_conn *i, void *data)
 static int kill_l4proto(struct nf_conn *i, void *data)
 {
        struct nf_conntrack_l4proto *l4proto;
-       l4proto = (struct nf_conntrack_l4proto *)data;
+       l4proto = data;
        return nf_ct_protonum(i) == l4proto->l4proto &&
               nf_ct_l3num(i) == l4proto->l3proto;
 }

diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c
index 5f652720fc78e6de437c100d31524588e729001c..8ec086b6b56b742485e34511b38a77af848d9f99 100644 (file)
--- a/net/netfilter/nft_set_hash.c
+++ b/net/netfilter/nft_set_hash.c
@@ -352,7 +352,7 @@ static int nft_hash_init(const struct nft_set *set,
 
 static void nft_hash_elem_destroy(void *ptr, void *arg)
 {
-       nft_set_elem_destroy((const struct nft_set *)arg, ptr, true);
+       nft_set_elem_destroy(arg, ptr, true);
 }
 
 static void nft_hash_destroy(const struct nft_set *set)

diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 2a6dfe8b74d37f7d3d8ed0569650f6417b76d58a..762e1874f28b7b1faba5b48e94f743c0414689f3 100644 (file)
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -119,7 +119,7 @@ static int
 cfg_copy(struct hashlimit_cfg2 *to, void *from, int revision)
 {
        if (revision == 1) {
-               struct hashlimit_cfg1 *cfg = (struct hashlimit_cfg1 *)from;
+               struct hashlimit_cfg1 *cfg = from;
 
                to->mode = cfg->mode;
                to->avg = cfg->avg;
@@ -895,7 +895,7 @@ static void *dl_seq_start(struct seq_file *s, loff_t *pos)
 static void *dl_seq_next(struct seq_file *s, void *v, loff_t *pos)
 {
        struct xt_hashlimit_htable *htable = s->private;
-       unsigned int *bucket = (unsigned int *)v;
+       unsigned int *bucket = v;
 
        *pos = ++(*bucket);
        if (*pos >= htable->cfg.size) {
@@ -909,7 +909,7 @@ static void dl_seq_stop(struct seq_file *s, void *v)
        __releases(htable->lock)
 {
        struct xt_hashlimit_htable *htable = s->private;
-       unsigned int *bucket = (unsigned int *)v;
+       unsigned int *bucket = v;
 
        if (!IS_ERR(bucket))
                kfree(bucket);
@@ -980,7 +980,7 @@ static int dl_seq_real_show(struct dsthash_ent *ent, u_int8_t family,
 static int dl_seq_show_v1(struct seq_file *s, void *v)
 {
        struct xt_hashlimit_htable *htable = s->private;
-       unsigned int *bucket = (unsigned int *)v;
+       unsigned int *bucket = v;
        struct dsthash_ent *ent;
 
        if (!hlist_empty(&htable->hash[*bucket])) {
@@ -994,7 +994,7 @@ static int dl_seq_show_v1(struct seq_file *s, void *v)
 static int dl_seq_show(struct seq_file *s, void *v)
 {
        struct xt_hashlimit_htable *htable = s->private;
-       unsigned int *bucket = (unsigned int *)v;
+       unsigned int *bucket = v;
        struct dsthash_ent *ent;
 
        if (!hlist_empty(&htable->hash[*bucket])) {