From nobody Sun Feb 8 18:43:48 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 9E89AC7618D for ; Mon, 20 Mar 2023 16:45:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232316AbjCTQpw (ORCPT ); Mon, 20 Mar 2023 12:45:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233176AbjCTQpA (ORCPT ); Mon, 20 Mar 2023 12:45:00 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E96B419B0; Mon, 20 Mar 2023 09:39:51 -0700 (PDT) Date: Mon, 20 Mar 2023 16:39:21 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1679330361; h=from:from:sender:sender:reply-to: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:content-transfer-encoding; bh=AoePcgwjK4gIoR9kptsuLDAiE+CnpWMdx9JDibyAAl0=; b=aNkfGxM//rzqWxWcKjYd3+E00mizKEmeUcjtTip7tuRYQ1Fq+bB4Vvj0j2Y6YUqm58PAee tzBYw9WuyAw9wJAY48kZp/fi2NCPf9Udr+EXZ/02qvoTAsk/26XjJhcoB0PC25SrYU8Rfn gU/cp1q8jlANvqi1EsJwbqcKIC2rvILy7gET4J3OrWCBV2ln548jq+X3mIN4ISkSrjp3AR 2vA7XjhDpSR0qgTeQuKtsa/NOvOa40Eu3FINvCu+CJZik73qL+u44gmaxuBpcrCfKj7M4d ginSFFwnTQclB0+Y9kitK0pa/89STsNYsAVyfjvrMSOSLRJ0rpOLr7R4e5N0GQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1679330361; h=from:from:sender:sender:reply-to: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:content-transfer-encoding; bh=AoePcgwjK4gIoR9kptsuLDAiE+CnpWMdx9JDibyAAl0=; b=+DHSHHZv7exM26VABmTEsSdDdDIVZHL4seZ4owZ9Wu9/Z5pTi9XdHoinifnh/4DbOcByPl HWaupIb+ZCYa4pDw== From: "tip-bot2 for Rick Edgecombe" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/shstk] x86/shstk: Wire in shadow stack interface Cc: Rick Edgecombe , Dave Hansen , "Borislav Petkov (AMD)" , Kees Cook , "Mike Rapoport (IBM)" , Pengfei Xu , John Allen , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <167933036157.5837.4212334925051081519.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/shstk branch of tip: Commit-ID: a7c17fd7d85646d2e1b59384e5d567dc4b228aad Gitweb: https://git.kernel.org/tip/a7c17fd7d85646d2e1b59384e5d567dc4= b228aad Author: Rick Edgecombe AuthorDate: Sat, 18 Mar 2023 17:15:31 -07:00 Committer: Dave Hansen CommitterDate: Mon, 20 Mar 2023 09:01:12 -07:00 x86/shstk: Wire in shadow stack interface The kernel now has the main shadow stack functionality to support applications. Wire in the WRSS and shadow stack enable/disable functions into the existing shadow stack API skeleton. Signed-off-by: Rick Edgecombe Signed-off-by: Dave Hansen Reviewed-by: Borislav Petkov (AMD) Reviewed-by: Kees Cook Acked-by: Mike Rapoport (IBM) Tested-by: Pengfei Xu Tested-by: John Allen Tested-by: Kees Cook Link: https://lore.kernel.org/all/20230319001535.23210-37-rick.p.edgecombe%= 40intel.com --- arch/x86/kernel/shstk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/kernel/shstk.c b/arch/x86/kernel/shstk.c index 01b4566..ee89c42 100644 --- a/arch/x86/kernel/shstk.c +++ b/arch/x86/kernel/shstk.c @@ -472,9 +472,17 @@ long shstk_prctl(struct task_struct *task, int option,= unsigned long features) return -EINVAL; =20 if (option =3D=3D ARCH_SHSTK_DISABLE) { + if (features & ARCH_SHSTK_WRSS) + return wrss_control(false); + if (features & ARCH_SHSTK_SHSTK) + return shstk_disable(); return -EINVAL; } =20 /* Handle ARCH_SHSTK_ENABLE */ + if (features & ARCH_SHSTK_SHSTK) + return shstk_setup(); + if (features & ARCH_SHSTK_WRSS) + return wrss_control(true); return -EINVAL; }