[PATCH v3, resend] Fix misaligned accesses to fields in HEADER struct defined in <arpa/nameser_compat.h>
John David Anglin
dave.anglin@bell.net
Tue Mar 15 13:42:03 GMT 2022
This is a resend of the following message:
https://sourceware.org/legacy-ml/libc-alpha/2016-06/msg01020.html
I checked that the attached change still applies to the current
master tree and that it fixes the misaligned accesses on hppa.
This is BZ 20243.
Dave
---
diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
index 5bc5b41531..9b82c82157 100644
--- a/resolv/res_mkquery.c
+++ b/resolv/res_mkquery.c
@@ -193,6 +193,15 @@ context_mkquery_common (struct resolv_context *ctx,
return result;
}
+/* The structure HEADER is normally aligned to a word boundary and its
+ fields are accessed using word loads and stores. We need to access
+ this structure when it is aligned on a byte boundary. This can cause
+ problems on machines with strict alignment. So, we create a new
+ typedef to reduce its alignment to one. This ensures the fields are
+ accessed with byte loads and stores. */
+typedef HEADER __attribute__ ((__aligned__(1))) UHEADER;
+#define HEADER UHEADER
+
/* Form all types of queries. Returns the size of the result or -1 on
error.
diff --git a/resolv/res_query.c b/resolv/res_query.c
index 5d0a68dc81..1115cda26b 100644
--- a/resolv/res_query.c
+++ b/resolv/res_query.c
@@ -81,6 +81,14 @@
#include <string.h>
#include <shlib-compat.h>
+/* The structure HEADER is normally aligned to a word boundary and its
+ fields are accessed using word loads and stores. We need to access
+ this structure when it is aligned on a byte boundary. This can cause
+ problems on machines with strict alignment. So, we create a new
+ typedef to reduce its alignment to one. This ensures the fields are
+ accessed with byte loads and stores. */
+typedef HEADER __attribute__ ((__aligned__(1))) UHEADER;
+
#if PACKETSZ > 65536
#define MAXPACKET PACKETSZ
#else
@@ -112,8 +120,8 @@ __res_context_query (struct resolv_context *ctx, const char *name,
int *nanswerp2, int *resplen2, int *answerp2_malloced)
{
struct __res_state *statp = ctx->resp;
- HEADER *hp = (HEADER *) answer;
- HEADER *hp2;
+ UHEADER *hp = (UHEADER *) answer;
+ UHEADER *hp2;
int n, use_malloc = 0;
size_t bufsize = (type == T_QUERY_A_AND_AAAA ? 2 : 1) * QUERYSIZE;
@@ -217,7 +225,7 @@ __res_context_query (struct resolv_context *ctx, const char *name,
if (answerp != NULL)
/* __res_context_send might have reallocated the buffer. */
- hp = (HEADER *) *answerp;
+ hp = (UHEADER *) *answerp;
/* We simplify the following tests by assigning HP to HP2 or
vice versa. It is easy to verify that this is the same as
@@ -228,7 +236,7 @@ __res_context_query (struct resolv_context *ctx, const char *name,
}
else
{
- hp2 = (HEADER *) *answerp2;
+ hp2 = (UHEADER *) *answerp2;
if (n < (int) sizeof (HEADER))
{
hp = hp2;
@@ -338,7 +346,7 @@ __res_context_search (struct resolv_context *ctx,
{
struct __res_state *statp = ctx->resp;
const char *cp;
- HEADER *hp = (HEADER *) answer;
+ UHEADER *hp = (UHEADER *) answer;
char tmp[NS_MAXDNAME];
u_int dots;
int trailing_dot, ret, saved_herrno;
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 5d6be4b82d..d549a9efbb 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -111,6 +111,15 @@
#include <libc-diag.h>
#include <random-bits.h>
+/* The structure HEADER is normally aligned to a word boundary and its
+ fields are accessed using word loads and stores. We need to access
+ this structure when it is aligned on a byte boundary. This can cause
+ problems on machines with strict alignment. So, we create a new
+ typedef to reduce its alignment to one. This ensures the fields are
+ accessed with byte loads and stores. */
+typedef HEADER __attribute__ ((__aligned__(1))) UHEADER;
+#define HEADER UHEADER
+
#if PACKETSZ > 65536
#define MAXPACKET PACKETSZ
#else
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://sourceware.org/pipermail/libc-alpha/attachments/20220315/150362af/attachment.sig>
More information about the Libc-alpha
mailing list