From patchwork Sat Apr 29 13:13:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 68545 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 9DDE038555BE for ; Sat, 29 Apr 2023 13:14:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9DDE038555BE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1682774078; bh=j3IgtVAITHaI/IR3ddnAn8wysTCyQN+yA2tv+H+dZxQ=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=Vd6HhIR/pZD148JFcY18DQsjOBSH5DS7vxrOCnqNMtV+PFz/zy6+lG5WdX4JPSSbm MrJjwVhOy0Sn5ZMyg6rkvJJG/YAqK1M6NR4FeA/LxSqhaUBx8ooqJOLkdWtCNik5Hd Y0amsLPF6HpgvtKwrd82F9zovKNJ/K7OCl5PH0Ko= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by sourceware.org (Postfix) with ESMTPS id 67419385770E for ; Sat, 29 Apr 2023 13:14:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 67419385770E Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-4ec9c7c6986so1129202e87.0 for ; Sat, 29 Apr 2023 06:14:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682774042; x=1685366042; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j3IgtVAITHaI/IR3ddnAn8wysTCyQN+yA2tv+H+dZxQ=; b=h9oQhNKab+NYo6uLKD/7Z/xzs3HpArQjwx6a+eh3E91xwg20+/QVjkZbj/tWVAlRdN GYkdejYxPAt/9JgKh/W79cUnfdBP9Yxl0PrSCIwIBgKweN1W4Aiz0vlAVa27WE7QwYdT DHOX1YZMrJIII7silvljMboM2ro1YaCDQJck4BjEmfSBOzCZTJoX83QG8GJVXtm0a2NH hgQqz3NHaNETO5FczQVzNycVxMAZqzq6q9lJPSSeCKKSBO2begTXTGjBJtrmBja30xlp 57s4d6EJncm3kv7yrgfbbkS+wzOMjOKbPklVAqaoRZnFitg/fnmsNBsjiHFyPHPjHuRZ 72sw== X-Gm-Message-State: AC+VfDzrmVRpv+jjyrjWHWONay1niuGyV6atN/wHSd1UCz6aLvG+gf4d ZahsPIrzFbkU1/w0KGhZxaSIFgAQh/0KqA== X-Google-Smtp-Source: ACHHUZ6e1Wn+ZF+Yu8U43SdiswyBV1SyK3ngS7tYGRXXvQKECS024wADlnUzia25FgJeLHupM7Ekiw== X-Received: by 2002:ac2:4218:0:b0:4ef:eb86:b9c5 with SMTP id y24-20020ac24218000000b004efeb86b9c5mr2158985lfh.67.1682774041587; Sat, 29 Apr 2023 06:14:01 -0700 (PDT) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:8a14:19ba:9e6b:1866]) by smtp.gmail.com with ESMTPSA id f27-20020ac251bb000000b004eb018fac57sm3744851lfk.191.2023.04.29.06.14.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 06:14:01 -0700 (PDT) To: libc-alpha@sourceware.org Cc: bug-hurd@gnu.org, Samuel Thibault Subject: [PATCH 7/7] hurd: Fix FS_RETRY_MAGICAL "machtype" handling Date: Sat, 29 Apr 2023 16:13:54 +0300 Message-Id: <20230429131354.2507443-7-bugaevc@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230429131354.2507443-1-bugaevc@gmail.com> References: <20230429131354.2507443-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 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, 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 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: Sergey Bugaev via Libc-alpha From: Sergey Bugaev Reply-To: Sergey Bugaev Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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