logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-Avoid-void-pointer-arithmetic.patch (1784B)

    

  1. From 2ce67cdaf8af1ab4198ef28da002d5275d314c34 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sun, 16 Aug 2020 18:00:54 -0700
  4. Subject: [PATCH] Avoid void pointer arithmetic
  6. ISO C requires the pointer to be to a complete object type.
  7. ---
  8.  acpi_ids.c   | 2 +-
  9.  libnetlink.c | 2 +-
  10.  libnetlink.h | 2 +-
  11.  3 files changed, 3 insertions(+), 3 deletions(-)
  13. diff --git a/acpi_ids.c b/acpi_ids.c
  14. index ba218d7..08271cb 100644
  15. --- a/acpi_ids.c
  16. +++ b/acpi_ids.c
  17. @@ -126,7 +126,7 @@ genl_get_mcast_group_id(struct nlmsghdr *n)
  18.  	}
  19.  
  20.  	/* set attrs to point to the attribute */
  21. -	attrs = (struct rtattr *)(NLMSG_DATA(n) + GENL_HDRLEN);
  22. +	attrs = (struct rtattr *)((char *)NLMSG_DATA(n) + GENL_HDRLEN);
  23.  	/* Read the table from the message into "tb".  This actually just  */
  24.  	/* places pointers into the message into tb[].  */
  25.  	parse_rtattr(tb, CTRL_ATTR_MAX, attrs, len);
  26. diff --git a/libnetlink.c b/libnetlink.c
  27. index 23ae7dd..24948bf 100644
  28. --- a/libnetlink.c
  29. +++ b/libnetlink.c
  30. @@ -523,7 +523,7 @@ int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len)
  31.  	}
  32.  
  33.  	memcpy(NLMSG_TAIL(n), data, len);
  34. -	memset((void *) NLMSG_TAIL(n) + len, 0, NLMSG_ALIGN(len) - len);
  35. +	memset((char *) NLMSG_TAIL(n) + len, 0, NLMSG_ALIGN(len) - len);
  36.  	n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len);
  37.  	return 0;
  38.  }
  39. diff --git a/libnetlink.h b/libnetlink.h
  40. index 8f9cb5e..7b2f8bc 100644
  41. --- a/libnetlink.h
  42. +++ b/libnetlink.h
  43. @@ -53,7 +53,7 @@ extern int rtnl_from_file(FILE *, rtnl_filter_t handler,
  44.  		       void *jarg);
  45.  
  46.  #define NLMSG_TAIL(nmsg) \
  47. -	((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
  48. +	((struct rtattr *) (((char *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
  49.  
  50.  #ifndef IFA_RTA
  51.  #define IFA_RTA(r) \
  52. -- 
  53. 2.37.3