From patchwork Mon Jun 14 23:40:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 1491920 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=Lrv8HHGe; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G3ny62fgsz9sTD for ; Tue, 15 Jun 2021 09:40:46 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 901C73973035 for ; Mon, 14 Jun 2021 23:40:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 901C73973035 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623714043; bh=4eiutRgPP1cSB1+i0pHLnr9dAV4XVND8XarJiA/wAS4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Lrv8HHGeQclc69UN4fCqRno1qjqKkbuTNc6R608tRHRxpSZ3vZKX+rErMoRsPoZXS 5NgZXWWMMWkig6j0fHpIODtIEhCj1HoVxDGPFmSd7T8eE0nyeQUbyTz0VJzlKpYvh9 Kqj1G15kPWmbASpWNX4nO5to7kA3OA2gJkrYY/94= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by sourceware.org (Postfix) with ESMTPS id 3B92E385040D for ; Mon, 14 Jun 2021 23:40:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3B92E385040D Received: by mail-pj1-x102d.google.com with SMTP id bb10-20020a17090b008ab029016eef083425so233831pjb.5 for ; Mon, 14 Jun 2021 16:40:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4eiutRgPP1cSB1+i0pHLnr9dAV4XVND8XarJiA/wAS4=; b=taBYkB0cxutdf6AJIw+tX+pgrdfHNL0m/qARFZvaM78go6HLryQ80n+QcP8aYSy/UR 3iVyiH2LzLrtp2BgowQ1XT8C00JOgWbdn0GbpiudhqLv8SoCcVF488Ua5HPr+SZwoewH SP2nYpicSaDoxnUPPr57ErJhvT634YRUWpNPQBCNaJJsfrOhn03pcrr8TwAyDnQmla2P Ljqzdrp6ka4rThCVJU6y4W9GL6rouB9s25lE3KiPdzx7/Nu89ur3PxjqHw4NAdFJih3e S/MyKyUXY6NLPAzp2YNdoznotGpVi5kvxlTBDSIUP9kqBHvVDBljPb2ebps4zDhkSDnA njfA== X-Gm-Message-State: AOAM533EU85PDyqQSZDFkrBIr01kfOs3w/PhThTHhXxotPpd6cDd3LP9 X2w1ERkDkmJ+q3dSAQKiciPyd93MtZk= X-Google-Smtp-Source: ABdhPJxTWxgyRHsijQG//cly6WOJEc+yXA6+zLHi06exxkOCAowzqosT+5vID2N+RwWhsNdNjo/Czg== X-Received: by 2002:a17:902:bd03:b029:11c:d504:c1ce with SMTP id p3-20020a170902bd03b029011cd504c1cemr1423270pls.7.1623714027006; Mon, 14 Jun 2021 16:40:27 -0700 (PDT) Received: from localhost (g151.115-65-219.ppp.wakwak.ne.jp. [115.65.219.151]) by smtp.gmail.com with ESMTPSA id 21sm13025280pfh.103.2021.06.14.16.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 16:40:26 -0700 (PDT) To: GLIBC patches Subject: [PATCH] resolv: Fix tests by aligning hand crafted queries Date: Tue, 15 Jun 2021 08:40:11 +0900 Message-Id: <20210614234011.2215641-1-shorne@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Stafford Horne via Libc-alpha From: Stafford Horne Reply-To: Stafford Horne Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" When testing OpenRISC I get a bus error in res_send. This is due to the buf being cast to a (HEADER *) and trying the res_send code trying to read different bits of the HEADER struct including 16-bit id etc. On OpenRISC reads of 16-bits and 32-bits from structures need to be 2 byte and 4 byte aligned, respectively. To fix this we can align the hand crafted queries. --- resolv/tst-resolv-binary.c | 2 +- resolv/tst-resolv-trustad.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/resolv/tst-resolv-binary.c b/resolv/tst-resolv-binary.c index 44895a1baa..f76ae057c4 100644 --- a/resolv/tst-resolv-binary.c +++ b/resolv/tst-resolv-binary.c @@ -52,7 +52,7 @@ do_test (void) for (int b = 0; b <= 255; ++b) { - unsigned char query[] = + unsigned char query[] __attribute__ ((aligned)) = { b, b, /* Transaction ID. */ 1, 0, /* Query with RD flag. */ diff --git a/resolv/tst-resolv-trustad.c b/resolv/tst-resolv-trustad.c index 74ee5db735..8d6989adb4 100644 --- a/resolv/tst-resolv-trustad.c +++ b/resolv/tst-resolv-trustad.c @@ -93,7 +93,8 @@ do_test (void) /* By default, the resolver is not trusted, and the AD bit is cleared. */ - static const unsigned char hand_crafted_query[] = + static const unsigned char hand_crafted_query[] + __attribute__ ((aligned)) = { 10, 11, /* Transaction ID. */ 1, 0x20, /* Query with RD, AD flags. */