From 7ac1f99173c3a5c994bfe4c063d38da4a086002c Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sun, 7 Jul 2019 21:25:13 -0700 Subject: [PATCH] Avoid pointer arithmetic on `void *` --- netlink_smc_diag.c | 4 ++-- sockaddr.c | 2 +- ucopy.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/netlink_smc_diag.c b/netlink_smc_diag.c index 16815fde..09a748a8 100644 --- a/netlink_smc_diag.c +++ b/netlink_smc_diag.c @@ -41,7 +41,7 @@ DECL_NETLINK_DIAG_DECODER(decode_smc_diag_req) if (len >= sizeof(req)) { if (!umoven_or_printaddr(tcp, addr + offset, sizeof(req) - offset, - (void *) &req + offset)) { + (char *) &req + offset)) { PRINT_FIELD_FLAGS("", req, diag_ext, smc_diag_extended_flags, "1<= sizeof(msg)) { if (!umoven_or_printaddr(tcp, addr + offset, sizeof(msg) - offset, - (void *) &msg + offset)) { + (char *) &msg + offset)) { PRINT_FIELD_XVAL("", msg, diag_state, smc_states, "SMC_???"); PRINT_FIELD_XVAL(", ", msg, diag_fallback, diff --git a/sockaddr.c b/sockaddr.c index c67d60e9..0e6360f0 100644 --- a/sockaddr.c +++ b/sockaddr.c @@ -475,7 +475,7 @@ print_sockaddr_data_ll(const void *const buf, const int addrlen) static void print_sockaddr_data_raw(const void *const buf, const int addrlen) { - const char *const data = buf + SIZEOF_SA_FAMILY; + const char *const data = (const char *)buf + SIZEOF_SA_FAMILY; const int datalen = addrlen - SIZEOF_SA_FAMILY; tprints("sa_data="); diff --git a/ucopy.c b/ucopy.c index 21f55e28..cee9f2e0 100644 --- a/ucopy.c +++ b/ucopy.c @@ -183,7 +183,7 @@ umoven_peekdata(const int pid, kernel_ulong_t addr, unsigned int len, memcpy(laddr, &u.x[residue], m); residue = 0; addr += sizeof(long); - laddr += m; + laddr = (char *)laddr + m; nread += m; len -= m; } @@ -280,10 +280,10 @@ umovestr_peekdata(const int pid, kernel_ulong_t addr, unsigned int len, memcpy(laddr, &u.x[residue], m); while (residue < sizeof(long)) if (u.x[residue++] == '\0') - return (laddr - orig_addr) + residue; + return nread + residue; residue = 0; addr += sizeof(long); - laddr += m; + laddr = (char *)laddr + m; nread += m; len -= m; } -- 2.23.0