From nobody Tue Oct 22 22:20:15 2024 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1729174260; cv=none; d=zohomail.com; s=zohoarc; b=iTs7f2iS81ACQSIks6a6f8DSGb8uEtEhc3g9Mcyz3DdGvRTM3TO7PgE0OSEai+nBCaoWw8JrLB2djV6Q/XvamxD9/woGpGyAiVaOLM/BdRGI2Gm5rm8SZhiZIjcNLHLAIKgRVPCF+lAMJxmoSbFOV7xac8stFLHiAqTNcU9IOug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729174260; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iJ7mrzByu6sBFjxfkU1akfoOPDHoOFD/xyXT3SpHi2U=; b=F2ADIJdQPHdwttNIwGScIVx28yv2PcQot80FSm+adbEJSSO+/Hc8QnVLVSQRH/XPNZj/Id2zlu0mUag8qm5ipBaYfLcp0bRvT2QgDKO4MoVYbpKXVY5GA+Dyt5rzrjVuxjGbflooKrJ7oyuygLHzjMtWCa2KXkNvUOEP1IPhGSo= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1729174260688805.9407503387355; Thu, 17 Oct 2024 07:11:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1Q5N-0005be-Dr; Thu, 17 Oct 2024 08:58:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1Q5L-0005bI-Vp for qemu-devel@nongnu.org; Thu, 17 Oct 2024 08:58:36 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1Q5K-0000Y2-Ez for qemu-devel@nongnu.org; Thu, 17 Oct 2024 08:58:35 -0400 Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49HBo1Ob018162; Thu, 17 Oct 2024 12:58:17 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42aqgr32n5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Oct 2024 12:58:17 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 49HClrAn005218; Thu, 17 Oct 2024 12:58:16 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4285njer51-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Oct 2024 12:58:16 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 49HCwFVs50135444 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Oct 2024 12:58:15 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E7D0820043; Thu, 17 Oct 2024 12:58:14 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7DB2C20040; Thu, 17 Oct 2024 12:58:14 +0000 (GMT) Received: from heavy.ibm.com (unknown [9.171.92.150]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 17 Oct 2024 12:58:14 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=iJ7mrzByu6sBFjxfk U1akfoOPDHoOFD/xyXT3SpHi2U=; b=MNXobewc2vXmWGpcy43zRSFAOV3czYaNg HzzalqtC2K1kk9lNA0BcpNQjo7gHRh0mx46oUDRw4z4QbhnHsFFOzCsPoOKDV/9U lObUQUZEsd+hW890ymn++LAEdO5V9BA4bOADEIdeY0aa83oynf1iAho7eZLoojA4 1vdiAUc4z+ILBWXVOxIYsdEt232YPmrZf/+WDHjLnTLnjjjUARJOlyU5q4o+GlNz oaZpMpff27K8h8lY790Hq4RjyYkOzh/w11gjQffWfK2CZqSVuhTquv3lOQ8Ob0Lv 7TJjGtdS3OA/kj4+q0xIenp7M+YxsAldG6A7avFiDgF0aA+ZPb7CQ== From: Ilya Leoshkevich To: Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Cc: qemu-devel@nongnu.org, Ilya Leoshkevich Subject: [PATCH 1/2] linux-user/ppc: Fix sigmask endianness issue in sigreturn Date: Thu, 17 Oct 2024 14:54:43 +0200 Message-ID: <20241017125811.447961-2-iii@linux.ibm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241017125811.447961-1-iii@linux.ibm.com> References: <20241017125811.447961-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: eDLYwU1L7h6tJBnYD3ocMSxfkJ54rNJK X-Proofpoint-GUID: eDLYwU1L7h6tJBnYD3ocMSxfkJ54rNJK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_01,2024-10-11_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 mlxlogscore=891 malwarescore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 spamscore=0 mlxscore=0 suspectscore=0 impostorscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410170086 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=148.163.158.5; envelope-from=iii@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1729174261982116600 Content-Type: text/plain; charset="utf-8" do_setcontext() copies the target sigmask without endianness handling and then uses target_to_host_sigset_internal(), which expects a byte-swapped one. Use target_to_host_sigset() instead. Fixes: bcd4933a23f1 ("linux-user: ppc signal handling") Signed-off-by: Ilya Leoshkevich Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- linux-user/ppc/signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c index a1d8c0bccc1..24e5a02a782 100644 --- a/linux-user/ppc/signal.c +++ b/linux-user/ppc/signal.c @@ -628,7 +628,7 @@ static int do_setcontext(struct target_ucontext *ucp, C= PUPPCState *env, int sig) if (!lock_user_struct(VERIFY_READ, mcp, mcp_addr, 1)) return 1; =20 - target_to_host_sigset_internal(&blocked, &set); + target_to_host_sigset(&blocked, &set); set_sigmask(&blocked); restore_user_regs(env, mcp, sig); =20 --=20 2.47.0 From nobody Tue Oct 22 22:20:15 2024 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1729174201; cv=none; d=zohomail.com; s=zohoarc; b=fJPbO0pEiyXjim7HRO3KrxSNz6QY8NFO7Cgh6rE3Bf1WS7SC47mADxrZ5BggSOySsQX2uG3c0Tbg6pVG0sp1pSRAoZ+VsCDV0vmHh6K/io6uWkVR3Qr0oZZxXdsHfvUeiYA5RzvGabrIcHU7Z7iBpfU/uOxNZOgcP18p2CxDhLU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729174201; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gS0xWRYrY5GGaEk9y6Pmlu4HXJzr4kMuWVjTQXxgu+U=; b=nQeSNmjj6JUWfW3wzOpgcMEiaIu1047ttY9vI71cZ7WpeDPKnLHN3f3UqsyokWcQZghkgrHvRsL3+Ncj5F9/xrq5ufjKviR82h8HI3aLoL9SG2rY4rN47/Gt/ZktSK+HX/xSMLsXoMnHrJvVm0XOVYKUl2PyMUUS2Zs3Aq3iB58= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1729174201418908.4352232150865; Thu, 17 Oct 2024 07:10:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1Q5O-0005c9-13; Thu, 17 Oct 2024 08:58:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1Q5L-0005bH-Tw for qemu-devel@nongnu.org; Thu, 17 Oct 2024 08:58:36 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1Q5K-0000Y1-D4 for qemu-devel@nongnu.org; Thu, 17 Oct 2024 08:58:35 -0400 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49HBo1nV015735; Thu, 17 Oct 2024 12:58:18 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42as8a2py6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Oct 2024 12:58:18 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 49HAmKBs006338; Thu, 17 Oct 2024 12:58:17 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4286516mwy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Oct 2024 12:58:17 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 49HCwFkb45875688 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Oct 2024 12:58:15 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D0A5820043; Thu, 17 Oct 2024 12:58:15 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7045F20040; Thu, 17 Oct 2024 12:58:15 +0000 (GMT) Received: from heavy.ibm.com (unknown [9.171.92.150]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 17 Oct 2024 12:58:15 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=gS0xWRYrY5GGaEk9y 6Pmlu4HXJzr4kMuWVjTQXxgu+U=; b=hwlecouyVrD2fL5H4rcaJ+quxX93L6O5i pYMMOD8tmMiQSz01LRRIUMpD5xxrLPMi83dssvUrSWjN+IPS1Ds+DQRe87TSaxn4 n5suxm37MBrhaAZhAGfXSxItRvtPqLbt/Eml+xXP7MCe07wjQHn8Fx44j1Gh/Gi2 CcOouGnYylXVuU/rvodhPj9NDWlsUxAmx86A97UzakpPM7LkGgfQ7NpqJzqS/qnT hPoDrbaey2bTxc04JodL2aZHx8vwtNK/Cu5A1ghjt7XAd+WM/fFfDZDPJWhW3Af/ GPaDEiLYkuNK9ny3FWUTjjsnvT+7h/UjEuDqFt3xyOZNyIINgDBug== From: Ilya Leoshkevich To: Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Cc: qemu-devel@nongnu.org, Ilya Leoshkevich Subject: [PATCH 2/2] tests/tcg: Test that sigreturn() does not corrupt the signal mask Date: Thu, 17 Oct 2024 14:54:44 +0200 Message-ID: <20241017125811.447961-3-iii@linux.ibm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241017125811.447961-1-iii@linux.ibm.com> References: <20241017125811.447961-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: B5GEhbjYwAf_sRZBSJoel3U0QfjqK8ri X-Proofpoint-ORIG-GUID: B5GEhbjYwAf_sRZBSJoel3U0QfjqK8ri X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_01,2024-10-11_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 suspectscore=0 mlxlogscore=915 phishscore=0 adultscore=0 impostorscore=0 priorityscore=1501 spamscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410170086 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=148.163.158.5; envelope-from=iii@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1729174202730116600 Content-Type: text/plain; charset="utf-8" Add a small test to prevent regressions. Signed-off-by: Ilya Leoshkevich Acked-by: Richard Henderson --- tests/tcg/multiarch/sigreturn-sigmask.c | 51 +++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 tests/tcg/multiarch/sigreturn-sigmask.c diff --git a/tests/tcg/multiarch/sigreturn-sigmask.c b/tests/tcg/multiarch/= sigreturn-sigmask.c new file mode 100644 index 00000000000..e6cc904898d --- /dev/null +++ b/tests/tcg/multiarch/sigreturn-sigmask.c @@ -0,0 +1,51 @@ +/* + * Test that sigreturn() does not corrupt the signal mask. + * Block SIGUSR2 and handle SIGUSR1. + * Then sigwait() SIGUSR2, which relies on it remaining blocked. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include +#include +#include +#include +#include + +int seen_sig =3D -1; + +static void signal_func(int sig) +{ + seen_sig =3D sig; +} + +static void *thread_func(void *arg) +{ + kill(getpid(), SIGUSR2); + return NULL; +} + +int main(void) +{ + struct sigaction act =3D { + .sa_handler =3D signal_func, + }; + pthread_t thread; + sigset_t set; + int sig; + + assert(sigaction(SIGUSR1, &act, NULL) =3D=3D 0); + + assert(sigemptyset(&set) =3D=3D 0); + assert(sigaddset(&set, SIGUSR2) =3D=3D 0); + assert(sigprocmask(SIG_BLOCK, &set, NULL) =3D=3D 0); + + kill(getpid(), SIGUSR1); + assert(seen_sig =3D=3D SIGUSR1); + + assert(pthread_create(&thread, NULL, thread_func, NULL) =3D=3D 0); + assert(sigwait(&set, &sig) =3D=3D 0); + assert(sig =3D=3D SIGUSR2); + assert(pthread_join(thread, NULL) =3D=3D 0); + + return EXIT_SUCCESS; +} --=20 2.47.0