From nobody Tue Feb 10 18:36:14 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEEE5C7EE23 for ; Fri, 12 May 2023 16:48:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237295AbjELQsP (ORCPT ); Fri, 12 May 2023 12:48:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229547AbjELQsN (ORCPT ); Fri, 12 May 2023 12:48:13 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3797D9EC1; Fri, 12 May 2023 09:48:12 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-4f00d41df22so54326507e87.1; Fri, 12 May 2023 09:48:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683910090; x=1686502090; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=PsIlGh6Gxn6SeZwH4Pv85L0XJVmMF+nUTEldqUDjbVE=; b=T+0IfXbNbBr/WFqBn4xICXEJyBKjnSP9NtApQs0wDKEMpkj+bJIKhRyaTVx4RvazyA o0Lk5UQuOc8x97YYZMEyokfa+RJN0XYWGO4RnP1FNHkAHQsJD1Wl/dnYSX5GzCTDzeyv 0MTgnwXupCfRDkNbQgLmsvTP12I4J1e3bH7/pJ4Vhu9Puhow4Eoe57MS0jr2apxsqIK5 mT75owCVe/MRBCSl/opavb9jbIWikTciDuJ9AVWQ9iAfQe/xRvb3HxTYIUN8jIZopbkE i1A7rY3QfO1oSV7UmZx96D83FLO9lu1WFzQt/nm7jFo33FTgp+R5Ln4zs7tyh+6cRGXH oxGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683910090; x=1686502090; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=PsIlGh6Gxn6SeZwH4Pv85L0XJVmMF+nUTEldqUDjbVE=; b=EHUzQAmmdebHkdbcbl26ZrCruxwnt08fI73rBvrP+uSY2gdLPcr7uGDcbWUFLYScZ/ ChSnZu+vt7NunrlhBmXDkVJnlgbcrRoU2oNb45ak22fao+hcyyS5AwzLj31jTVdJND/f H9/3y6kwFR4M9Ef46XNuIXM9t0pbpErdLeP1StxVdP8PdITV8ny9kTMdwzIc04ESw1m9 RraayMCL1CTjBxvvrmjCjvH6MWRmPjAWEX31qjXnneFdycZo1xIAeHqd21Jp7lMeUKtX fPQNRqRrRg/iAMMrfTITRdxoEk8i1SCXpps4Cfj9NjuhC7eUmJnW7EWgwc08V31EVV4Z SAJQ== X-Gm-Message-State: AC+VfDwMcFDW3p/XA7be/YbfHBMwsCz5kb+m3tJigzQSbtD8UtWTn/yS lB5YK51haaLQn6Q7ThpTnlu62U2LWAY= X-Google-Smtp-Source: ACHHUZ7lZ6Zddjpe+mywjBnjMyNxaHzCP8b07KD+Ykq2U0BqBuWX3Or+YB1w6vAo8rL94HZdHgPyuA== X-Received: by 2002:ac2:5ed0:0:b0:4f0:1a45:2b10 with SMTP id d16-20020ac25ed0000000b004f01a452b10mr4390431lfq.10.1683910089855; Fri, 12 May 2023 09:48:09 -0700 (PDT) Received: from localhost.localdomain ([37.130.110.122]) by smtp.gmail.com with ESMTPSA id r27-20020ac24d1b000000b004eee27b293bsm1522404lfi.298.2023.05.12.09.48.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 09:48:09 -0700 (PDT) From: Max Filippov To: linux-kernel@vger.kernel.org Cc: Chris Zankel , Max Filippov , stable@vger.kernel.org Subject: [PATCH] xtensa: fix signal delivery to FDPIC process Date: Fri, 12 May 2023 09:47:12 -0700 Message-Id: <20230512164712.2150755-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Fetch function descriptor pointed to by the signal handler pointer from userspace on signal delivery and function pointer pointed to by the sa_restorer on return from the signal handler. Cc: stable@vger.kernel.org Fixes: e3ddb8bbe0f8 ("xtensa: add FDPIC and static PIE support for noMMU") Signed-off-by: Max Filippov --- arch/xtensa/kernel/signal.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c index 876d5df157ed..5c01d7e70d90 100644 --- a/arch/xtensa/kernel/signal.c +++ b/arch/xtensa/kernel/signal.c @@ -343,7 +343,19 @@ static int setup_frame(struct ksignal *ksig, sigset_t = *set, struct rt_sigframe *frame; int err =3D 0, sig =3D ksig->sig; unsigned long sp, ra, tp, ps; + unsigned long handler =3D (unsigned long)ksig->ka.sa.sa_handler; + unsigned long handler_fdpic_GOT =3D 0; unsigned int base; + bool fdpic =3D IS_ENABLED(CONFIG_BINFMT_ELF_FDPIC) && + (current->personality & FDPIC_FUNCPTRS); + + if (fdpic) { + unsigned long __user *fdpic_func_desc =3D + (unsigned long __user *)handler; + if (__get_user(handler, &fdpic_func_desc[0]) || + __get_user(handler_fdpic_GOT, &fdpic_func_desc[1])) + return -EFAULT; + } =20 sp =3D regs->areg[1]; =20 @@ -373,20 +385,26 @@ static int setup_frame(struct ksignal *ksig, sigset_t= *set, err |=3D __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); =20 if (ksig->ka.sa.sa_flags & SA_RESTORER) { - ra =3D (unsigned long)ksig->ka.sa.sa_restorer; + if (fdpic) { + unsigned long __user *fdpic_func_desc =3D + (unsigned long __user *)ksig->ka.sa.sa_restorer; + + err |=3D __get_user(ra, fdpic_func_desc); + } else { + ra =3D (unsigned long)ksig->ka.sa.sa_restorer; + } } else { =20 /* Create sys_rt_sigreturn syscall in stack frame */ =20 err |=3D gen_return_code(frame->retcode); - - if (err) { - return -EFAULT; - } ra =3D (unsigned long) frame->retcode; } =20 - /*=20 + if (err) + return -EFAULT; + + /* * Create signal handler execution context. * Return context not modified until this point. */ @@ -394,8 +412,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *= set, /* Set up registers for signal handler; preserve the threadptr */ tp =3D regs->threadptr; ps =3D regs->ps; - start_thread(regs, (unsigned long) ksig->ka.sa.sa_handler, - (unsigned long) frame); + start_thread(regs, handler, (unsigned long)frame); =20 /* Set up a stack frame for a call4 if userspace uses windowed ABI */ if (ps & PS_WOE_MASK) { @@ -413,6 +430,8 @@ static int setup_frame(struct ksignal *ksig, sigset_t *= set, regs->areg[base + 4] =3D (unsigned long) &frame->uc; regs->threadptr =3D tp; regs->ps =3D ps; + if (fdpic) + regs->areg[base + 11] =3D handler_fdpic_GOT; =20 pr_debug("SIG rt deliver (%s:%d): signal=3D%d sp=3D%p pc=3D%08lx\n", current->comm, current->pid, sig, frame, regs->pc); --=20 2.30.2