| Message ID | ZOz8q+iXSpdwq25v@mx3210.localdomain |
|---|---|
| State | New |
| Headers | show |
| Series | resolv: Fix some unaligned accesses in resolver [BZ #30750] | expand |
Ping. Dave On 2023-08-28 3:59 p.m., John David Anglin wrote: > Okay to install? > > resolv: Fix some unaligned accesses in resolver [BZ #30750] > > Signed-off-by: John David Anglin <dave.anglin@bell.net> > --- > > diff --git a/resolv/res_nameinquery.c b/resolv/res_nameinquery.c > index 24172700e1..ca56bc9283 100644 > --- a/resolv/res_nameinquery.c > +++ b/resolv/res_nameinquery.c > @@ -84,6 +84,7 @@ > > #include <arpa/nameser.h> > #include <resolv.h> > +#include <resolv/resolv-internal.h> > > /* Author: paul vixie, 29may94. */ > int > @@ -91,7 +92,7 @@ __libc_res_nameinquery (const char *name, int type, int class, > const unsigned char *buf, const unsigned char *eom) > { > const unsigned char *cp = buf + HFIXEDSZ; > - int qdcount = ntohs (((HEADER *) buf)->qdcount); > + int qdcount = ntohs (((UHEADER *) buf)->qdcount); > > while (qdcount-- > 0) > { > diff --git a/resolv/res_queriesmatch.c b/resolv/res_queriesmatch.c > index 13a6936c47..ba1c1d0c0c 100644 > --- a/resolv/res_queriesmatch.c > +++ b/resolv/res_queriesmatch.c > @@ -83,6 +83,7 @@ > */ > > #include <resolv.h> > +#include <resolv/resolv-internal.h> > > /* Author: paul vixie, 29may94. */ > int > @@ -102,7 +103,7 @@ __libc_res_queriesmatch (const unsigned char *buf1, const unsigned char *eom1, > order. We can compare it with the second buffer's QDCOUNT > value without doing this. */ > int qdcount = ((HEADER *) buf1)->qdcount; > - if (qdcount != ((HEADER *) buf2)->qdcount) > + if (qdcount != ((UHEADER *) buf2)->qdcount) > return 0; > > qdcount = htons (qdcount);
On Aug 28 2023, John David Anglin wrote:
> resolv: Fix some unaligned accesses in resolver [BZ #30750]
Ok.
diff --git a/resolv/res_nameinquery.c b/resolv/res_nameinquery.c index 24172700e1..ca56bc9283 100644 --- a/resolv/res_nameinquery.c +++ b/resolv/res_nameinquery.c @@ -84,6 +84,7 @@ #include <arpa/nameser.h> #include <resolv.h> +#include <resolv/resolv-internal.h> /* Author: paul vixie, 29may94. */ int @@ -91,7 +92,7 @@ __libc_res_nameinquery (const char *name, int type, int class, const unsigned char *buf, const unsigned char *eom) { const unsigned char *cp = buf + HFIXEDSZ; - int qdcount = ntohs (((HEADER *) buf)->qdcount); + int qdcount = ntohs (((UHEADER *) buf)->qdcount); while (qdcount-- > 0) { diff --git a/resolv/res_queriesmatch.c b/resolv/res_queriesmatch.c index 13a6936c47..ba1c1d0c0c 100644 --- a/resolv/res_queriesmatch.c +++ b/resolv/res_queriesmatch.c @@ -83,6 +83,7 @@ */ #include <resolv.h> +#include <resolv/resolv-internal.h> /* Author: paul vixie, 29may94. */ int @@ -102,7 +103,7 @@ __libc_res_queriesmatch (const unsigned char *buf1, const unsigned char *eom1, order. We can compare it with the second buffer's QDCOUNT value without doing this. */ int qdcount = ((HEADER *) buf1)->qdcount; - if (qdcount != ((HEADER *) buf2)->qdcount) + if (qdcount != ((UHEADER *) buf2)->qdcount) return 0; qdcount = htons (qdcount);
Okay to install? resolv: Fix some unaligned accesses in resolver [BZ #30750] Signed-off-by: John David Anglin <dave.anglin@bell.net> ---