Skip to content

Commit d6547f2

Browse files
Alexey Dobriyandavem330
authored andcommitted
net, uapi: fix -Wpointer-arith warnings
Add casts to fix these warnings: ./usr/include/linux/netfilter_arp/arp_tables.h:200:19: error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith] ./usr/include/linux/netfilter_bridge/ebtables.h:197:19: error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith] ./usr/include/linux/netfilter_ipv4/ip_tables.h:223:19: error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith] ./usr/include/linux/netfilter_ipv6/ip6_tables.h:263:19: error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith] ./usr/include/linux/tipc_config.h:310:28: error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith] ./usr/include/linux/tipc_config.h:410:24: error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith] ./usr/include/linux/virtio_ring.h:170:16: error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith] Those are theoretical probably but kernel doesn't control compiler flags in userspace. Signed-off-by: Alexey Dobriyan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent de417d1 commit d6547f2

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

include/uapi/linux/netfilter_arp/arp_tables.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ struct arpt_get_entries {
199199
/* Helper functions */
200200
static __inline__ struct xt_entry_target *arpt_get_target(struct arpt_entry *e)
201201
{
202-
return (void *)e + e->target_offset;
202+
return (struct xt_entry_target *)((char *)e + e->target_offset);
203203
}
204204

205205
/*

include/uapi/linux/netfilter_bridge/ebtables.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ struct ebt_entry {
194194
static __inline__ struct ebt_entry_target *
195195
ebt_get_target(struct ebt_entry *e)
196196
{
197-
return (void *)e + e->target_offset;
197+
return (struct ebt_entry_target *)((char *)e + e->target_offset);
198198
}
199199

200200
/* {g,s}etsockopt numbers */

include/uapi/linux/netfilter_ipv4/ip_tables.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ struct ipt_get_entries {
222222
static __inline__ struct xt_entry_target *
223223
ipt_get_target(struct ipt_entry *e)
224224
{
225-
return (void *)e + e->target_offset;
225+
return (struct xt_entry_target *)((char *)e + e->target_offset);
226226
}
227227

228228
/*

include/uapi/linux/netfilter_ipv6/ip6_tables.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ struct ip6t_get_entries {
262262
static __inline__ struct xt_entry_target *
263263
ip6t_get_target(struct ip6t_entry *e)
264264
{
265-
return (void *)e + e->target_offset;
265+
return (struct xt_entry_target *)((char *)e + e->target_offset);
266266
}
267267

268268
/*

include/uapi/linux/tipc_config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ static inline int TLV_SET(void *tlv, __u16 type, void *data, __u16 len)
309309
tlv_ptr->tlv_len = htons(tlv_len);
310310
if (len && data) {
311311
memcpy(TLV_DATA(tlv_ptr), data, len);
312-
memset(TLV_DATA(tlv_ptr) + len, 0, TLV_SPACE(len) - tlv_len);
312+
memset((char *)TLV_DATA(tlv_ptr) + len, 0, TLV_SPACE(len) - tlv_len);
313313
}
314314
return TLV_SPACE(len);
315315
}
@@ -409,7 +409,7 @@ static inline int TCM_SET(void *msg, __u16 cmd, __u16 flags,
409409
tcm_hdr->tcm_flags = htons(flags);
410410
if (data_len && data) {
411411
memcpy(TCM_DATA(msg), data, data_len);
412-
memset(TCM_DATA(msg) + data_len, 0, TCM_SPACE(data_len) - msg_len);
412+
memset((char *)TCM_DATA(msg) + data_len, 0, TCM_SPACE(data_len) - msg_len);
413413
}
414414
return TCM_SPACE(data_len);
415415
}

include/uapi/linux/virtio_ring.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ static inline void vring_init(struct vring *vr, unsigned int num, void *p,
169169
{
170170
vr->num = num;
171171
vr->desc = p;
172-
vr->avail = p + num*sizeof(struct vring_desc);
172+
vr->avail = (struct vring_avail *)((char *)p + num * sizeof(struct vring_desc));
173173
vr->used = (void *)(((uintptr_t)&vr->avail->ring[num] + sizeof(__virtio16)
174174
+ align-1) & ~(align - 1));
175175
}

0 commit comments

Comments
 (0)