From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cmx-mtlrgo001.bell.net (mta-mtl-005.bell.net [209.71.208.25]) by sourceware.org (Postfix) with ESMTP id 7C20E3858D3C for ; Tue, 12 Sep 2023 22:39:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7C20E3858D3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=bell.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bell.net X-RG-CM-BuS: 0 X-RG-CM-SC: 0 X-RG-CM: Clean X-Originating-IP: [174.88.80.174] X-RG-Env-Sender: dave.anglin@bell.net X-RG-Rigid: 64C3528204553082 X-CM-Envelope: MS4xfIVy8qVUe+yX/MxyNUyc7O5pjjCVrHwLrMa8oQWkhsLJmLNkZrBppJxOCYGdyk1VXQWDjTBO7gnZA3iqWv7krDrDg8Jhho+8956wiY3PBB0mr8yQq3hW bQ0IPFBT7Gwkv140W5aoU1lTwkwrxHDw2+ECCRIi/oIDWqO6/zGJTQSgW4pfF1Zjb+eS9Z8qIkVR8QV24F7P0ULRJQAVdEU/z9oQLOOfJqSAUlxhw2nis4wU HsyJODmC3z1/CZgZafseOAC/QNxMLbOFzfAnq8zFjinX24BGd4yXD9Fqoo+AndslRHvizq+ErfaXB/YU+PZZ/Q== X-CM-Analysis: v=2.4 cv=W7Nb6Tak c=1 sm=1 tr=0 ts=6500e88c a=NkkRUIc9Fga6GQ4JCcDOLQ==:117 a=NkkRUIc9Fga6GQ4JCcDOLQ==:17 a=IkcTkHD0fZMA:10 a=FBHGMhGWAAAA:8 a=HtF9eWX5-wZBsfVrmuIA:9 a=QEXdDO2ut3YA:10 a=9gvnlMMaQFpL9xblJ6ne:22 Received: from [192.168.2.49] (174.88.80.174) by cmx-mtlrgo001.bell.net (5.8.814) (authenticated as dave.anglin@bell.net) id 64C3528204553082; Tue, 12 Sep 2023 18:39:08 -0400 Message-ID: <9128d3bf-92b9-815c-9a8e-a72d1391a892@bell.net> Date: Tue, 12 Sep 2023 18:39:09 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: Re: resolv: Fix some unaligned accesses in resolver [BZ #30750] Content-Language: en-US To: John David Anglin , libc-alpha@sourceware.org Cc: Helge Deller References: From: John David Anglin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 > --- > > 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); -- John David Anglin dave.anglin@bell.net