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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 091F4C4321E for ; Sat, 3 Dec 2022 02:45:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 995D46B0073; Fri, 2 Dec 2022 21:45:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9466B6B0074; Fri, 2 Dec 2022 21:45:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E7DD6B0078; Fri, 2 Dec 2022 21:45:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 71A016B0073 for ; Fri, 2 Dec 2022 21:45:29 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 45C9380BD4 for ; Sat, 3 Dec 2022 02:45:29 +0000 (UTC) X-FDA: 80199453978.28.DC59DCC Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf29.hostedemail.com (Postfix) with ESMTP id DB270120018 for ; Sat, 3 Dec 2022 02:45:28 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=OeqW2Nqj; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf29.hostedemail.com: domain of keescook@chromium.org designates 209.85.216.45 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670035528; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=sWPbe7F7je25IvRp5tTWOWJxp/+2tKAEeYAMwrnHX3I=; b=H3s46K9Uq1Svt2XHxlErg/FzDNtGXOFJXnIDREQ8zjDpnb2nU98wY8uTboFfcKg1Qep9u4 CZ/DipyjOiFWg8ADQ+GKJ96oesoRr0u8S61PlLODol+pM4PZgqh7LXv+mbxSk2ZvfujwH2 KJrpktetu8/5sYyKXK2q+5rDTR1tI6A= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=OeqW2Nqj; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf29.hostedemail.com: domain of keescook@chromium.org designates 209.85.216.45 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670035528; a=rsa-sha256; cv=none; b=kszbhwgU4Tf5SyR786HiBJXZdNJDbNlvKD89bfOXgG4XUE31KqrbmQsXZkBLPUCTMnr8Hl tst9lbtT7dxqpw7yPBvDXlgOX4Udo7p4LKAiGpQvn+og2LhY77cDbIrEGY72+6OvD5WOKY sAIRFT9R9X8xP2iyy9k8UYMzduehWKk= Received: by mail-pj1-f45.google.com with SMTP id l22-20020a17090a3f1600b00212fbbcfb78so9953089pjc.3 for ; Fri, 02 Dec 2022 18:45:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=sWPbe7F7je25IvRp5tTWOWJxp/+2tKAEeYAMwrnHX3I=; b=OeqW2Nqj7v6wmWLAIuXU1QUcVafcdaqj28BksV47DQWLlWr4PTt1J4XCOQ454A4bFG TnB8dB810gc+e0jB5mOvXEhdj0JUTzkaMInzsFyeboMhjJ0cJ/qcl4J0adKp4oQMBl4j MniyfBPyATrxtCbDMP4lUaT8Hxyueoc1+DkWw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=sWPbe7F7je25IvRp5tTWOWJxp/+2tKAEeYAMwrnHX3I=; b=BYPt0RIdaX7QeI1+L7+7tNA5GAYXQJ4JzBqsQ65lotK4JTx+bFLGlThrdZe3nvLpRw 7a1lpj06hPbUCC/u2zBFGuDybBJCoyBaJlBdBeOKUyNHA4g2RHsL0zjQbPRRWkW6uKZg 5AHEYn/col/glptLe98xsT1LL8prSX0zGN5c4Vkebjz1ywDdG8JfSxDoujboJ3oakYYN a4q0ACe2NOREvw9WBcqksRQpQRZpQIaV7T7eai0agVqBpDD9enH37KYXResi8MvxHkDg viy5Zfyp7OopkO5jGExK3t0Hjl4XcBTMwjg3rK9an8yaF9pInkgd8kUKdbKGzd0H5nHU /Aug== X-Gm-Message-State: ANoB5pkVl/MlyvJWeqWwPSfS2xCo8xHRCIJUg8o7t0YYkOpcNib/Gig0 5xiv7PSMP5rsOl/r12IUbq23nA== X-Google-Smtp-Source: AA0mqf7RDtFvAEvWe64RZK8PfilyOJ4dzXrwN63EljeiYQe8nUiUTNgCvUVRzgsKQzmQWH/Zqqmtvg== X-Received: by 2002:a17:902:ec8d:b0:188:59d2:33e with SMTP id x13-20020a170902ec8d00b0018859d2033emr53749396plg.142.1670035527895; Fri, 02 Dec 2022 18:45:27 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id w10-20020a170902e88a00b00183c67844aesm6288151plg.22.2022.12.02.18.45.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 18:45:27 -0800 (PST) Date: Fri, 2 Dec 2022 18:45:26 -0800 From: Kees Cook To: Rick Edgecombe Cc: x86@kernel.org, "H . Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H . J . Lu" , Jann Horn , Jonathan Corbet , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , Weijiang Yang , "Kirill A . Shutemov" , John Allen , kcc@google.com, eranian@google.com, rppt@kernel.org, jamorris@linux.microsoft.com, dethoma@microsoft.com, akpm@linux-foundation.org, Andrew.Cooper3@citrix.com, christina.schimpe@intel.com, Yu-cheng Yu Subject: Re: [PATCH v4 28/39] x86/shstk: Introduce routines modifying shstk Message-ID: <202212021845.4A92DA95@keescook> References: <20221203003606.6838-1-rick.p.edgecombe@intel.com> <20221203003606.6838-29-rick.p.edgecombe@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221203003606.6838-29-rick.p.edgecombe@intel.com> X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: DB270120018 X-Stat-Signature: 1t6sop5cm19xi8keywz6p3j1muf3771t X-Spamd-Result: default: False [2.83 / 9.00]; SORBS_IRL_BL(3.00)[209.85.216.45:from]; BAYES_HAM(-2.27)[88.57%]; SUSPICIOUS_RECIPS(1.50)[]; MID_RHS_NOT_FQDN(0.50)[]; MIME_GOOD(-0.10)[text/plain]; BAD_REP_POLICIES(0.10)[]; RCVD_NO_TLS_LAST(0.10)[]; DKIM_TRACE(0.00)[chromium.org:+]; RCPT_COUNT_TWELVE(0.00)[39]; FROM_EQ_ENVFROM(0.00)[]; DMARC_POLICY_ALLOW(0.00)[chromium.org,none]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; R_DKIM_ALLOW(0.00)[chromium.org:s=google]; ARC_NA(0.00)[]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(0.00)[+ip4:209.85.128.0/17]; TO_DN_SOME(0.00)[]; TAGGED_RCPT(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-HE-Tag: 1670035528-44224 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Dec 02, 2022 at 04:35:55PM -0800, Rick Edgecombe wrote: > From: Yu-cheng Yu > > Shadow stacks are normally written to via CALL/RET or specific CET > instuctions like RSTORSSP/SAVEPREVSSP. However during some Linux > operations the kernel will need to write to directly using the ring-0 only > WRUSS instruction. > > A shadow stack restore token marks a restore point of the shadow stack, and > the address in a token must point directly above the token, which is within > the same shadow stack. This is distinctively different from other pointers > on the shadow stack, since those pointers point to executable code area. > > Introduce token setup and verify routines. Also introduce WRUSS, which is > a kernel-mode instruction but writes directly to user shadow stack. > > In future patches that enable shadow stack to work with signals, the kernel > will need something to denote the point in the stack where sigreturn may be > called. This will prevent attackers calling sigreturn at arbitrary places > in the stack, in order to help prevent SROP attacks. > > To do this, something that can only be written by the kernel needs to be > placed on the shadow stack. This can be accomplished by setting bit 63 in > the frame written to the shadow stack. Userspace return addresses can't > have this bit set as it is in the kernel range. It is also can't be a > valid restore token. > > Tested-by: Pengfei Xu > Tested-by: John Allen > Signed-off-by: Yu-cheng Yu Reviewed-by: Kees Cook -- Kees Cook