From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1118) id A0EAF3858D20; Wed, 13 Sep 2023 11:05:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A0EAF3858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1694603133; bh=Mxuu4Z24X7iJ2GSBeSAvOQJMJITyY8kCxyVYLt09ZiQ=; h=From:To:Subject:Date:From; b=duobXWBsumCYFFtp1GGd0CLfvntF8E9UhKh+0wzl2aGmyDy3DzfOt/MGyHJBF3Uvj MpB4s4WTbOSRCz7rxjRlvHhwy/XANh60Tvv0t9V+e9oov5JxT6dQbWyTnaFUiVuPi5 TYUolnhD9NgpZlHZ/+rQG7k4g0H4WkOhgBLOSGCM= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: John David Anglin To: glibc-cvs@sourceware.org Subject: [glibc] resolv: Fix some unaligned accesses in resolver [BZ #30750] X-Act-Checkin: glibc X-Git-Author: John David Anglin X-Git-Refname: refs/heads/master X-Git-Oldrev: 72511f539cc34681ec61c6a0dc2fe6d684760ffe X-Git-Newrev: c8fa383f4cec9cf1c0cc8ec97903c09af10286f4 Message-Id: <20230913110533.A0EAF3858D20@sourceware.org> Date: Wed, 13 Sep 2023 11:05:33 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c8fa383f4cec9cf1c0cc8ec97903c09af10286f4 commit c8fa383f4cec9cf1c0cc8ec97903c09af10286f4 Author: John David Anglin Date: Wed Sep 13 11:04:41 2023 +0000 resolv: Fix some unaligned accesses in resolver [BZ #30750] Signed-off-by: John David Anglin Diff: --- resolv/res_nameinquery.c | 3 ++- resolv/res_queriesmatch.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 #include +#include /* 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 +#include /* 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);