History

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.

Alexey Dobriyan committed 7 years ago

Commit d6547f21 parent de417d16 files · +7 −7Browse files

Showing the changes to include/uapi/linux (6 of 6 files). Show all

Unified · Split

6 files
  1. include/uapi/linux/netfilter_arp/arp_tables.h +1 −1
  2. include/uapi/linux/netfilter_bridge/ebtables.h +1 −1
  3. include/uapi/linux/netfilter_ipv4/ip_tables.h +1 −1
  4. include/uapi/linux/netfilter_ipv6/ip6_tables.h +1 −1
  5. include/uapi/linux/tipc_config.h +2 −2
  6. include/uapi/linux/virtio_ring.h +1 −1
include/uapi/linux/netfilter_arp/arp_tables.h+1−1
@@ -199,7 +199,7 @@ struct arpt_get_entries { · 198 unmodified lines
199/* Helper functions */199/* Helper functions */
200static __inline__ struct xt_entry_target *arpt_get_target(struct arpt_entry *e)200static __inline__ struct xt_entry_target *arpt_get_target(struct arpt_entry *e)
201{201{
202 return (void *)e + e->target_offset;202 return (struct xt_entry_target *)((char *)e + e->target_offset);
203}203}
204 204
205/*205/*
include/uapi/linux/netfilter_bridge/ebtables.h+1−1
@@ -194,7 +194,7 @@ struct ebt_entry { · 193 unmodified lines
194static __inline__ struct ebt_entry_target *194static __inline__ struct ebt_entry_target *
195ebt_get_target(struct ebt_entry *e)195ebt_get_target(struct ebt_entry *e)
196{196{
197 return (void *)e + e->target_offset;197 return (struct ebt_entry_target *)((char *)e + e->target_offset);
198}198}
199 199
200/* {g,s}etsockopt numbers */200/* {g,s}etsockopt numbers */
include/uapi/linux/netfilter_ipv4/ip_tables.h+1−1
@@ -222,7 +222,7 @@ struct ipt_get_entries { · 221 unmodified lines
222static __inline__ struct xt_entry_target *222static __inline__ struct xt_entry_target *
223ipt_get_target(struct ipt_entry *e)223ipt_get_target(struct ipt_entry *e)
224{224{
225 return (void *)e + e->target_offset;225 return (struct xt_entry_target *)((char *)e + e->target_offset);
226}226}
227 227
228/*228/*
include/uapi/linux/netfilter_ipv6/ip6_tables.h+1−1
@@ -262,7 +262,7 @@ struct ip6t_get_entries { · 261 unmodified lines
262static __inline__ struct xt_entry_target *262static __inline__ struct xt_entry_target *
263ip6t_get_target(struct ip6t_entry *e)263ip6t_get_target(struct ip6t_entry *e)
264{264{
265 return (void *)e + e->target_offset;265 return (struct xt_entry_target *)((char *)e + e->target_offset);
266}266}
267 267
268/*268/*
include/uapi/linux/tipc_config.h+2−2
@@ -309,7 +309,7 @@ static inline int TLV_SET(void *tlv, __u16 type, void *data, __u16 len) · 308 unmodified lines
309 tlv_ptr->tlv_len = htons(tlv_len);309 tlv_ptr->tlv_len = htons(tlv_len);
310 if (len && data) {310 if (len && data) {
311 memcpy(TLV_DATA(tlv_ptr), data, len);311 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);
313 }313 }
314 return TLV_SPACE(len);314 return TLV_SPACE(len);
315}315}
@@ -409,7 +409,7 @@ static inline int TCM_SET(void *msg, __u16 cmd, __u16 flags, · 93 unmodified lines
409 tcm_hdr->tcm_flags = htons(flags);409 tcm_hdr->tcm_flags = htons(flags);
410 if (data_len && data) {410 if (data_len && data) {
411 memcpy(TCM_DATA(msg), data, data_len);411 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);
413 }413 }
414 return TCM_SPACE(data_len);414 return TCM_SPACE(data_len);
415}415}
include/uapi/linux/virtio_ring.h+1−1
@@ -169,7 +169,7 @@ static inline void vring_init(struct vring *vr, unsigned int num, void *p, · 168 unmodified lines
169{169{
170 vr->num = num;170 vr->num = num;
171 vr->desc = p;171 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));
173 vr->used = (void *)(((uintptr_t)&vr->avail->ring[num] + sizeof(__virtio16)173 vr->used = (void *)(((uintptr_t)&vr->avail->ring[num] + sizeof(__virtio16)
174 + align-1) & ~(align - 1));174 + align-1) & ~(align - 1));
175}175}