From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id 990BE3858C50; Sat, 29 Apr 2023 15:01:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 990BE3858C50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1682780476; bh=ALfYGpen2ZfAnWcelX4OClmOFSrJ+Lnf4/Hxp7uTBOg=; h=From:To:Subject:Date:From; b=CKz8fJMGqLewCvLtaDai664vZDXBd2/bWeIsn2C8UP+ZPqGSs17UkyscmFjq1HBob ND70AR5yyqFUzwuRA6Epnh9vZJ3nYR8cJ7nDCk+RjP4cvwe9zgK5MyFuIhAaBWhvIY x/lM1Cws2O02JNqQRuo5NI0ydQR1oh8Rft3nBf3Q= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] hurd: Fix FS_RETRY_MAGICAL "machtype" handling X-Act-Checkin: glibc X-Git-Author: Sergey Bugaev X-Git-Refname: refs/heads/master X-Git-Oldrev: 89f1e04174a6b6548d19f7f301ddcc8ab91d91df X-Git-Newrev: f56ad6174c62aa38f7edf68167d620482b776dc9 Message-Id: <20230429150116.990BE3858C50@sourceware.org> Date: Sat, 29 Apr 2023 15:01:16 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f56ad6174c62aa38f7edf68167d620482b776dc9 commit f56ad6174c62aa38f7edf68167d620482b776dc9 Author: Sergey Bugaev Date: Sat Apr 29 16:13:54 2023 +0300 hurd: Fix FS_RETRY_MAGICAL "machtype" handling 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 Message-Id: <20230429131354.2507443-7-bugaevc@gmail.com> Diff: --- 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 99c981046f..62f94bbc92 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