From mboxrd@z Thu Jan 1 00:00:00 1970 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 1D882C77B62 for ; Mon, 20 Mar 2023 01:06:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231300AbjCTBGF (ORCPT ); Sun, 19 Mar 2023 21:06:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231238AbjCTBDR (ORCPT ); Sun, 19 Mar 2023 21:03:17 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AF0623DA6; Sun, 19 Mar 2023 17:57:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 2A54CCE1011; Mon, 20 Mar 2023 00:56:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27137C433D2; Mon, 20 Mar 2023 00:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679273795; bh=P6vD6BAEdEhDdhlgw4psgjaRokQKZmpTxdO+jiaYJFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NnjjZtK0hSZ2Awk3zm4crSBwgMvpkvwp+DPGsfhHR/DZC0mWQy80mOWDVOv9mccVT cZ00hqgkWV3LBUi6x+LTlFISE6hi5cN5WFTBLvibOv6X2IYc2M3xqZ6ELchjdtP9e6 WosUhq5m7wtnLeu9DTXp6irb7gaapedhSJtBj0DnmXFa/EBV2/nPXSBT87MiHqlOg6 f32p0PpLCclylIGkkKmoeAnP1ZQ2N955LXpGETjS/CPbFtVQpjFrAjxX1tQO37nJ2W tjSnLVwvjKn+6eqFtYlPdEQGuBOIbcKwrWRson8n/7vMCMIRcIU36xpkwp7bVIEum7 OPgUzgDD3Ol4A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Al Viro , Rich Felker , Linus Torvalds , Sasha Levin , ysato@users.sourceforge.jp, catalin.marinas@arm.com, bcain@quicinc.com, akpm@linux-foundation.org, guoren@kernel.org, wangkefeng.wang@huawei.com, linux-sh@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 15/15] sh: sanitize the flags on sigreturn Date: Sun, 19 Mar 2023 20:55:59 -0400 Message-Id: <20230320005559.1429040-15-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320005559.1429040-1-sashal@kernel.org> References: <20230320005559.1429040-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro [ Upstream commit 573b22ccb7ce9ab7f0539a2e11a9d3609a8783f5 ] We fetch %SR value from sigframe; it might have been modified by signal handler, so we can't trust it with any bits that are not modifiable in user mode. Signed-off-by: Al Viro Cc: Rich Felker Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- arch/sh/include/asm/processor_32.h | 1 + arch/sh/kernel/signal_32.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/arch/sh/include/asm/processor_32.h b/arch/sh/include/asm/processor_32.h index aa92cc933889d..6c7966e627758 100644 --- a/arch/sh/include/asm/processor_32.h +++ b/arch/sh/include/asm/processor_32.h @@ -50,6 +50,7 @@ #define SR_FD 0x00008000 #define SR_MD 0x40000000 +#define SR_USER_MASK 0x00000303 // M, Q, S, T bits /* * DSP structure and data */ diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c index dd3092911efad..dc13702003f0f 100644 --- a/arch/sh/kernel/signal_32.c +++ b/arch/sh/kernel/signal_32.c @@ -115,6 +115,7 @@ static int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *r0_p) { unsigned int err = 0; + unsigned int sr = regs->sr & ~SR_USER_MASK; #define COPY(x) err |= __get_user(regs->x, &sc->sc_##x) COPY(regs[1]); @@ -130,6 +131,8 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *r0_p COPY(sr); COPY(pc); #undef COPY + regs->sr = (regs->sr & SR_USER_MASK) | sr; + #ifdef CONFIG_SH_FPU if (boot_cpu_data.flags & CPU_HAS_FPU) { int owned_fp; -- 2.39.2