From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:470:142:3::10]) by sourceware.org (Postfix) with ESMTPS id 1AE6B3858C60 for ; Sat, 29 Apr 2023 15:01:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1AE6B3858C60 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gnu.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gnu.org Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psm4g-0001d6-Kl; Sat, 29 Apr 2023 11:01:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=In-Reply-To:MIME-Version:References:Subject:To:From: Date; bh=dJPi9jOpZweHCJGPrR2Vr2P7JMpA8XgFjUHl7HfXL84=; b=RS+2Ffp5ffnHrrWWkNa8 A9JbR1K6jiA4rGh9+1MElWf8bXxP+n8nzTGwjkZJ6HNUcG/Cyo9EBSMohMrrjQWQ/IgXaCGP1E3oj YT6t/HgWyk26CmpIm2unz2b5osHq7P6nyC4uDtb4Mf5vBVtdacQnstVQQ0qSmN9YKS6quwq6n7hMJ o+cVMjDKCQ+MPcnSHi82j9scUquv5ilfBqg1GkoTotHqYjGIIKLlJ7IFheQbGCvepTrzf+7S5WpKv NvLpJ0wcs+F5dIGPeplgGflTL27/6OyzTeeyEVy2eI6PgkFc4g21+Ta9Jmo1850hkC4tqewtFkPOX 76wRRM6iX0gi9A==; Received: from [2a01:cb19:4a:a400:de41:a9ff:fe47:ec49] (helo=begin.home) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psm4g-0003zd-1I; Sat, 29 Apr 2023 11:01:22 -0400 Received: from samy by begin.home with local (Exim 4.96) (envelope-from ) id 1psm4e-002EgV-2m; Sat, 29 Apr 2023 17:01:20 +0200 Date: Sat, 29 Apr 2023 17:01:20 +0200 From: Samuel Thibault To: Sergey Bugaev Cc: libc-alpha@sourceware.org, bug-hurd@gnu.org Subject: Re: [PATCH 7/7] hurd: Fix FS_RETRY_MAGICAL "machtype" handling Message-ID: <20230429150120.zdpwz7w2evkskuie@begin> Mail-Followup-To: Sergey Bugaev , libc-alpha@sourceware.org, bug-hurd@gnu.org References: <20230429131354.2507443-1-bugaevc@gmail.com> <20230429131354.2507443-7-bugaevc@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230429131354.2507443-7-bugaevc@gmail.com> Organization: I am not organized User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: Applied, thanks! Sergey Bugaev, le sam. 29 avril 2023 16:13:54 +0300, a ecrit: > We need to set file_name, not update retryname. This is what the other > branches do. > > Before this change, any attempt to access such a file would segfault due > to file_name being unset: > > $ settrans -ac /tmp/my-machtype /hurd/magic machtype > $ cat /tmp/my-machtype > Segmentation fault > > Checked on i686-gnu. > > Signed-off-by: Sergey Bugaev > --- > hurd/lookup-retry.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/hurd/lookup-retry.c b/hurd/lookup-retry.c > index 99c98104..62f94bbc 100644 > --- a/hurd/lookup-retry.c > +++ b/hurd/lookup-retry.c > @@ -277,7 +277,6 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port) > error_t err; > struct host_basic_info hostinfo; > mach_msg_type_number_t hostinfocnt = HOST_BASIC_INFO_COUNT; > - char *p; > /* XXX want client's host */ > if (err = __host_info (__mach_host_self (), HOST_BASIC_INFO, > (integer_t *) &hostinfo, > @@ -288,13 +287,11 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port) > err = EGRATUITOUS; > goto out; > } > - p = _itoa (hostinfo.cpu_subtype, &retryname[8], 10, 0); > - *--p = '/'; > - p = _itoa (hostinfo.cpu_type, &retryname[8], 10, 0); > - if (p < retryname) > + file_name = _itoa (hostinfo.cpu_subtype, &retryname[8], 10, 0); > + *--file_name = '/'; > + file_name = _itoa (hostinfo.cpu_type, file_name, 10, 0); > + if (file_name < retryname) > abort (); /* XXX write this right if this ever happens */ > - if (p > retryname) > - memmove (retryname, p, strlen(p) + 1); > startdir = *result; > } > else > -- > 2.40.1 > -- Samuel --- Pour une évaluation indépendante, transparente et rigoureuse ! Je soutiens la Commission d'Évaluation de l'Inria.