From patchwork Sat Dec 16 16:53:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1876958 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=GDhOGgxS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SssfC2nYgz23p3 for ; Sun, 17 Dec 2023 03:55:31 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6A016384CB8E for ; Sat, 16 Dec 2023 16:55:29 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id 94CE3386185B for ; Sat, 16 Dec 2023 16:53:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 94CE3386185B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 94CE3386185B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::433 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702745614; cv=none; b=LRFo0HuuSBSQB+8hFjVEu5IhxbtFYab3VVAVgVv08Ss3m4gRU0W676SgWJnP+NQ+JNPAPHfQAT+qurhbO8CE7jerQZ0lssBu5KwZGQrzf2IhsU9SfxRuBuPFzEg8Snv/hrutOxwfABgqNaRZEHV1aLLsJx39lvW9y1O1tjElUj0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702745614; c=relaxed/simple; bh=Nf917YFVBWt07qv0YBn/WWes+1rwJZIs5YoSu01l9Us=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=J+PKIVU4wOoGCYErk3NmB6eyJ774oAQhFN1TMBpUnYLF4ACiBGAUxqxPDYcYtTZlvjxhrXEcEHmigtQIvVHr/lmMx09gPYj77EV6zLZBPfQ6OcMuWi2K2P0eMTS8qRdaT04UqZ5Ak8ormXoWp79ba73XiS4fdH06NVevAMejXVQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-6d3165ac96bso82587b3a.0 for ; Sat, 16 Dec 2023 08:53:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702745611; x=1703350411; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p9/ZV1/WRaoIe1pF/iDaSK4HCEVFbz/DSE50fF3w1mw=; b=GDhOGgxSTWzJh9eEEegwAzFXMf0qvKtvH8IBdY540peBuApmnpHBrIpvzQrxBqAI/T fIqad66Jc9IT2rM45mffysB1axIB8mImx9Ugny80jigJ8TR8/KJS113cFiUg55sIpB5w ndfd8juD/zKqTujmpFhvVLZ7SMNooMyHDase5MCfSSLKJAzqmiPhyN30ND+lcLgb3S/K usvLOL7+riXAJ8fbIfrvB20JDd9CLoXfPLsAvOi9bBBSHHx+7EIXrhF5JlPDnSAEJL+t 218Fbp+S8Sl2DexXSadH39Sm1c7JHM+ktW+pJ43uwr4wTgVfv3sSKqlQ4Aed4lA+/WGP d7Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702745611; x=1703350411; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p9/ZV1/WRaoIe1pF/iDaSK4HCEVFbz/DSE50fF3w1mw=; b=qQu/2paB5Zg3XtJKnuFC+sxViVXQqW5JRrboe919AlQBxT6gcYy+2JvUFmi27WIR0A knkrQva0hNtswsy1o0YGb4rA/xrAvowEM9F742LoEAsa/YHrdc0EXNjBSDIrsyA/EZGE Tz7sCNExyZBbGa8OdQeQa2UJ6XFmZHn5hIyo/jPFvnFbIcYvvw8M7Jme3e/Y0YbD7cVn swFWFvYSNtUjPdLTrD3+1f4EQo+TbtAbOjx8+sSvECg2DHsBCREKE4P3CViDjXnIExvn QgOXg7rmIB1nyYDW0uddzs048oKGi3BRwik9fUXWxCxd9fHUGf5B3wGipI8dIeS0ZgJu FEmA== X-Gm-Message-State: AOJu0YzeDV3vdgJNTFmDmloB54kja6eTYdgwpruiaQ+h9m0waAvmKnN4 YjjkbsbhnNrA43/SOGM14thFya9+Irg= X-Google-Smtp-Source: AGHT+IGIRVmTktDYVlfEjIDL+NgSK7/muBhetVgXaT0Q2eaZXb9ySXemllKv9wnzoNiIP8qKc+WAgA== X-Received: by 2002:a17:903:11cf:b0:1d3:1bea:eb56 with SMTP id q15-20020a17090311cf00b001d31beaeb56mr7365100plh.115.1702745611610; Sat, 16 Dec 2023 08:53:31 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.59.129.147]) by smtp.gmail.com with ESMTPSA id 13-20020a170902e9cd00b001d33369bd86sm9144903plk.194.2023.12.16.08.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:53:29 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id A765B740637; Sat, 16 Dec 2023 08:53:25 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: rick.p.edgecombe@intel.com Subject: [PATCH v2 08/16] x86/cet: Check CPU_FEATURE_ACTIVE in permissive mode Date: Sat, 16 Dec 2023 08:53:17 -0800 Message-ID: <20231216165325.2584919-9-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231216165325.2584919-1-hjl.tools@gmail.com> References: <20231216165325.2584919-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3024.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Verify that CPU_FEATURE_ACTIVE works properly in permissive mode. --- sysdeps/x86/Makefile | 1 + sysdeps/x86/tst-cet-legacy-4.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile index 1bf6ff9e11..6911a07a87 100644 --- a/sysdeps/x86/Makefile +++ b/sysdeps/x86/Makefile @@ -219,6 +219,7 @@ CFLAGS-tst-cet-legacy-mod-1.c += -fcf-protection=none CFLAGS-tst-cet-legacy-mod-2.c += -fcf-protection=none CFLAGS-tst-cet-legacy-3.c += -fcf-protection=none CFLAGS-tst-cet-legacy-4.c += -fcf-protection=branch +CPPFLAGS-tst-cet-legacy-4a.c += -DCET_IS_PERMISSIVE=1 CFLAGS-tst-cet-legacy-4a.c += -fcf-protection CFLAGS-tst-cet-legacy-4b.c += -fcf-protection CFLAGS-tst-cet-legacy-mod-4.c += -fcf-protection=none diff --git a/sysdeps/x86/tst-cet-legacy-4.c b/sysdeps/x86/tst-cet-legacy-4.c index d75fb0e61c..c098120253 100644 --- a/sysdeps/x86/tst-cet-legacy-4.c +++ b/sysdeps/x86/tst-cet-legacy-4.c @@ -21,6 +21,7 @@ #include #include #include +#include #include @@ -40,6 +41,10 @@ do_test (void) return 0; } +#ifdef CET_IS_PERMISSIVE + TEST_VERIFY (!CPU_FEATURE_ACTIVE (IBT) && !CPU_FEATURE_ACTIVE (SHSTK)); +#endif + fp = dlsym (h, "test"); if (fp == NULL) FAIL_EXIT1 ("cannot get symbol 'test': %s\n", dlerror ());