From patchwork Wed Feb 11 00:03:31 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 129907 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id AC6324BA23D7 for ; Wed, 11 Feb 2026 00:04:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AC6324BA23D7 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (domu-toccata.ens-lyon.fr [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id E66994BA2E16 for ; Wed, 11 Feb 2026 00:03:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E66994BA2E16 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E66994BA2E16 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1770768214; cv=none; b=EiGa+H8uudd3UdENL6P9pcvqDfj84Bocpmsi5spPbkXC9g1suJNcSvI5r0DN2IJV2CcQcf/ikMuEWfJXKdeAnNjcyz0exP4TE1mzHF10JqXzANXevpesSj+A/GtfwCU5pMId2A4s/x2exqXPh8Hoqgu/yRdRhTC4miKir7JxuME= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1770768214; c=relaxed/simple; bh=oou9pokoYwrYbjWTjQHMeYvOaz90uxJVnSmoCx89rIc=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=iygiEmccqdqkGA6sUQjTxL+OqDlGvN65IrXbF9TDx22vCRlmWQP69lVMfjlHugmNYifxboG6+p9vMNO+rgBArr8ueVdWZ7jsgOFgXko4Oyi8+0Vhr9+xDtaiTIhtdfzeMwCcJrPSKwqHWAax6rDMkXQWpFxpcIRIXRxyXgQVpOk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E66994BA2E16 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id C843CA026F; Wed, 11 Feb 2026 01:03:32 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nhgLldMn0WoG; Wed, 11 Feb 2026 01:03:32 +0100 (CET) Received: from end (aamiens-653-1-40-48.w83-192.abo.wanadoo.fr [83.192.199.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 84367A026E; Wed, 11 Feb 2026 01:03:32 +0100 (CET) Received: from samy by end with local (Exim 4.99.1) (envelope-from ) id 1vpxhc-0000000DYHw-095v; Wed, 11 Feb 2026 01:03:32 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Mike Kelly , commit-hurd@gnu.org Subject: [hurd, commited] hurd: _hurd_intr_rpc_mach_msg() might not preserve the correct reply port Date: Wed, 11 Feb 2026 01:03:31 +0100 Message-ID: <20260211000331.3230060-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org From: Mike Kelly Calls to mach_msg_trap() that return MACH_SEND_INTERRUPTED modify the message header. A subsequent attempt at sending the message can return EINTR for handling by the caller. Mig generated code (expecting the message header to be unaltered) now fails assertion in __mig_dealloc_reply_port(). Fixed by restoring the altered message header content before reattempting RPC message delivery. Message-ID: <20260209204213.91782-2-mike@weatherwax.co.uk> --- hurd/intr-msg.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hurd/intr-msg.c b/hurd/intr-msg.c index 02e514400f..83db9413ab 100644 --- a/hurd/intr-msg.c +++ b/hurd/intr-msg.c @@ -136,6 +136,13 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg, } if (!(option & MACH_SEND_INTERRUPT)) { + m->header.msgh_local_port = rcv_name; + m->header.msgh_remote_port = remote_port; + m->header.msgh_id = msgid; + m->header.msgh_bits = msgh_bits; + /* Restore the two words clobbered by the reply data. */ + m->request.data = save_data; + option = user_option; timeout = user_timeout; goto message;