submitted-resolv-unaligned

Gbp-Pq: Topic any
Gbp-Pq: Name submitted-resolv-unaligned.diff

diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
index 5bc5b415312fddcefe13c6118fdfa2a65c9461c8..fd9f46bb2bd3714b668513335a3502fd53af0091 100644 (file)
--- a/resolv/res_mkquery.c
+++ b/resolv/res_mkquery.c
@@ -95,6 +95,15 @@
 #include <shlib-compat.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
+
 int
 __res_context_mkquery (struct resolv_context *ctx, int op, const char *dname,
                        int class, int type, const unsigned char *data,

diff --git a/resolv/res_query.c b/resolv/res_query.c
index 5d0a68dc81fdd8c7545780af6b983fb9fab31e51..1115cda26b70ecdffee85323c17ca8e9cab54cc3 100644 (file)
--- 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 5d6be4b82d383dc0ebdf22ebb52caff81b1ab172..d549a9efbb1ff6a7fac3c110f9bdaefeb975b7fd 100644 (file)
--- 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