Fix unaligned access in macOS/Solaris hwaddr and auth-token
PATCH 1/2 Fix unaligned access in macOS/Solaris hwaddr and auth-token
The undefined behaviour USAN clang checker found these two cases. The optimiser of clang/gcc will optimise the memcpy away in the auth_token case and output excactly the same assembly on amd64/arm64 but it is still better to not rely on undefined behaviour.
The hw addr fix is a mess but so are the original structures.
Signed-off-by Arne Schwabe <[email protected]...>
--- src/openvpn/auth_token.c | 10 ++++++++-- src/openvpn/route.c | 32 +++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 11 deletions(-)
src/openvpn/auth_token.c +8 -2
@@ -324,8 +324,14 @@ verify_auth_token(struct user_pass *up, struct tls_multi *multi,const uint8_t *tstamp_initial = sessid +AUTH_TOKEN_SESSION_ID_LEN ;const uint8_t *tstamp = tstamp_initial +sizeof (int64_t ); -uint64_t timestamp =ntohll (*((uint64_t *) (tstamp))); -uint64_t timestamp_initial =ntohll (*((uint64_t *) (tstamp_initial))); +/* This might not be aligned to an uint64, use memcpy to avoid +* unaligned access */ +uint64_t timestamp =0 , timestamp_initial =0 ; +memcpy (×tamp, tstamp,sizeof (uint64_t )); + timestamp =ntohll (timestamp); + +memcpy (×tamp_initial, tstamp_initial,sizeof (uint64_t )); + timestamp_initial =ntohll (timestamp_initial);hmac_ctx_t *ctx = multi->opt.auth_token_key.hmac;if (check_hmac_token (ctx, b64decoded, up->username))
src/openvpn/route.c +23 -9
@@ -3637,7 +3637,7 @@ get_default_gateway(struct route_gateway_info *rgi, openvpn_net_ctx_t *ctx)if (rgi->flags &RGI_IFACE_DEFINED ) {struct ifconf ifc; -struct ifreq *ifr; +struct ifreq ifr;const int bufsize =4096 ;char *buffer;
@@ -3662,23 +3662,37 @@ get_default_gateway(struct route_gateway_info *rgi, openvpn_net_ctx_t *ctx)for (cp = buffer; cp <= buffer + ifc.ifc_len -sizeof (struct ifreq ); ) { - ifr = (struct ifreq *)cp; +/* this is not always using an 8byte alignment that struct ifr +* requires */ +memcpy (&ifr, cp,sizeof (struct ifreq ));#if defined(TARGET_SOLARIS ) -const size_t len =sizeof (ifr->ifr_name) +sizeof (ifr->ifr_addr); +const size_t len =sizeof (ifr.ifr_name) +sizeof (ifr.ifr_addr);#else -const size_t len =sizeof (ifr->ifr_name) +max (sizeof (ifr->ifr_addr), ifr->ifr_addr.sa_len); +const size_t len =sizeof (ifr.ifr_name) +max (sizeof (ifr.ifr_addr), ifr.ifr_addr.sa_len);#endif -if (!ifr->ifr_addr.sa_family) +if (!ifr.ifr_addr.sa_family) {break ; } -if (!strncmp (ifr->ifr_name, rgi->iface,IFNAMSIZ )) +if (!strncmp (ifr.ifr_name, rgi->iface,IFNAMSIZ )) { -if (ifr->ifr_addr.sa_family ==AF_LINK ) +if (ifr.ifr_addr.sa_family ==AF_LINK ) { -struct sockaddr_dl *sdl = (struct sockaddr_dl *)&ifr->ifr_addr; -memcpy (rgi->hwaddr,LLADDR (sdl),6 ); +/* This is a broken member access. struct sockaddr_dl has +* 20 bytes while if_addr has only 16 bytes. So casting if_addr +* to struct sockaddr_dl gives (legitimate) warnings +* +* sockaddr_dl has 12 bytes space for the hw address and +* Ethernet only uses 6 bytes. So the last 4 that are +* truncated and not in if_addr can be ignored here. +* +* So we use a memcpy here to avoid the warnings with ASAN +* that we are doing a very nasty cast here +*/ +struct sockaddr_dl sdl = {0 }; +memcpy (&sdl, &ifr.ifr_addr,sizeof (ifr.ifr_addr)); +memcpy (rgi->hwaddr,LLADDR (&sdl),6 ); rgi->flags |=RGI_HWADDR_DEFINED ; } }
Signature · 1 line
2.37.1 (Apple Git-137.1)
PATCH 2/2 Add undefined and abort on error to clang sanaitize builds
The -fno-sanitize-recover=all flag ensures that for all errors we actually abort the tests in the automated testing and not just print some errors in red that nobody sess. Also add the undefined tests to catch more bugs
Signed-off-by Arne Schwabe <[email protected]...>
--- .github/workflows/build.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
.github/workflows/build.yaml +5 -5
@@ -251,7 +251,7 @@ jobs: - name: autoconf run: autoreconf -fvi - name: configure - run: CFLAGS="-fsanitize=address -fno-omit-frame-pointer -O2" CC=clang ./configure --with-crypto-library=${{matrix.ssllib}} + run: CFLAGS="-fsanitize=address,undefined -fno-sanitize-recover=all -fno-omit-frame-pointer -O2" CC=clang ./configure --with-crypto-library=${{matrix.ssllib}} - name: make all run: make -j3 - name: make check
@@ -266,8 +266,8 @@ jobs: os: [macos-11, macos-12] include: - build: asan - cflags: "-fsanitize=address -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address + cflags: "-fsanitize=address,undefined -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" + ldflags: -fsanitize=address,undefined -fno-sanitize-recover=all # Our build system ignores LDFLAGS for plugins configureflags: --disable-plugin-auth-pam --disable-plugin-down-root - build: normal
@@ -386,8 +386,8 @@ jobs: configureflags: ["--with-openssl-engine=no"] include: - build: asan - cflags: "-fsanitize=address -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address + cflags: "-fsanitize=address,undefined -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" + ldflags: -fsanitize=address,undefined -fno-sanitize-recover=all cc: clang - build: normal cflags: "-O2 -g"
Signature · 1 line
2.37.1 (Apple Git-137.1)