From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id 93DD13858413; Sun, 3 Dec 2023 01:06:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 93DD13858413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1701565607; bh=t0OBYU4RZKvLrOh/f8kMy4akxwfcZDAyR0re+0bFm4w=; h=From:To:Subject:Date:From; b=EHLHYsMZzIh2shNPbU5pdj6WoI9qOdaRh3itaihDxnPFTwHsFQInrBXI5Tt5p29D2 VckCbd6hIxR/ajRHM48xoNm3T1P9gh9eNzmh7QryRKhHSRfc8cKVjkHfPQlG3UGdtt WrwjTrqV+Kg1Mu5ZPiuivBPNEf2Nkr6pXnNCgFmQ= 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] Revert "Update code to handle the new ABI for sending inlined port rights." X-Act-Checkin: glibc X-Git-Author: Samuel Thibault X-Git-Refname: refs/heads/master X-Git-Oldrev: 3e85650423e47bf87104add14fc2aacad562d260 X-Git-Newrev: d776a59723b22192d33557d2127e13cb31905382 Message-Id: <20231203010647.93DD13858413@sourceware.org> Date: Sun, 3 Dec 2023 01:06:47 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d776a59723b22192d33557d2127e13cb31905382 commit d776a59723b22192d33557d2127e13cb31905382 Author: Samuel Thibault Date: Sun Dec 3 02:06:29 2023 +0100 Revert "Update code to handle the new ABI for sending inlined port rights." This reverts commit 7e23b3c2c008e0b9b5da055e675d40cc27bb10ef. Diff: --- hurd/intr-msg.c | 26 ++------------------------ mach/msg-destroy.c | 12 +++--------- 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/hurd/intr-msg.c b/hurd/intr-msg.c index d52e90449e..24184f827f 100644 --- a/hurd/intr-msg.c +++ b/hurd/intr-msg.c @@ -199,28 +199,6 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg, __vm_deallocate (__mach_task_self (), (vm_address_t) data, length); } - inline void clean_inlined_ports (mach_port_name_inlined_t *ports) - { - mach_msg_type_number_t i; - switch (name) - { - case MACH_MSG_TYPE_MOVE_SEND: - for (i = 0; i < number; i++) - __mach_port_deallocate (__mach_task_self (), ports[i].name); - if (ty->msgtl_header.msgt_longform) - ty->msgtl_name = MACH_MSG_TYPE_COPY_SEND; - else - ty->msgtl_header.msgt_name = MACH_MSG_TYPE_COPY_SEND; - break; - case MACH_MSG_TYPE_COPY_SEND: - case MACH_MSG_TYPE_MOVE_RECEIVE: - break; - default: - if (MACH_MSG_TYPE_PORT_ANY (name)) - assert (! "unexpected port type in interruptible RPC"); - } - } - char *data; if (ty->msgtl_header.msgt_longform) { @@ -237,11 +215,11 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg, data = (char *) ty + sizeof (mach_msg_type_t); } - /* Calculate length of data in bytes. */ const vm_size_t length = ((number * size) + 7) >> 3; if (ty->msgtl_header.msgt_inline) { - clean_inlined_ports (data); + /* Calculate length of data in bytes. */ + clean_ports_and_memory (data, length, 0); /* Move to the next argument. */ ty = (void *) PTR_ALIGN_UP (data + length, __alignof__ (uintptr_t)); } diff --git a/mach/msg-destroy.c b/mach/msg-destroy.c index 8640c965bd..19137baa62 100644 --- a/mach/msg-destroy.c +++ b/mach/msg-destroy.c @@ -108,17 +108,11 @@ __mach_msg_destroy (mach_msg_header_t *msg) addr = is_inline ? saddr : * (vm_offset_t *) saddr; if (MACH_MSG_TYPE_PORT_ANY(name)) { + mach_port_t *ports = (mach_port_t *) addr; mach_msg_type_number_t i; - if (is_inline) { - mach_port_name_inlined_t *inlined_ports = (mach_port_name_inlined_t *)addr; - for (i = 0; i < number; i++) - mach_msg_destroy_port(inlined_ports[i].name, name); - } else { - mach_port_t *ports = (mach_port_t *) addr; - for (i = 0; i < number; i++) - mach_msg_destroy_port(ports[i], name); - } + for (i = 0; i < number; i++) + mach_msg_destroy_port(*ports++, name); } if (is_inline) {