From nobody Mon Feb 9 16:27:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1647336242; cv=none; d=zohomail.com; s=zohoarc; b=YnNlitTs0HHvWJadXS9gq2uOJDc6wfhIkCSq/aYcL7MMJ+8RBjGi2XWzA68YCmNnImsr8lygza29523b4Z5sH0LcBC6XMtG4sfa/cGwsmwlYMZhUEgPyX1AN8xF7GsqWYLXPyIVTgooQyVbvAwgj08hT5VYzWs0ggLVK0YTwAnw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647336242; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=okcfQUsJbvGgBubMBl231SWHxFIIoHPnrQLrMT7DxsE=; b=d0VcnglkmMakj0Hio37uCNrZaDiyqfWPSCa1b8yX0b/iz/n+HQe1zDpOPF25MpZn0PWzNcwS6Bltw7Ampt0F1JvhyUIYsjQCvpLSGpRHGH9MA4uEkkxdLwISzPpXb45V0S6/FRAupE1ad7jXv36wxe4Wp5dJz0a7YZ4MJKxLkWw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647336242549488.118663449388; Tue, 15 Mar 2022 02:24:02 -0700 (PDT) Received: from localhost ([::1]:49772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU3PN-0003y6-9G for importer@patchew.org; Tue, 15 Mar 2022 05:24:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU2lt-0008R3-9F for qemu-devel@nongnu.org; Tue, 15 Mar 2022 04:43:13 -0400 Received: from [2607:f8b0:4864:20::436] (port=42912 helo=mail-pf1-x436.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nU2lr-00052X-M0 for qemu-devel@nongnu.org; Tue, 15 Mar 2022 04:43:12 -0400 Received: by mail-pf1-x436.google.com with SMTP id g19so18515948pfc.9 for ; Tue, 15 Mar 2022 01:43:11 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id ob13-20020a17090b390d00b001becfd7c6f3sm2233762pjb.27.2022.03.15.01.43.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 01:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=okcfQUsJbvGgBubMBl231SWHxFIIoHPnrQLrMT7DxsE=; b=lUPJpge9TcgreAVQ6BHdy1CA6kCDx0PFwnD+tVU7/3pNBwexqEF+4RT2kt+1zHOG4X X743szgHzLhogNqoecjuV6OOrTsNVa4wu1GVn8c0GVD9aHtJpKAJiyNfb9ZssS9lwFa4 CgfvMLkGX9dZGjEeFuKGDYKP9/4Eyh/0McO018SWXL36GQFWM+8EU9CAi3+jGgzQxhAu c1ifJI3DDD39yXLgnRT7I3dx9S/z6Spg1qANro+OJG2lggSKyKDgB9jUO1gB6JTq1cR3 yoZiZUIzTp59ZcbHWPXDL/r7xc9+nrrLXjyQtUdCVMOAXOMDCHpGyoEMkJ4PoGWQsF1D a1nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=okcfQUsJbvGgBubMBl231SWHxFIIoHPnrQLrMT7DxsE=; b=Q7cHlxME7eofoUsgaWUNS/+TIIUXOwfufhiHfPrzR4ihTZcr/cvdl00/oTdcgCCEuq 87Ospv0QpXAYwgMNTbGTsRddrwV9Wcx/D97rGrJCzHIZUx2tVCjI7Szs6UHkaKze7qw6 dFhSJX/Gk1KYdKt9GiAFNQDHlHA+Q1R/JorwFKovlSrPI91OCf0dA8a5rS1UmTP7ACFH 59mS4BPLW/O61lPWNCBky4RXLIf5FeTnja/4TQyGl5bWnr45ZoSrZ0dk3G67E5LgjurU MfhIQFSGiAWX09PJSi51Djtpo3A5Vh4R6KRaNdoNSbKdzFOqpRnqxJk1h5tfbR+HVCIF nuKA== X-Gm-Message-State: AOAM530yvg59YGPIFtDPECQ/bybrzRSmvYo6yHm1mb0icK9EPL0l/6b0 wLBJgk+Cld9rlSYDeE24r+/PhFhLfvFlfA== X-Google-Smtp-Source: ABdhPJyMGnD9q3wW6zhp8nnBpcuyr59Xf5owKUHqhetbbuLpxG3lTyLzUuwo4sGA1EjUPQ3OBN58tQ== X-Received: by 2002:a62:7981:0:b0:4f7:9e4:96e4 with SMTP id u123-20020a627981000000b004f709e496e4mr27966954pfc.4.1647333790290; Tue, 15 Mar 2022 01:43:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/5] linux-user/alpha: Fix sigsuspend for big-endian hosts Date: Tue, 15 Mar 2022 01:43:04 -0700 Message-Id: <20220315084308.433109-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220315084308.433109-1-richard.henderson@linaro.org> References: <20220315084308.433109-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::436 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1647336243765100001 Content-Type: text/plain; charset="utf-8" On alpha, the sigset argument for sigsuspend is in a register. When we drop that into memory that happens in host-endianness, but target_to_host_old_sigset will treat it as target-endianness. Signed-off-by: Richard Henderson Reviewed-by: Laurent Vivier --- linux-user/syscall.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index b9b18a7eaf..ecd00382a8 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -9559,7 +9559,8 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, { TaskState *ts =3D cpu->opaque; #if defined(TARGET_ALPHA) - abi_ulong mask =3D arg1; + /* target_to_host_old_sigset will bswap back */ + abi_ulong mask =3D tswapal(arg1); target_to_host_old_sigset(&ts->sigsuspend_mask, &mask); #else if (!(p =3D lock_user(VERIFY_READ, arg1, sizeof(target_sigset_= t), 1))) --=20 2.25.1 From nobody Mon Feb 9 16:27:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1647334624; cv=none; d=zohomail.com; s=zohoarc; b=OwBiYS84iTTMBz8hDy+gqVSWxBdk9Xf+ZRAJ1qAKGnAyEbp6wekzy7I1TQt0wNBIzmPXSb4wmKk3xThDgts82aoepgW7HLELSPOO6IHSxg6n6ZOnjO691QvvcFuXBVDLiih90PEtAjC6uZPOPFO3InIC0BqiUDKBxcdW9VGH+9c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647334624; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ERpNlhEJI6fLWZOagQ9lWdhLVUwWHMh+hWen+Y5bofU=; b=Y4cy1ChdPv0bBczW/MnxFYMPm03Uk3U5YCniwP7rL9tMWmNfu6QdTaWX7EgBmnFptsFTZ/9+yOofcqehC0smtj2eiMRyVrkN73JTXB6FoSXNvSHLHzmw7qzn/MaLuUjDEIbGqSHbjl0Hdzgy63tf1fgM3+Ff3z8q54j5MTVoQ30= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647334624188445.4086555172896; Tue, 15 Mar 2022 01:57:04 -0700 (PDT) Received: from localhost ([::1]:56372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU2zH-000728-0m for importer@patchew.org; Tue, 15 Mar 2022 04:57:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU2lu-0008Rd-EP for qemu-devel@nongnu.org; Tue, 15 Mar 2022 04:43:14 -0400 Received: from [2607:f8b0:4864:20::62b] (port=35807 helo=mail-pl1-x62b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nU2ls-00052d-LU for qemu-devel@nongnu.org; Tue, 15 Mar 2022 04:43:14 -0400 Received: by mail-pl1-x62b.google.com with SMTP id n15so15676396plh.2 for ; Tue, 15 Mar 2022 01:43:12 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id ob13-20020a17090b390d00b001becfd7c6f3sm2233762pjb.27.2022.03.15.01.43.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 01:43:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ERpNlhEJI6fLWZOagQ9lWdhLVUwWHMh+hWen+Y5bofU=; b=M9M42VU87dQ337HZOgYHvEJvqT+ba1jMjlVApTWDq2/XrlyPGZhLFajsfG/bUmB8zi t2HBJljsjd6p+3FeEWONgKtvsQu1QIrRdKQirgXtOlBSaKvfmfKLzooHQEKiCJ6pbwVS Mns5caP+mUopqbwrlXyTPqGyby7BYi1IvwhZ4cYgsd8DMUG0t1S4fMB/3kHVbRfMBSkE tAPhpvJ5KOebnyvXmjDy0frCRw2/jV+HyfhRj76NqFopj1B6klsmb61H3F2M2cY6ZA3M i2Ac+ujyk1oaxsd5o13Ohs+Z1MJHOXHuOP1jgVtJp+0SmEckDBSKvGBfnlWov770NsQp Bzbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ERpNlhEJI6fLWZOagQ9lWdhLVUwWHMh+hWen+Y5bofU=; b=qRas3wKg0n3HVWr0JSPNTZnARfYB3cSjufCnbJPVuWqx0b8+9oPhECi+PfN9HOajTC PGwypg43/Pb3Qyc9Sn+rzZr0dViC9r4gC6QVxlFJUtkzU+1lUMHNT61w2ORb1/cgY1nX gmd5JhvG3Zja3tGgcePUtVmilEef54hpWzaZShxW+L8HDu2OY1c/WIx0bHpKbT27Azaa p5w4cbzYOW8YEca03NSTZYup+4JP+ics9CglSebj9aLmZaWen07md9gzMdt0c/RsURbG 1Hkg8gk30JNYOcD1FkzncQzMpYmOqVKx+Of7OYEcThvldMwTBHh0RAtPWRnrRE20d8Ko bwvQ== X-Gm-Message-State: AOAM53381EmAKWBoW2K9fSIzYoI2usSQbou8LXJ+Y1r/g2/4bWp5DKqy WnmAqRmdI6hLOxE619axhZa6jox0+Fk1pw== X-Google-Smtp-Source: ABdhPJyAkxmor4lcGc2ZaHneULMNMb+0c6PXWNqpRrtaL2oqdn0pr1DJVFvZWGvr/nLOGMlP/RvONA== X-Received: by 2002:a17:902:7296:b0:14b:4bc6:e81 with SMTP id d22-20020a170902729600b0014b4bc60e81mr27028751pll.132.1647333791176; Tue, 15 Mar 2022 01:43:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/5] linux-user: Split out helpers for sigsuspend Date: Tue, 15 Mar 2022 01:43:05 -0700 Message-Id: <20220315084308.433109-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220315084308.433109-1-richard.henderson@linaro.org> References: <20220315084308.433109-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1647334625828100001 Content-Type: text/plain; charset="utf-8" Two new functions: process_sigsuspend_mask and finish_sigsuspend_mask. Move the size check and copy-from-user code. Signed-off-by: Richard Henderson Reviewed-by: Laurent Vivier --- linux-user/signal-common.h | 26 +++++++++++++++++++++++++ linux-user/signal.c | 23 ++++++++++++++++++++++ linux-user/syscall.c | 40 ++++++++++++++++---------------------- 3 files changed, 66 insertions(+), 23 deletions(-) diff --git a/linux-user/signal-common.h b/linux-user/signal-common.h index 2113165a75..6a7e4a93fc 100644 --- a/linux-user/signal-common.h +++ b/linux-user/signal-common.h @@ -92,4 +92,30 @@ abi_long do_swapcontext(CPUArchState *env, abi_ulong uol= d_ctx, */ int block_signals(void); /* Returns non zero if signal pending */ =20 +/** + * process_sigsuspend_mask: read and apply syscall-local signal mask + * + * Read the guest signal mask from @sigset, length @sigsize. + * Convert that to a host signal mask and save it to sigpending_mask. + * + * Return value: negative target errno, or zero; + * store &sigpending_mask into *pset on success. + */ +int process_sigsuspend_mask(sigset_t **pset, target_ulong sigset, + target_ulong sigsize); + +/** + * finish_sigsuspend_mask: finish a sigsuspend-like syscall + * + * Set in_sigsuspend if we need to use the modified sigset + * during process_pending_signals. + */ +static inline void finish_sigsuspend_mask(int ret) +{ + if (ret !=3D -QEMU_ERESTARTSYS) { + TaskState *ts =3D (TaskState *)thread_cpu->opaque; + ts->in_sigsuspend =3D 1; + } +} + #endif diff --git a/linux-user/signal.c b/linux-user/signal.c index 2a3f3cc23f..092e70b80c 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -1199,3 +1199,26 @@ void process_pending_signals(CPUArchState *cpu_env) } ts->in_sigsuspend =3D 0; } + +int process_sigsuspend_mask(sigset_t **pset, target_ulong sigset, + target_ulong sigsize) +{ + TaskState *ts =3D (TaskState *)thread_cpu->opaque; + sigset_t *host_set =3D &ts->sigsuspend_mask; + target_sigset_t *target_sigset; + + if (sigsize !=3D sizeof(*target_sigset)) { + /* Like the kernel, we enforce correct size sigsets */ + return -TARGET_EINVAL; + } + + target_sigset =3D lock_user(VERIFY_READ, sigset, sigsize, 1); + if (!target_sigset) { + return -TARGET_EFAULT; + } + target_to_host_sigset(host_set, target_sigset); + unlock_user(target_sigset, sigset, 0); + + *pset =3D host_set; + return 0; +} diff --git a/linux-user/syscall.c b/linux-user/syscall.c index ecd00382a8..154cb1c7e8 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -9557,41 +9557,35 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, #ifdef TARGET_NR_sigsuspend case TARGET_NR_sigsuspend: { - TaskState *ts =3D cpu->opaque; + sigset_t *set; + #if defined(TARGET_ALPHA) + TaskState *ts =3D cpu->opaque; /* target_to_host_old_sigset will bswap back */ abi_ulong mask =3D tswapal(arg1); - target_to_host_old_sigset(&ts->sigsuspend_mask, &mask); + set =3D &ts->sigsuspend_mask; + target_to_host_old_sigset(set, &mask); #else - if (!(p =3D lock_user(VERIFY_READ, arg1, sizeof(target_sigset_= t), 1))) - return -TARGET_EFAULT; - target_to_host_old_sigset(&ts->sigsuspend_mask, p); - unlock_user(p, arg1, 0); -#endif - ret =3D get_errno(safe_rt_sigsuspend(&ts->sigsuspend_mask, - SIGSET_T_SIZE)); - if (ret !=3D -QEMU_ERESTARTSYS) { - ts->in_sigsuspend =3D 1; + ret =3D process_sigsuspend_mask(&set, arg1, sizeof(target_sigs= et_t)); + if (ret !=3D 0) { + return ret; } +#endif + ret =3D get_errno(safe_rt_sigsuspend(set, SIGSET_T_SIZE)); + finish_sigsuspend_mask(ret); } return ret; #endif case TARGET_NR_rt_sigsuspend: { - TaskState *ts =3D cpu->opaque; + sigset_t *set; =20 - if (arg2 !=3D sizeof(target_sigset_t)) { - return -TARGET_EINVAL; - } - if (!(p =3D lock_user(VERIFY_READ, arg1, sizeof(target_sigset_= t), 1))) - return -TARGET_EFAULT; - target_to_host_sigset(&ts->sigsuspend_mask, p); - unlock_user(p, arg1, 0); - ret =3D get_errno(safe_rt_sigsuspend(&ts->sigsuspend_mask, - SIGSET_T_SIZE)); - if (ret !=3D -QEMU_ERESTARTSYS) { - ts->in_sigsuspend =3D 1; + ret =3D process_sigsuspend_mask(&set, arg1, arg2); + if (ret !=3D 0) { + return ret; } + ret =3D get_errno(safe_rt_sigsuspend(set, SIGSET_T_SIZE)); + finish_sigsuspend_mask(ret); } return ret; #ifdef TARGET_NR_rt_sigtimedwait --=20 2.25.1 From nobody Mon Feb 9 16:27:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1647334088; cv=none; d=zohomail.com; s=zohoarc; b=DKmAKZxMtf0Ob8VJlJ4clmAb982/zngVRETCugvgHiMzoMcwY3BwbAWVlBS4BozznSe0GCW/UC5NwGAsMizGSF6BLginrYWENKfKjU5cijDjUYW97AKJI3J6qSPIo56SQuGNoEfR7+8Ccr28f2Hu15QX9RvD+DFjSJKvDfEmf2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647334088; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h3suoOPDLcx3C2TGXcLsoIqq/PtT5yRHwOoMlS2gYo4=; b=RSwWAId6HnxS97qoia4D53mhnu2z/H890hOjMuTrkgim2CFbKtSaSkGZ0xWlNEJ/bE3w7BJLmpkQdLMcDbO9Zy3C2r+uqLXfUixnQ8Cw6jyXuX2+6hCWJm5QjMZxxv4gntIh2V+k0g1NoX41UQD7ZD/cd31Y8fHxENqWkcZO2Ic= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647334088169863.2712588182247; Tue, 15 Mar 2022 01:48:08 -0700 (PDT) Received: from localhost ([::1]:49752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU2qe-0003ED-BM for importer@patchew.org; Tue, 15 Mar 2022 04:48:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU2lu-0008Rq-Rn for qemu-devel@nongnu.org; Tue, 15 Mar 2022 04:43:14 -0400 Received: from [2607:f8b0:4864:20::62f] (port=36851 helo=mail-pl1-x62f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nU2lt-00052l-9V for qemu-devel@nongnu.org; Tue, 15 Mar 2022 04:43:14 -0400 Received: by mail-pl1-x62f.google.com with SMTP id e13so15671822plh.3 for ; Tue, 15 Mar 2022 01:43:12 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id ob13-20020a17090b390d00b001becfd7c6f3sm2233762pjb.27.2022.03.15.01.43.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 01:43:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h3suoOPDLcx3C2TGXcLsoIqq/PtT5yRHwOoMlS2gYo4=; b=gGOb7A/yBU1OlwmBSHbvFXOR2MtGC+eqBwbtIwffXWOMT7xi/dGHzi7fS+xDAm5z3v iCEg97OWGZO6v5IZ7hQIhxRP2SPUczo6uOv4RmNq0SZfgcBUmeFi24PYCPnGp9BE3mfT kCQD5w0Wtxss6uuYs42HIzuhflqJ7YTEAPwp+jCfrtnQ6/AFgfKyhEiEjt3ZSL7Hqgzf WZu/TqfcXr2FH3cy0YTHRq/lor8dMc97YQgawwpgA7L8HVcOiYEsfLOStBHkx0dZZKeB s0HtdTpyOTYKGq3MTI3NNbo+RMEwxyT/+KTM+hE0GbdoadiozXqppDeTXzGS4hQe6khI l04g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h3suoOPDLcx3C2TGXcLsoIqq/PtT5yRHwOoMlS2gYo4=; b=mS4zgHZccF9SUmgS2GbAIogyu2BPVD2+Geq+1iJWv0IytAbXqzdQGOBlQ9Ew5oClDi qVxrYE1WJMTn7RhWuH8KbCmpNfMCnncV89NDEX8rg/Vy1Lehc82C4S2iFObBe10CctHJ HmnHngSjPoAZDsCYhCOCv2xc50ELeMuDQgb67v+aNxGUBj32kuIknGEeQKFZJT1tEgXs xcDnhnOcrdoc/8vNKjvCiRoFCRTTdTH98vR5AOg6iMtHG5rqOHSshKPrH1BQA9Oes5/+ m2yOLVyTOvzUfMZT2BNmxP/+ok8po6EJRthTV56fpAovyRhopOBfbshtpu9hAfRdqWF+ 1O3A== X-Gm-Message-State: AOAM532VV+G2pCxZkYdNskVMTU8zYef/p1Fvt1SGC6bZ2EyT+lPSk0rf BjwuKXMUObyvCOfzyFxmpP/KMmXKVW3H7A== X-Google-Smtp-Source: ABdhPJxnkBvCyJX2hyv3GYSeTjnTg2tqFPE9yPKAFtDG6e3tIafu2qUNoNsXwq/XL7ERwNqSZWizpA== X-Received: by 2002:a17:902:d4cc:b0:153:32a9:2479 with SMTP id o12-20020a170902d4cc00b0015332a92479mr20602063plg.25.1647333792006; Tue, 15 Mar 2022 01:43:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/5] linux-user: Properly handle sigset arg to pselect Date: Tue, 15 Mar 2022 01:43:06 -0700 Message-Id: <20220315084308.433109-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220315084308.433109-1-richard.henderson@linaro.org> References: <20220315084308.433109-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62f (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1647334090271100001 Content-Type: text/plain; charset="utf-8" Unblocked signals are never delivered, because we didn't record the new mask for process_pending_signals. Handle this with the same mechanism as sigsuspend. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/834 Signed-off-by: Richard Henderson Reviewed-by: Laurent Vivier --- linux-user/syscall.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 154cb1c7e8..8071a5191d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1391,14 +1391,12 @@ static abi_long do_pselect6(abi_long arg1, abi_long= arg2, abi_long arg3, * The 6th arg is actually two args smashed together, * so we cannot use the C library. */ - sigset_t set; struct { sigset_t *set; size_t size; } sig, *sig_ptr; =20 abi_ulong arg_sigset, arg_sigsize, *arg7; - target_sigset_t *target_sigset; =20 n =3D arg1; rfd_addr =3D arg2; @@ -1439,10 +1437,8 @@ static abi_long do_pselect6(abi_long arg1, abi_long = arg2, abi_long arg3, } =20 /* Extract the two packed args for the sigset */ + sig_ptr =3D NULL; if (arg6) { - sig_ptr =3D &sig; - sig.size =3D SIGSET_T_SIZE; - arg7 =3D lock_user(VERIFY_READ, arg6, sizeof(*arg7) * 2, 1); if (!arg7) { return -TARGET_EFAULT; @@ -1452,28 +1448,22 @@ static abi_long do_pselect6(abi_long arg1, abi_long= arg2, abi_long arg3, unlock_user(arg7, arg6, 0); =20 if (arg_sigset) { - sig.set =3D &set; - if (arg_sigsize !=3D sizeof(*target_sigset)) { - /* Like the kernel, we enforce correct size sigsets */ - return -TARGET_EINVAL; + ret =3D process_sigsuspend_mask(&sig.set, arg_sigset, arg_sigs= ize); + if (ret !=3D 0) { + return ret; } - target_sigset =3D lock_user(VERIFY_READ, arg_sigset, - sizeof(*target_sigset), 1); - if (!target_sigset) { - return -TARGET_EFAULT; - } - target_to_host_sigset(&set, target_sigset); - unlock_user(target_sigset, arg_sigset, 0); - } else { - sig.set =3D NULL; + sig_ptr =3D &sig; + sig.size =3D SIGSET_T_SIZE; } - } else { - sig_ptr =3D NULL; } =20 ret =3D get_errno(safe_pselect6(n, rfds_ptr, wfds_ptr, efds_ptr, ts_ptr, sig_ptr)); =20 + if (sig_ptr) { + finish_sigsuspend_mask(ret); + } + if (!is_error(ret)) { if (rfd_addr && copy_to_user_fdset(rfd_addr, &rfds, n)) { return -TARGET_EFAULT; --=20 2.25.1 From nobody Mon Feb 9 16:27:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1647336541; cv=none; d=zohomail.com; s=zohoarc; b=DBdujWLtUanuvO793DIEozQ5hSGMBKPa2E6HxefO48gcQR8Tg4gc1WNYGEu3a4m24E39vxQqgKE1FqnEEINt+7DTHGZzVHcD8JahoejnHfLQoQU4MMQPyFonu1ghFoUgvK9gaMnzc9Bff9edcCkwhncwTaZlZTjDmBynbs8VJck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647336541; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DEJtNZJacym7P3D55T00OdkxyEJk/tkTx1LWRg3rxNs=; b=ZNAnKdGhUSfyk1S+vgGICIEH/VVTlrJXULTyzudp7aXt++TVCWLDAQ69tOnb+xbJdv8XRLtRm3ROjH2yxif/acOI4dapfBjUzVmq2hbHg6IcScQp02XfRXuO2FQ8if2Bt5u/fPOpTL3+9ofAQmgp13SEleAC6ps1QUXr03Qi+nE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647336541485440.0733922854638; Tue, 15 Mar 2022 02:29:01 -0700 (PDT) Received: from localhost ([::1]:55486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU3UC-0007yW-4F for importer@patchew.org; Tue, 15 Mar 2022 05:29:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU2lx-0008Sw-0y for qemu-devel@nongnu.org; Tue, 15 Mar 2022 04:43:19 -0400 Received: from [2607:f8b0:4864:20::102c] (port=56227 helo=mail-pj1-x102c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nU2lu-000545-1l for qemu-devel@nongnu.org; Tue, 15 Mar 2022 04:43:15 -0400 Received: by mail-pj1-x102c.google.com with SMTP id e3so17031698pjm.5 for ; Tue, 15 Mar 2022 01:43:13 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id ob13-20020a17090b390d00b001becfd7c6f3sm2233762pjb.27.2022.03.15.01.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 01:43:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DEJtNZJacym7P3D55T00OdkxyEJk/tkTx1LWRg3rxNs=; b=uI9ItgBWvpWSsUBoL2AvQnXiyn1z3DmL+NHB+QW5SVNdAoA9LyITt8p28bvbiHr0s3 QefmGlCK+HfFvxL9YAIFFnQUIlRlOVzOXuHcKM2wqEgpDKK4RO+o1JYKNbnbclQqNzju 07bu7Uh2QfBrdGAFABtP69KXD5l7Ny79J6n5YAiA+Zov9AXRpezHxIwMB4GdSYuP5I3S nMV6+jrsLHS3toxT+2UhL0PuIInco/wgaRI3BdMKFEdwUaKEjhkG3KcCnm6TD3NxhDm7 rcyLLyt0WFbbkmKZPMZEvvMcmIfln3Z2caDltnzvZxAckZ2ksExlZtYPCHZGH7Nrjcmi G5Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DEJtNZJacym7P3D55T00OdkxyEJk/tkTx1LWRg3rxNs=; b=XLgB2q4dtmxyYD7AIHpdSZIlk39ToWvm7goADls8ZEflWguj26jPh4C+LuC0h8o2og EbEDbpOXuvlXXzoMB33J3zE8lZc42Vbnu3PuxhgReZ68kLDmV5KMQT4rD+VPyORewqNL ZDLpco1NvM1loOafmUUPmdmAnKi55owBUitEX925yAkuWRVnP2h5hgCaZ659xr7Rc2YM wnKx4xLVH+zvnx6Su6O4CyUreoQaUeuPutlFOBB/vVg2dpYeAbGImf5Abky+AHsSN4+3 dbbTwHV37mAerDagaphDLHVmJ3dWfNSm4EALog6ghFziiAi9W+7PbpbMydSRXXhoHORl 3gXA== X-Gm-Message-State: AOAM531JXcetTNhXo0oslFQhtwKHclprGHsN383N1uEtoSjL3494RCQv CQUVF5Hpom38dE9yyiWSVMqxkzBrrCNYoA== X-Google-Smtp-Source: ABdhPJwppdGGo1gjek07i4FD5O5UWEu/56zQfcFQ31+MqkTex1grmns59Pse2SlvHjodAAxTQkBdIg== X-Received: by 2002:a17:902:cec2:b0:151:b337:a699 with SMTP id d2-20020a170902cec200b00151b337a699mr27885786plg.59.1647333792820; Tue, 15 Mar 2022 01:43:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 4/5] linux-user: Properly handle sigset arg to epoll_pwait Date: Tue, 15 Mar 2022 01:43:07 -0700 Message-Id: <20220315084308.433109-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220315084308.433109-1-richard.henderson@linaro.org> References: <20220315084308.433109-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102c (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1647336542492100003 Content-Type: text/plain; charset="utf-8" Unblocked signals are never delivered, because we didn't record the new mask for process_pending_signals. Handle this with the same mechanism as sigsuspend. Signed-off-by: Richard Henderson Reviewed-by: Laurent Vivier --- linux-user/syscall.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 8071a5191d..85de4e1bc7 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -12694,29 +12694,21 @@ static abi_long do_syscall1(void *cpu_env, int nu= m, abi_long arg1, #if defined(TARGET_NR_epoll_pwait) case TARGET_NR_epoll_pwait: { - target_sigset_t *target_set; - sigset_t _set, *set =3D &_set; + sigset_t *set =3D NULL; =20 if (arg5) { - if (arg6 !=3D sizeof(target_sigset_t)) { - ret =3D -TARGET_EINVAL; + ret =3D process_sigsuspend_mask(&set, arg5, arg6); + if (ret !=3D 0) { break; } - - target_set =3D lock_user(VERIFY_READ, arg5, - sizeof(target_sigset_t), 1); - if (!target_set) { - ret =3D -TARGET_EFAULT; - break; - } - target_to_host_sigset(set, target_set); - unlock_user(target_set, arg5, 0); - } else { - set =3D NULL; } =20 ret =3D get_errno(safe_epoll_pwait(epfd, ep, maxevents, timeou= t, set, SIGSET_T_SIZE)); + + if (set) { + finish_sigsuspend_mask(ret); + } break; } #endif --=20 2.25.1 From nobody Mon Feb 9 16:27:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1647339702; cv=none; d=zohomail.com; s=zohoarc; b=UALVnU+N3IHmuBrN2jimOWP4vBwsSDil7EC0GKgKW4QXtVz4K03J/NhC52QRFPFHZuTPG9Srnhafxr1vsYq0CgqBrAOcmGqrubXqPqVR7TOn+0tuG5rbxtD3J1BXy8dShrMV4hNt1rcsvTrw7tETmUOfXAercSCeHrBxIi0/OWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647339702; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yQiK4Nk/B1NdX9ZTCZaM1xTMTE5yCiEd6wvHx/1Jvzs=; b=JtrxON124C4GHjErWSpRLGFWSCJZiVC4mKdXvb4D6cI/kqL+zH6YjtQswW5QWkAa6kH4orbkfyhn+wW2U9lq6w3/RQcaxSB1Z3oXLKt/swCgjkm18PynF1+PvyogoMFRXnOe1vLXfv9q2fnRO1wmn1rc3h/9B1zaxMriV2ak8U8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647339702117976.8019735618572; Tue, 15 Mar 2022 03:21:42 -0700 (PDT) Received: from localhost ([::1]:38964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU4JA-0003vo-V3 for importer@patchew.org; Tue, 15 Mar 2022 06:21:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU2lx-0008Sx-0x for qemu-devel@nongnu.org; Tue, 15 Mar 2022 04:43:19 -0400 Received: from [2607:f8b0:4864:20::432] (port=41543 helo=mail-pf1-x432.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nU2lu-00054D-Q2 for qemu-devel@nongnu.org; Tue, 15 Mar 2022 04:43:15 -0400 Received: by mail-pf1-x432.google.com with SMTP id p8so18515026pfh.8 for ; Tue, 15 Mar 2022 01:43:14 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id ob13-20020a17090b390d00b001becfd7c6f3sm2233762pjb.27.2022.03.15.01.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 01:43:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yQiK4Nk/B1NdX9ZTCZaM1xTMTE5yCiEd6wvHx/1Jvzs=; b=hwIu+VrVpvcUA7dlwzLcjRNIGXtyn7iW8vabWJbhCCslVc0fZFvpTdxujiZB1APy+R hRR6m9VK5QmKT2BQurCWqk8rhwxcM5fLCKgKEM/ewC/lBAiK4+SGa7/7a159XRH8e5v3 X0Bo1FvWGwHYqzhOwwV2k4mo1k+oSVGeI9PqHea2IKe468AeYpzBlyt1RVOXSfUQr1HC 6ptD9BEuoA1AHjx5p9S1KND7FRUWRn7w2doy64d/ld/YaFrRoy0wRbClkgT7lfsXx2vU hfqIzOlLprTTcxuz7AZrvZQJ0o0UTtRPCUr/tEiGRw56e9foMCDVSW3UVyTxNJ5kUQBL AvLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yQiK4Nk/B1NdX9ZTCZaM1xTMTE5yCiEd6wvHx/1Jvzs=; b=uzDsJKKnVy7kba7DbZ1wKAIHsK/FDuVNpthCbWw3JxI2uR/NefUC9o9LO76Lfjqv6I lRXUGqW9KcVLHXb6ZZXsMpGoYHAaEYhnK8az7v1zfjkJuvD5uann6+XjdaddHOYPQy9e sA48UtSbzwhSU7uLDE16193/2/fz3e4nVav/cjCieOdCxl2NqX+5RLmK3cIlrkkFaJD6 ygLxTbu/m6n6oP2wygQslMLVXmxX8jSr3r4jrXQvfMxbdGYDp1un4cXZTU41loxDP+HT J+xSrX/t1WQMRlkGmZt129bZKzNLuTZPywtC0yAVKaEiGqxy5nP1WEc6yHAJzrlrQuV/ 9O5w== X-Gm-Message-State: AOAM5323hVOKbO6KO8PdBsGac8/N8eEZzU6tRWwZvmH5FcwwUQeAcxQE XXMJvWWViLCoT1a/mIUfWfAF4gf/ufSuBg== X-Google-Smtp-Source: ABdhPJwUyuwhqsp5ZYjpEhh7Wd7jSr9S97z9wkDfPeA5EQiLnOjc3oSSzQ8Zb9gIpI1wPALBOjM1rw== X-Received: by 2002:a63:864a:0:b0:375:7999:e83c with SMTP id x71-20020a63864a000000b003757999e83cmr23457367pgd.144.1647333793552; Tue, 15 Mar 2022 01:43:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 5/5] linux-user: Properly handle sigset arg to ppoll Date: Tue, 15 Mar 2022 01:43:08 -0700 Message-Id: <20220315084308.433109-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220315084308.433109-1-richard.henderson@linaro.org> References: <20220315084308.433109-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::432 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1647339703783100001 Content-Type: text/plain; charset="utf-8" Unblocked signals are never delivered, because we didn't record the new mask for process_pending_signals. Handle this with the same mechanism as sigsuspend. Signed-off-by: Richard Henderson Reviewed-by: Laurent Vivier --- linux-user/syscall.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 85de4e1bc7..a69b7084f1 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1519,8 +1519,7 @@ static abi_long do_ppoll(abi_long arg1, abi_long arg2= , abi_long arg3, } if (ppoll) { struct timespec _timeout_ts, *timeout_ts =3D &_timeout_ts; - target_sigset_t *target_set; - sigset_t _set, *set =3D &_set; + sigset_t *set =3D NULL; =20 if (arg3) { if (time64) { @@ -1539,25 +1538,19 @@ static abi_long do_ppoll(abi_long arg1, abi_long ar= g2, abi_long arg3, } =20 if (arg4) { - if (arg5 !=3D sizeof(target_sigset_t)) { + ret =3D process_sigsuspend_mask(&set, arg4, arg5); + if (ret !=3D 0) { unlock_user(target_pfd, arg1, 0); - return -TARGET_EINVAL; + return ret; } - - target_set =3D lock_user(VERIFY_READ, arg4, - sizeof(target_sigset_t), 1); - if (!target_set) { - unlock_user(target_pfd, arg1, 0); - return -TARGET_EFAULT; - } - target_to_host_sigset(set, target_set); - } else { - set =3D NULL; } =20 ret =3D get_errno(safe_ppoll(pfd, nfds, timeout_ts, set, SIGSET_T_SIZE)); =20 + if (set) { + finish_sigsuspend_mask(ret); + } if (!is_error(ret) && arg3) { if (time64) { if (host_to_target_timespec64(arg3, timeout_ts)) { @@ -1569,9 +1562,6 @@ static abi_long do_ppoll(abi_long arg1, abi_long arg2= , abi_long arg3, } } } - if (arg4) { - unlock_user(target_set, arg4, 0); - } } else { struct timespec ts, *pts; =20 --=20 2.25.1