From: John David Anglin <dave.anglin@bell.net>
To: John David Anglin <dave@parisc-linux.org>, libc-alpha@sourceware.org
Cc: Helge Deller <deller@gmx.de>
Subject: Re: resolv: Fix some unaligned accesses in resolver [BZ #30750]
Date: Tue, 12 Sep 2023 18:39:09 -0400 [thread overview]
Message-ID: <9128d3bf-92b9-815c-9a8e-a72d1391a892@bell.net> (raw)
In-Reply-To: <ZOz8q+iXSpdwq25v@mx3210.localdomain>
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);
--
John David Anglin dave.anglin@bell.net
next prev parent reply other threads:[~2023-09-12 22:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-28 19:59 John David Anglin
2023-09-12 22:39 ` John David Anglin [this message]
2023-09-13 6:28 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9128d3bf-92b9-815c-9a8e-a72d1391a892@bell.net \
--to=dave.anglin@bell.net \
--cc=dave@parisc-linux.org \
--cc=deller@gmx.de \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).