Skip to content

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

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
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 49 deletions
net/bridge/netfilter/ebtables.c
View file @ 68ad546a
...@@ -1713,7 +1713,7 @@ static int compat_copy_entry_to_user(struct ebt_entry *e, void __user **dstptr, ...@@ -1713,7 +1713,7 @@ static int compat_copy_entry_to_user(struct ebt_entry *e, void __user **dstptr,
if (*size < sizeof(*ce)) if (*size < sizeof(*ce))
return -EINVAL; return -EINVAL;
ce = (struct ebt_entry __user *)*dstptr; ce = *dstptr;
if (copy_to_user(ce, e, sizeof(*ce))) if (copy_to_user(ce, e, sizeof(*ce)))
return -EFAULT; return -EFAULT;
......
net/ipv4/netfilter/arp_tables.c
View file @ 68ad546a
...@@ -309,8 +309,7 @@ static int mark_source_chains(const struct xt_table_info *newinfo, ...@@ -309,8 +309,7 @@ static int mark_source_chains(const struct xt_table_info *newinfo,
*/ */
for (hook = 0; hook < NF_ARP_NUMHOOKS; hook++) { for (hook = 0; hook < NF_ARP_NUMHOOKS; hook++) {
unsigned int pos = newinfo->hook_entry[hook]; unsigned int pos = newinfo->hook_entry[hook];
struct arpt_entry *e struct arpt_entry *e = entry0 + pos;
= (struct arpt_entry *)(entry0 + pos);
if (!(valid_hooks & (1 << hook))) if (!(valid_hooks & (1 << hook)))
continue; continue;
...@@ -354,14 +353,12 @@ static int mark_source_chains(const struct xt_table_info *newinfo, ...@@ -354,14 +353,12 @@ static int mark_source_chains(const struct xt_table_info *newinfo,
if (pos == oldpos) if (pos == oldpos)
goto next; goto next;
e = (struct arpt_entry *) e = entry0 + pos;
(entry0 + pos);
} while (oldpos == pos + e->next_offset); } while (oldpos == pos + e->next_offset);
/* Move along one */ /* Move along one */
size = e->next_offset; size = e->next_offset;
e = (struct arpt_entry *) e = entry0 + pos + size;
(entry0 + pos + size);
if (pos + size >= newinfo->size) if (pos + size >= newinfo->size)
return 0; return 0;
e->counters.pcnt = pos; e->counters.pcnt = pos;
...@@ -376,16 +373,14 @@ static int mark_source_chains(const struct xt_table_info *newinfo, ...@@ -376,16 +373,14 @@ static int mark_source_chains(const struct xt_table_info *newinfo,
if (!xt_find_jump_offset(offsets, newpos, if (!xt_find_jump_offset(offsets, newpos,
newinfo->number)) newinfo->number))
return 0; return 0;
e = (struct arpt_entry *) e = entry0 + newpos;
(entry0 + newpos);
} else { } else {
/* ... this is a fallthru */ /* ... this is a fallthru */
newpos = pos + e->next_offset; newpos = pos + e->next_offset;
if (newpos >= newinfo->size) if (newpos >= newinfo->size)
return 0; return 0;
} }
e = (struct arpt_entry *) e = entry0 + newpos;
(entry0 + newpos);
e->counters.pcnt = pos; e->counters.pcnt = pos;
pos = newpos; pos = newpos;
} }
...@@ -681,7 +676,7 @@ static int copy_entries_to_user(unsigned int total_size, ...@@ -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++){ for (off = 0, num = 0; off < total_size; off += e->next_offset, num++){
const struct xt_entry_target *t; 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))) { if (copy_to_user(userptr + off, e, sizeof(*e))) {
ret = -EFAULT; ret = -EFAULT;
goto free_counters; goto free_counters;
...@@ -1128,7 +1123,7 @@ compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr, ...@@ -1128,7 +1123,7 @@ compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,
int h; int h;
origsize = *size; origsize = *size;
de = (struct arpt_entry *)*dstptr; de = *dstptr;
memcpy(de, e, sizeof(struct arpt_entry)); memcpy(de, e, sizeof(struct arpt_entry));
memcpy(&de->counters, &e->counters, sizeof(e->counters)); 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, ...@@ -1322,7 +1317,7 @@ static int compat_copy_entry_to_user(struct arpt_entry *e, void __user **dstptr,
int ret; int ret;
origsize = *size; origsize = *size;
ce = (struct compat_arpt_entry __user *)*dstptr; ce = *dstptr;
if (copy_to_user(ce, e, sizeof(struct arpt_entry)) != 0 || if (copy_to_user(ce, e, sizeof(struct arpt_entry)) != 0 ||
copy_to_user(&ce->counters, &counters[i], copy_to_user(&ce->counters, &counters[i],
sizeof(counters[i])) != 0) sizeof(counters[i])) != 0)
......
net/ipv4/netfilter/ip_tables.c
View file @ 68ad546a
...@@ -382,7 +382,7 @@ mark_source_chains(const struct xt_table_info *newinfo, ...@@ -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 */ to 0 as we leave), and comefrom to save source hook bitmask */
for (hook = 0; hook < NF_INET_NUMHOOKS; hook++) { for (hook = 0; hook < NF_INET_NUMHOOKS; hook++) {
unsigned int pos = newinfo->hook_entry[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))) if (!(valid_hooks & (1 << hook)))
continue; continue;
...@@ -424,14 +424,12 @@ mark_source_chains(const struct xt_table_info *newinfo, ...@@ -424,14 +424,12 @@ mark_source_chains(const struct xt_table_info *newinfo,
if (pos == oldpos) if (pos == oldpos)
goto next; goto next;
e = (struct ipt_entry *) e = entry0 + pos;
(entry0 + pos);
} while (oldpos == pos + e->next_offset); } while (oldpos == pos + e->next_offset);
/* Move along one */ /* Move along one */
size = e->next_offset; size = e->next_offset;
e = (struct ipt_entry *) e = entry0 + pos + size;
(entry0 + pos + size);
if (pos + size >= newinfo->size) if (pos + size >= newinfo->size)
return 0; return 0;
e->counters.pcnt = pos; e->counters.pcnt = pos;
...@@ -446,16 +444,14 @@ mark_source_chains(const struct xt_table_info *newinfo, ...@@ -446,16 +444,14 @@ mark_source_chains(const struct xt_table_info *newinfo,
if (!xt_find_jump_offset(offsets, newpos, if (!xt_find_jump_offset(offsets, newpos,
newinfo->number)) newinfo->number))
return 0; return 0;
e = (struct ipt_entry *) e = entry0 + newpos;
(entry0 + newpos);
} else { } else {
/* ... this is a fallthru */ /* ... this is a fallthru */
newpos = pos + e->next_offset; newpos = pos + e->next_offset;
if (newpos >= newinfo->size) if (newpos >= newinfo->size)
return 0; return 0;
} }
e = (struct ipt_entry *) e = entry0 + newpos;
(entry0 + newpos);
e->counters.pcnt = pos; e->counters.pcnt = pos;
pos = newpos; pos = newpos;
} }
...@@ -834,7 +830,7 @@ copy_entries_to_user(unsigned int total_size, ...@@ -834,7 +830,7 @@ copy_entries_to_user(unsigned int total_size,
const struct xt_entry_match *m; const struct xt_entry_match *m;
const struct xt_entry_target *t; 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))) { if (copy_to_user(userptr + off, e, sizeof(*e))) {
ret = -EFAULT; ret = -EFAULT;
goto free_counters; goto free_counters;
...@@ -1229,7 +1225,7 @@ compat_copy_entry_to_user(struct ipt_entry *e, void __user **dstptr, ...@@ -1229,7 +1225,7 @@ compat_copy_entry_to_user(struct ipt_entry *e, void __user **dstptr,
int ret = 0; int ret = 0;
origsize = *size; origsize = *size;
ce = (struct compat_ipt_entry __user *)*dstptr; ce = *dstptr;
if (copy_to_user(ce, e, sizeof(struct ipt_entry)) != 0 || if (copy_to_user(ce, e, sizeof(struct ipt_entry)) != 0 ||
copy_to_user(&ce->counters, &counters[i], copy_to_user(&ce->counters, &counters[i],
sizeof(counters[i])) != 0) sizeof(counters[i])) != 0)
...@@ -1366,7 +1362,7 @@ compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr, ...@@ -1366,7 +1362,7 @@ compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr,
struct xt_entry_match *ematch; struct xt_entry_match *ematch;
origsize = *size; origsize = *size;
de = (struct ipt_entry *)*dstptr; de = *dstptr;
memcpy(de, e, sizeof(struct ipt_entry)); memcpy(de, e, sizeof(struct ipt_entry));
memcpy(&de->counters, &e->counters, sizeof(e->counters)); memcpy(&de->counters, &e->counters, sizeof(e->counters));
......
net/ipv6/netfilter/ip6_tables.c
View file @ 68ad546a
...@@ -411,7 +411,7 @@ mark_source_chains(const struct xt_table_info *newinfo, ...@@ -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 */ to 0 as we leave), and comefrom to save source hook bitmask */
for (hook = 0; hook < NF_INET_NUMHOOKS; hook++) { for (hook = 0; hook < NF_INET_NUMHOOKS; hook++) {
unsigned int pos = newinfo->hook_entry[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))) if (!(valid_hooks & (1 << hook)))
continue; continue;
...@@ -453,14 +453,12 @@ mark_source_chains(const struct xt_table_info *newinfo, ...@@ -453,14 +453,12 @@ mark_source_chains(const struct xt_table_info *newinfo,
if (pos == oldpos) if (pos == oldpos)
goto next; goto next;
e = (struct ip6t_entry *) e = entry0 + pos;
(entry0 + pos);
} while (oldpos == pos + e->next_offset); } while (oldpos == pos + e->next_offset);
/* Move along one */ /* Move along one */
size = e->next_offset; size = e->next_offset;
e = (struct ip6t_entry *) e = entry0 + pos + size;
(entry0 + pos + size);
if (pos + size >= newinfo->size) if (pos + size >= newinfo->size)
return 0; return 0;
e->counters.pcnt = pos; e->counters.pcnt = pos;
...@@ -475,16 +473,14 @@ mark_source_chains(const struct xt_table_info *newinfo, ...@@ -475,16 +473,14 @@ mark_source_chains(const struct xt_table_info *newinfo,
if (!xt_find_jump_offset(offsets, newpos, if (!xt_find_jump_offset(offsets, newpos,
newinfo->number)) newinfo->number))
return 0; return 0;
e = (struct ip6t_entry *) e = entry0 + newpos;
(entry0 + newpos);
} else { } else {
/* ... this is a fallthru */ /* ... this is a fallthru */
newpos = pos + e->next_offset; newpos = pos + e->next_offset;
if (newpos >= newinfo->size) if (newpos >= newinfo->size)
return 0; return 0;
} }
e = (struct ip6t_entry *) e = entry0 + newpos;
(entry0 + newpos);
e->counters.pcnt = pos; e->counters.pcnt = pos;
pos = newpos; pos = newpos;
} }
...@@ -863,7 +859,7 @@ copy_entries_to_user(unsigned int total_size, ...@@ -863,7 +859,7 @@ copy_entries_to_user(unsigned int total_size,
const struct xt_entry_match *m; const struct xt_entry_match *m;
const struct xt_entry_target *t; 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))) { if (copy_to_user(userptr + off, e, sizeof(*e))) {
ret = -EFAULT; ret = -EFAULT;
goto free_counters; goto free_counters;
...@@ -1258,7 +1254,7 @@ compat_copy_entry_to_user(struct ip6t_entry *e, void __user **dstptr, ...@@ -1258,7 +1254,7 @@ compat_copy_entry_to_user(struct ip6t_entry *e, void __user **dstptr,
int ret = 0; int ret = 0;
origsize = *size; origsize = *size;
ce = (struct compat_ip6t_entry __user *)*dstptr; ce = *dstptr;
if (copy_to_user(ce, e, sizeof(struct ip6t_entry)) != 0 || if (copy_to_user(ce, e, sizeof(struct ip6t_entry)) != 0 ||
copy_to_user(&ce->counters, &counters[i], copy_to_user(&ce->counters, &counters[i],
sizeof(counters[i])) != 0) sizeof(counters[i])) != 0)
...@@ -1394,7 +1390,7 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr, ...@@ -1394,7 +1390,7 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
struct xt_entry_match *ematch; struct xt_entry_match *ematch;
origsize = *size; origsize = *size;
de = (struct ip6t_entry *)*dstptr; de = *dstptr;
memcpy(de, e, sizeof(struct ip6t_entry)); memcpy(de, e, sizeof(struct ip6t_entry));
memcpy(&de->counters, &e->counters, sizeof(e->counters)); memcpy(&de->counters, &e->counters, sizeof(e->counters));
......
net/netfilter/ipset/ip_set_bitmap_gen.h
View file @ 68ad546a
...@@ -232,7 +232,7 @@ mtype_list(const struct ip_set *set, ...@@ -232,7 +232,7 @@ mtype_list(const struct ip_set *set,
if (!test_bit(id, map->members) || if (!test_bit(id, map->members) ||
(SET_WITH_TIMEOUT(set) && (SET_WITH_TIMEOUT(set) &&
#ifdef IP_SET_BITMAP_STORED_TIMEOUT #ifdef IP_SET_BITMAP_STORED_TIMEOUT
mtype_is_filled((const struct mtype_elem *)x) && mtype_is_filled(x) &&
#endif #endif
ip_set_timeout_expired(ext_timeout(x, set)))) ip_set_timeout_expired(ext_timeout(x, set))))
continue; continue;
...@@ -248,8 +248,7 @@ mtype_list(const struct ip_set *set, ...@@ -248,8 +248,7 @@ mtype_list(const struct ip_set *set,
} }
if (mtype_do_list(skb, map, id, set->dsize)) if (mtype_do_list(skb, map, id, set->dsize))
goto nla_put_failure; goto nla_put_failure;
if (ip_set_put_extensions(skb, set, x, if (ip_set_put_extensions(skb, set, x, mtype_is_filled(x)))
mtype_is_filled((const struct mtype_elem *)x)))
goto nla_put_failure; goto nla_put_failure;
ipset_nest_end(skb, nested); ipset_nest_end(skb, nested);
} }
......
net/netfilter/ipset/ip_set_core.c
View file @ 68ad546a
...@@ -1915,7 +1915,7 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len) ...@@ -1915,7 +1915,7 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len)
ret = -EFAULT; ret = -EFAULT;
goto done; goto done;
} }
op = (unsigned int *)data; op = data;
if (*op < IP_SET_OP_VERSION) { if (*op < IP_SET_OP_VERSION) {
/* Check the version at the beginning of operations */ /* Check the version at the beginning of operations */
......
net/netfilter/nf_conntrack_proto.c
View file @ 68ad546a
...@@ -202,7 +202,7 @@ static int kill_l3proto(struct nf_conn *i, void *data) ...@@ -202,7 +202,7 @@ static int kill_l3proto(struct nf_conn *i, void *data)
static int kill_l4proto(struct nf_conn *i, void *data) static int kill_l4proto(struct nf_conn *i, void *data)
{ {
struct nf_conntrack_l4proto *l4proto; struct nf_conntrack_l4proto *l4proto;
l4proto = (struct nf_conntrack_l4proto *)data; l4proto = data;
return nf_ct_protonum(i) == l4proto->l4proto && return nf_ct_protonum(i) == l4proto->l4proto &&
nf_ct_l3num(i) == l4proto->l3proto; nf_ct_l3num(i) == l4proto->l3proto;
} }
......
net/netfilter/nft_set_hash.c
View file @ 68ad546a
...@@ -352,7 +352,7 @@ static int nft_hash_init(const struct nft_set *set, ...@@ -352,7 +352,7 @@ static int nft_hash_init(const struct nft_set *set,
static void nft_hash_elem_destroy(void *ptr, void *arg) 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) static void nft_hash_destroy(const struct nft_set *set)
......
net/netfilter/xt_hashlimit.c
View file @ 68ad546a
...@@ -119,7 +119,7 @@ static int ...@@ -119,7 +119,7 @@ static int
cfg_copy(struct hashlimit_cfg2 *to, void *from, int revision) cfg_copy(struct hashlimit_cfg2 *to, void *from, int revision)
{ {
if (revision == 1) { if (revision == 1) {
struct hashlimit_cfg1 *cfg = (struct hashlimit_cfg1 *)from; struct hashlimit_cfg1 *cfg = from;
to->mode = cfg->mode; to->mode = cfg->mode;
to->avg = cfg->avg; to->avg = cfg->avg;
...@@ -895,7 +895,7 @@ static void *dl_seq_start(struct seq_file *s, loff_t *pos) ...@@ -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) static void *dl_seq_next(struct seq_file *s, void *v, loff_t *pos)
{ {
struct xt_hashlimit_htable *htable = s->private; struct xt_hashlimit_htable *htable = s->private;
unsigned int *bucket = (unsigned int *)v; unsigned int *bucket = v;
*pos = ++(*bucket); *pos = ++(*bucket);
if (*pos >= htable->cfg.size) { if (*pos >= htable->cfg.size) {
...@@ -909,7 +909,7 @@ static void dl_seq_stop(struct seq_file *s, void *v) ...@@ -909,7 +909,7 @@ static void dl_seq_stop(struct seq_file *s, void *v)
__releases(htable->lock) __releases(htable->lock)
{ {
struct xt_hashlimit_htable *htable = s->private; struct xt_hashlimit_htable *htable = s->private;
unsigned int *bucket = (unsigned int *)v; unsigned int *bucket = v;
if (!IS_ERR(bucket)) if (!IS_ERR(bucket))
kfree(bucket); kfree(bucket);
...@@ -980,7 +980,7 @@ static int dl_seq_real_show(struct dsthash_ent *ent, u_int8_t family, ...@@ -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) static int dl_seq_show_v1(struct seq_file *s, void *v)
{ {
struct xt_hashlimit_htable *htable = s->private; struct xt_hashlimit_htable *htable = s->private;
unsigned int *bucket = (unsigned int *)v; unsigned int *bucket = v;
struct dsthash_ent *ent; struct dsthash_ent *ent;
if (!hlist_empty(&htable->hash[*bucket])) { if (!hlist_empty(&htable->hash[*bucket])) {
...@@ -994,7 +994,7 @@ static int dl_seq_show_v1(struct seq_file *s, void *v) ...@@ -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) static int dl_seq_show(struct seq_file *s, void *v)
{ {
struct xt_hashlimit_htable *htable = s->private; struct xt_hashlimit_htable *htable = s->private;
unsigned int *bucket = (unsigned int *)v; unsigned int *bucket = v;
struct dsthash_ent *ent; struct dsthash_ent *ent;
if (!hlist_empty(&htable->hash[*bucket])) { if (!hlist_empty(&htable->hash[*bucket])) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7