From patchwork Tue Jan 7 00:58:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 104203 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 4E72A3858D28 for ; Tue, 7 Jan 2025 01:00:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4E72A3858D28 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 7240F3858C98 for ; Tue, 7 Jan 2025 00:58:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7240F3858C98 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 7240F3858C98 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=1736211516; cv=none; b=xhWVjMxnNmFLZTKioEeBtQPXt0UVmbcV6jnmADmqOzBh7LQRnVcIWIwrEYuFl5anoy6mHHErrZvSyZEirgPbWwXNWaZ7p+87kLGI7o7IdV5kGY3VvGOKU2NM3ZPluwHMTUXZHQeN239sFDOO2BgenKkMRpWk7jLSDZ0/RBd5DoM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736211516; c=relaxed/simple; bh=hoKLg1DeoYaUsSYAgcHQxV2RvJgdhzJs0iK3Bf9vnkc=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=fc0CWaOgclHbvoLOsOYWrzyqM72K7DiwSE523/F/vNPcCS/btZOZxnV8SUGuD19Ygu4DCjt9+/xPT3hHBJ7RdrQP3EY5zQ7st47d6hO8WhF5NVUQ6bRYd+t/doD9I1iezYLeOeGLgh4AbdWfI6RePr0SoZSvrayC2c3aOohRQDQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7240F3858C98 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id ADECDA047A; Tue, 7 Jan 2025 01:58:35 +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 p7lNvrglS-eD; Tue, 7 Jan 2025 01:58:35 +0100 (CET) Received: from begin.home (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 91BC3A0408; Tue, 7 Jan 2025 01:58:35 +0100 (CET) Received: from samy by begin.home with local (Exim 4.98) (envelope-from ) id 1tUxvW-0000000HRUG-3Une; Tue, 07 Jan 2025 01:58:34 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd, commited] tst-xdirent: Fix allocating dirent for readdir_r call Date: Tue, 7 Jan 2025 01:58:34 +0100 Message-ID: <20250107005834.4157229-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 As documented in the glibc manual, “Some systems don’t define the d_name element sufficiently long”, and it provides an example of using a union to properly allocate the storage under the dirent. --- support/tst-xdirent.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/support/tst-xdirent.c b/support/tst-xdirent.c index e14fab6934..d2aa042bbb 100644 --- a/support/tst-xdirent.c +++ b/support/tst-xdirent.c @@ -50,10 +50,14 @@ do_test (void) { DIR *d = xopendir ("."); - struct dirent buf = { 0, }; - TEST_VERIFY (xreaddir_r (d, &buf)); - TEST_COMPARE_STRING (buf.d_name, "."); - while (xreaddir_r (d, &buf)) + union + { + struct dirent d; + char b[offsetof (struct dirent, d_name) + NAME_MAX + 1]; + } buf; + TEST_VERIFY (xreaddir_r (d, &buf.d)); + TEST_COMPARE_STRING (buf.d.d_name, "."); + while (xreaddir_r (d, &buf.d)) ; xclosedir (d); }