From patchwork Sun Feb 12 11:10:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 64779 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 87ABA383FB9B for ; Sun, 12 Feb 2023 11:12:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 87ABA383FB9B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676200346; bh=/+M7YEqr3plk5x5xwoyPA6m+Vblc9lSy3U6rHz9HeKI=; 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=SN9/MDRp9o2RsYETEOVSBGaPCIgAIT7xpwPMPjgoEE2VpctQ4YdoluTVIyHYshDnC OVaaHjxkvnHH1oV4C0teNs6Z5E7Xyy5GWnBGTgYvZHrRT/w7QWrkVQIWarmUePX6YC 7oAcq6EDmlAJKKBv3EosctKJwjcfDJlf8aHx+Nsw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by sourceware.org (Postfix) with ESMTPS id BB30F3858D37 for ; Sun, 12 Feb 2023 11:11:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BB30F3858D37 Received: by mail-ed1-x52f.google.com with SMTP id cq19so6682937edb.5 for ; Sun, 12 Feb 2023 03:11:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=/+M7YEqr3plk5x5xwoyPA6m+Vblc9lSy3U6rHz9HeKI=; b=cI9ZLHE2i3pCCfFLddz51F4wLBvb9YeXWROffimqXjGD+7k0M0oX4ZwsebupicBLGL TksUw6bU0By7AVRuQb76Wm/V5DvWcdPw/HjU+XeMEKfVfWTmENqDxM07bd25iqk5VkCv zT/nGz5H4KcBfplXuARCPI0Z41u/W91crCOV4k0pbcKjk47VfIs2DcSIbjonZ+Q2V+s8 IQsoEaSx7EVgaAfREFPypyqLtCCMfH24AhxXHnmYpZBi2dc5mtI04Mz3eB4jhfJng296 8atkdaaVPPIlkCc3P9aK2rT3O0U+wTvvLC3tpbo0RjFgVVy2yVbNO3J2/jdZaG5ALtVD zzSQ== X-Gm-Message-State: AO0yUKXTBEPCQNeQRFpDyIMk8JN1fIU+04JRU/zo3Wip52B5z4ACgytw nK12YcfAkLJGHjVvAmzu3NQ= X-Google-Smtp-Source: AK7set9eH2ZEiVvTNQfYNaSx46yHDxNc4yk4Dc/ZF7vPcI9mvXPGsn0EmpLfRI1dwVRHplnQBNVXGw== X-Received: by 2002:a50:aac5:0:b0:4aa:cc26:c3f with SMTP id r5-20020a50aac5000000b004aacc260c3fmr24349842edc.29.1676200274538; Sun, 12 Feb 2023 03:11:14 -0800 (PST) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:2186:c463:9ced:e6fe]) by smtp.gmail.com with ESMTPSA id c61-20020a509fc3000000b004acbe0b36d2sm1266910edf.6.2023.02.12.03.11.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 03:11:14 -0800 (PST) To: bug-hurd@gnu.org, libc-alpha@sourceware.org Cc: =?utf-8?q?Fl=C3=A1vio_Cruz?= , Sergey Bugaev Subject: [RFC PATCH glibc 2/12] hurd: Use mach_msg_type_number_t where appropriate Date: Sun, 12 Feb 2023 14:10:33 +0300 Message-Id: <20230212111044.610942-3-bugaevc@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230212111044.610942-1-bugaevc@gmail.com> References: <20230212111044.610942-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.7 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 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" It has been decided that on x86_64, mach_msg_type_number_t stays 32-bit. Therefore, it's not possible to use mach_msg_type_number_t interchangeably with size_t, in particular this breaks when a pointer to a variable is passed to a MIG routine. Signed-off-by: Sergey Bugaev --- hurd/hurdioctl.c | 2 +- hurd/hurdprio.c | 2 +- hurd/lookup-retry.c | 2 +- hurd/xattr.c | 4 ++-- sysdeps/mach/hurd/getcwd.c | 2 +- sysdeps/mach/hurd/readlinkat.c | 6 ++++-- sysdeps/mach/hurd/sendfile64.c | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/hurd/hurdioctl.c b/hurd/hurdioctl.c index e9a6a7ea..59e6a5c1 100644 --- a/hurd/hurdioctl.c +++ b/hurd/hurdioctl.c @@ -311,7 +311,7 @@ static int siocgifconf (int fd, int request, struct ifconf *ifc) { error_t err; - size_t data_len = ifc->ifc_len; + mach_msg_type_number_t data_len = ifc->ifc_len; char *data = ifc->ifc_buf; if (data_len <= 0) diff --git a/hurd/hurdprio.c b/hurd/hurdprio.c index dbeb272b..954d3987 100644 --- a/hurd/hurdprio.c +++ b/hurd/hurdprio.c @@ -58,7 +58,7 @@ _hurd_priority_which_map (enum __priority_which which, int who, int *oldpi = pi; mach_msg_type_number_t oldpisize = pisize; char *tw = 0; - size_t twsz = 0; + mach_msg_type_number_t twsz = 0; err = __USEPORT (PROC, __proc_getprocinfo (port, pids[i], &pi_flags, &pi, &pisize, diff --git a/hurd/lookup-retry.c b/hurd/lookup-retry.c index 0d344026..8850c4fd 100644 --- a/hurd/lookup-retry.c +++ b/hurd/lookup-retry.c @@ -162,7 +162,7 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port) { char buf[1024]; char *trans = buf; - size_t translen = sizeof buf; + mach_msg_type_number_t translen = sizeof buf; err = __file_get_translator (*result, &trans, &translen); if (!err diff --git a/hurd/xattr.c b/hurd/xattr.c index f98e548c..48914bcf 100644 --- a/hurd/xattr.c +++ b/hurd/xattr.c @@ -60,7 +60,7 @@ _hurd_xattr_get (io_t port, const char *name, void *value, size_t *size) if (!strcmp (name, "translator")) { char *buf = value; - size_t bufsz = value ? *size : 0; + mach_msg_type_number_t bufsz = value ? *size : 0; error_t err = __file_get_translator (port, &buf, &bufsz); if (err) return err; @@ -144,7 +144,7 @@ _hurd_xattr_set (io_t port, const char *name, const void *value, size_t size, { /* Must make sure it's already there. */ char *buf = NULL; - size_t bufsz = 0; + mach_msg_type_number_t bufsz = 0; error_t err = __file_get_translator (port, &buf, &bufsz); if (err) return err; diff --git a/sysdeps/mach/hurd/getcwd.c b/sysdeps/mach/hurd/getcwd.c index fc5e78e7..f24b35b3 100644 --- a/sysdeps/mach/hurd/getcwd.c +++ b/sysdeps/mach/hurd/getcwd.c @@ -117,7 +117,7 @@ __hurd_canonicalize_directory_name_internal (file_t thisdir, int mount_point; file_t newp; char *dirdata; - size_t dirdatasize; + mach_msg_type_number_t dirdatasize; int direntry, nentries; diff --git a/sysdeps/mach/hurd/readlinkat.c b/sysdeps/mach/hurd/readlinkat.c index dabdbb37..5bb8b753 100644 --- a/sysdeps/mach/hurd/readlinkat.c +++ b/sysdeps/mach/hurd/readlinkat.c @@ -35,6 +35,7 @@ __readlinkat (int fd, const char *file_name, char *buf, size_t len) char retryname[1024]; file_t file; char *rbuf = buf; + mach_msg_type_number_t nread = len; file_stat = __file_name_lookup_at (fd, 0, file_name, O_NOLINK, 0); if (file_stat == MACH_PORT_NULL) @@ -59,15 +60,16 @@ __readlinkat (int fd, const char *file_name, char *buf, size_t len) goto out; } - err = __io_read (file, &rbuf, &len, 0, len); + err = __io_read (file, &rbuf, &nread, 0, len); __mach_port_deallocate (__mach_task_self (), file); if (err) goto out; + len = nread; if (rbuf != buf) { memcpy (buf, rbuf, len); - __vm_deallocate (__mach_task_self (), (vm_address_t) rbuf, len); + __vm_deallocate (__mach_task_self (), (vm_address_t) rbuf, nread); } diff --git a/sysdeps/mach/hurd/sendfile64.c b/sysdeps/mach/hurd/sendfile64.c index 658b0282..e36b9790 100644 --- a/sysdeps/mach/hurd/sendfile64.c +++ b/sysdeps/mach/hurd/sendfile64.c @@ -35,7 +35,7 @@ __sendfile64 (int out_fd, int in_fd, off64_t *offset, size_t count) which might blow if it's huge or address space is real tight. */ char *data = 0; - size_t datalen = 0; + mach_msg_type_number_t datalen = 0; error_t err = HURD_DPORT_USE (in_fd, __io_read (port, &data, &datalen, offset ? *offset : (off_t) -1,