From patchwork Sun Jan 12 14:58:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 104616 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5760A3857836 for ; Sun, 12 Jan 2025 14:59:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5760A3857836 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 716CD3857823 for ; Sun, 12 Jan 2025 14:58:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 716CD3857823 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 716CD3857823 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736693906; cv=none; b=opfENde8gQFYGG+ajlkykd2a19XWx0CweUDNM2mV8uAUbkxzNHU0MHBccTD5um1tSKwM7iGXxUIdOAfajwztZDuIOlg/z3P9G7FTPwNHFDc7f/Xcetnbfkarh2mov7w6S5wTVbuMT+eJ40j0FGHckqRy69/UJq9nveKHxF/9L0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736693906; c=relaxed/simple; bh=vA690ObfL7kU/5gAInSRhD/q81j/c4AoizxvTgq9Es4=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=cphE2T5s8aegmAAmwXr8bfLvp+FOomL7/SeAPXCsWRa6zYfTbmujWsedyCVNM+8ZZAhrgdzy/yzeuuFbWxx0LasYTd+ZFCSj6OqJ2M+/Zt0vkZVzxUncJ20XygQMM5Dn5dWI/hB4pNsYljVY+R0SoeuiwvtvW3Yf0pRBKjZxFfU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 716CD3857823 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 606A8A48E4; Sun, 12 Jan 2025 15:58:25 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kcNVPSpmy9sd; Sun, 12 Jan 2025 15:58:25 +0100 (CET) Received: from begin (aamiens-653-1-40-48.w83-192.abo.wanadoo.fr [83.192.199.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 475DAA03E5; Sun, 12 Jan 2025 15:58:25 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tWzQ0-0000000CBrv-2vGx; Sun, 12 Jan 2025 15:58:24 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited] socket/tst-cmsghdr: Fix alignment of cmsghdr Date: Sun, 12 Jan 2025 15:58:24 +0100 Message-ID: <20250112145824.2905552-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org The computation was correct on Linux only by luck because the cmsghdr size is already aligned there. --- socket/tst-cmsghdr-skeleton.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/socket/tst-cmsghdr-skeleton.c b/socket/tst-cmsghdr-skeleton.c index e2b743a368..9ad2d59d5f 100644 --- a/socket/tst-cmsghdr-skeleton.c +++ b/socket/tst-cmsghdr-skeleton.c @@ -56,7 +56,7 @@ RUN_TEST_FUNCNAME (CMSG_NXTHDR_IMPL) (void) /* The first header leaves just enough space to hold another header. */ cmsg = CMSG_FIRSTHDR (&m); TEST_VERIFY_EXIT ((char *) cmsg == cmsgbuf); - cmsg->cmsg_len = sizeof (cmsgbuf) - sizeof (struct cmsghdr); + cmsg->cmsg_len = sizeof (cmsgbuf) - CMSG_ALIGN (sizeof (struct cmsghdr)); cmsg = CMSG_NXTHDR_IMPL (&m, cmsg); TEST_VERIFY_EXIT (cmsg != NULL); @@ -75,7 +75,7 @@ RUN_TEST_FUNCNAME (CMSG_NXTHDR_IMPL) (void) TEST_VERIFY_EXIT (cmsg != NULL); cmsg->cmsg_len = sizeof (cmsgbuf) - CMSG_SPACE (sizeof (PAYLOAD)) /* First header. */ - - sizeof (struct cmsghdr); + - CMSG_ALIGN (sizeof (struct cmsghdr)); cmsg = CMSG_NXTHDR_IMPL (&m, cmsg); TEST_VERIFY_EXIT (cmsg != NULL);