From patchwork Mon Oct 4 07:44:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 515160 Delivered-To: patch@linaro.org Received: by 2002:ac0:890a:0:0:0:0:0 with SMTP id 10csp1149785imy; Mon, 4 Oct 2021 00:55:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysf3QpRnHXdMRsgYR5T63mCtawKESdB0wSLxeH8jUeIry7oHbkv00kAYlq7tEnJf15kv+/ X-Received: by 2002:a5b:ac3:: with SMTP id a3mr13454469ybr.197.1633334116674; Mon, 04 Oct 2021 00:55:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633334116; cv=none; d=google.com; s=arc-20160816; b=gslEWF/V30TdQZ4K9+J5Z9KmxjcXyr6exO0jaiI/vchjT31H6BYTrSWBHibXd+WvZn GGmYfhFe2zmiZLXJUxrwLH1k4qOZSS7WrZYDV1R+LzuJwNcPEhGnj9XC0SgMzx/wUEVU 21i1cmSKiadOIvDSgRpH1BvVi3hrTrWyJaisho/tlmIdWFOA0gQggIC8duOUnbFYq/AP NqOiWTv+hXsS7XnJF/boFgfjTMlph1Kxt9e3t49aVPVY3XJolE4Tbnm9Z/8zTZPYo0OC /ifgN6FFc7EuEeluPWhhCUW2laxTYEb6yg3kAmhIsxXVmwIBhjrRLge45yJ+/2XLVdA4 z/6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=4QJro5+SRwkreru9Oh/Ljx7V3EBstymDzPJ2JtY4QkI=; b=GXHsY8Vat/zYZ2DxFEmKxkvKMJ5l+aG74RbhJhwgEGoIt4qQ8WEtYyUaK73MbZJhXB 2qdtAeWFhQzee+KxMPXldbME3BnFrOK/oOo2T43nCxISOmR+EgebuEhOwlq4ebeajQy8 Eo+Kw6ocKR5Q7LbbdsoF2nSGU0wYLsniD/8Vm5ctBbEAO1H1btH2tXZjcdkao/vASngw mbEn2YgnaJXDnJk3D7ddWo93PO3X1Fr0t4HZ99GtPLJCuvhlDpZx4YD366r5ehithB72 7w/mk5RhYaPsX1pS+hROSckvPgf29aGUwFOhSr/xjrOZkyNfeJtooK3Bbis9j00ngSEi OKaA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j1si17878416ybp.150.2021.10.04.00.55.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Oct 2021 00:55:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:54514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXIoe-0007JQ-30 for patch@linaro.org; Mon, 04 Oct 2021 03:55:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXIeJ-000422-H2 for qemu-devel@nongnu.org; Mon, 04 Oct 2021 03:44:35 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:34195) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXIeG-0004lt-01 for qemu-devel@nongnu.org; Mon, 04 Oct 2021 03:44:33 -0400 Received: from quad ([82.142.3.114]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N3omW-1mxauL3WlM-00zjVI; Mon, 04 Oct 2021 09:44:29 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 11/26] linux-user/x86_64: Raise SIGSEGV if SA_RESTORER not set Date: Mon, 4 Oct 2021 09:44:06 +0200 Message-Id: <20211004074421.3141222-12-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004074421.3141222-1-laurent@vivier.eu> References: <20211004074421.3141222-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:+mQEQfC0509EGqg/4LAdEazqc+ZehDxXmp1nPzsudUqmL4bkkOB pqjUi7IBvfyNi3OjHcIzMMqAIM4qVtQwvRVKRLh/ZrY7XWeK5J+2tMyxNJkRjQd8R0aM9i4 wXU3jeHreFia/t59MFS4Ml14S4bU0I1CjJs1TzX20cbuOzLytMRkYmNtb0VgSgL9U42REZv CppibBYnTaUzdZCuB6vhQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:r2e8AkzkGss=:1W7KQWCGhFyeaMZ1eGzZUu wpvxRcqq+K1m04Ki1UGnZuBZzbTFjlSF5WcmUon/VEiIZVaEfjKn3WftjO6EalQTWmceRn+KW Ko8lz9krYpuMPgsoqHIQsklbgLkh757lHlEr/0DFsWaaNnxeY2QXVpM79uZIijkfxPVAH6inT rc/39qdeRIbYEz7OAxB9KkAUg1gQksbvOk8eNq72dH9zQVXBl6WnkPoJqSXVYh6KWVhGnGiyE 8SG1JFpasGJ0lBzF68teJTSD/8fuQidXpUjvWftXjlnRdTCT/0xIyHHzjB3x/VCzfZXreRdmd PFkR6TTCncUzMVf9paSRU+Ng43R8Mm0zS3V8aV4tTBtsjVYj41PJE4Lt0E5hW/vWbl+CJXHj3 2ElVg8sVXIdH0KXUKlW1zrDp3aTRGH8qvVhIlndmm0oZZIcvO0459mfKhNyRcVi8e74Zi1iCt qs9RpOx9xWs/vEuErhkGnaz80WePPYoefLouujOKohOOyUZHZRI1ogBUpTB+d5+WILTI+sCF4 r8dk0ihoGpJDlNNxXrR8LqcQNzRoWAze6tXe+h7EKNBnyj0DFh/q4UVp5jV76osQnYzlORHRN XssW82T52jUbr1LpvdnO81DsWGFTKe/0Zc40sep7zxxTBNNMujc21WQ7CY1N8diGHvyxy8Cnq 7KVVxqDdMw5GioN8oal0jXuXqCri/29fOwocZbQb5Cm2nPd9C1uK89iAjyvXm0Xy6i9wYaBJn GRIJEn0FnRr+HDXy8YbW3+p2Oj86+OwVBXvGuA== Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This has been a fixme for some time. The effect of returning -EFAULT from the kernel code is to raise SIGSEGV. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-Id: <20210929130553.121567-12-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/i386/signal.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -- 2.31.1 diff --git a/linux-user/i386/signal.c b/linux-user/i386/signal.c index b38b5f108eaf..433efa3d693b 100644 --- a/linux-user/i386/signal.c +++ b/linux-user/i386/signal.c @@ -421,19 +421,18 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, /* Set up to return from userspace. If provided, use a stub already in userspace. */ -#ifndef TARGET_X86_64 if (ka->sa_flags & TARGET_SA_RESTORER) { __put_user(ka->sa_restorer, &frame->pretcode); } else { +#ifdef TARGET_X86_64 + /* For x86_64, SA_RESTORER is required ABI. */ + goto give_sigsegv; +#else /* This is no longer used, but is retained for ABI compatibility. */ install_rt_sigtramp(frame->retcode); __put_user(default_rt_sigreturn, &frame->pretcode); - } -#else - /* XXX: Would be slightly better to return -EFAULT here if test fails - assert(ka->sa_flags & TARGET_SA_RESTORER); */ - __put_user(ka->sa_restorer, &frame->pretcode); #endif + } /* Set up registers for signal handler */ env->regs[R_ESP] = frame_addr;