Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp5988261pxj; Wed, 23 Jun 2021 13:40:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTtsgOvXUZSheCTyj0HiW1J8RzdK3Mk+5ER9mqiFo0zlU9XZJtNjk1ztNYmPUx+OmeqfZ6 X-Received: by 2002:a02:6382:: with SMTP id j124mr1381590jac.72.1624480843435; Wed, 23 Jun 2021 13:40:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624480843; cv=none; d=google.com; s=arc-20160816; b=cUCpSUENjUXtymRILxZYgYC6NEccnT/I7AcNEesjMn8S3VeQJyZ6ZwgaO7LxIC0puY T6c3qKl2JRgka9isBXivY0U/g18prgemtAuE/4k+xVzv9vtb7YATD2uRcR3oxXGCxjhk UHl/WrujwRy2S9X+A+0K1cG7CbLDwWIJG/HywLVY41tn5nY1BXoW6Yxgn54OsM0za/dE QnoalJ8OnJuw8gNXVbuAU3rogy0oSfyQ2Gx6IOXto0YCgIgMA/Z/b2HCVbYdxQ968A3q TvhqlIXUJdP7LlRSJiGwtsctHBlcD8RQaftTDsofjjmU0RIwIqBWekPqCkHJfxUtgJYD VeZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9GYkjjOQZ6Rz1pEOIf9K4RSl8mgGGEOKk2i3NOWLjLA=; b=y8H5afDa3AKGLIgUoFAWeKPXy88iJYTeh9uRB87fQyeCxeWfpWKGVw901pJ6nYKYZ9 nCedEXRx/ca1DvrFx9sJN/bjl4Y99QGTC+IsBOqWVnLKhre21/tZg7qRdIPVuOnRy1N1 MUcwqTkdSY+NDc1Y1TM3WHVZ3QYhi03ewxubqeHL9aql1G9y+JrCTHf6Qg5UVw+r5i1o nf5AlndHjxBXmqm2z7kGpy7hi4ZNSoRhca/n0I2S1Q9LjlWSzkuPwXoeGuUv3v0YVFuy vC8KUi92H0h4fiihicQrd3KcxePwqyT+LdVsOEotuLrD8yD7jLUGf+L5ar5WqMk22GQ+ 3CeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="oEmyBdL/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u12si697496iln.143.2021.06.23.13.40.32; Wed, 23 Jun 2021 13:40:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="oEmyBdL/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230048AbhFWUmP (ORCPT + 99 others); Wed, 23 Jun 2021 16:42:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229933AbhFWUmG (ORCPT ); Wed, 23 Jun 2021 16:42:06 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7B9AC0617A6 for ; Wed, 23 Jun 2021 13:39:47 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id m15-20020a17090a5a4fb029016f385ffad0so2134389pji.0 for ; Wed, 23 Jun 2021 13:39:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9GYkjjOQZ6Rz1pEOIf9K4RSl8mgGGEOKk2i3NOWLjLA=; b=oEmyBdL/O6vMQ+qVWEiW1NRHGzhz4sEKTZMQ6lOUKhPz+NU9pA0qtKyPEmtPkPcJ/T GFg4CLQSRyolenFblesTc/xamKo1azEcNE2e7G52IG9ckEWLkNoNPIZH+lwGdOv+zkLs E2Gz8zf4zFisvYsNtwUM+ePjJm2AW2kZbXzeM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9GYkjjOQZ6Rz1pEOIf9K4RSl8mgGGEOKk2i3NOWLjLA=; b=Wm5xmHwgosyISwM5v8/B/Pd3WrEepf5EXZo9sQuCF42zE3kLDaaNiDYj/kPvxSxKvP csN7DsphbyRQWCm7gBjZYLS8TPfkffeGUIR2OKB+qU1tg4BXT0pc2Stsl/xJ7nuaUgqH UViSXYmKZskf+T/jm0080wCYvwMZe8/YKGMqPT2BDfHO//j0+8ogEiNdF0KUzAJ40yE0 6hsEOj/b1X7/u7P4EGxSUtxY/kPFYVmmAX3cbIOpgHzgfdxABwvDLecY8FCZRuoUw+Re AZoA3WzuljnorBJssJ9+qqMd8pD+uXa7ftNmRA1GLE80u81LW4Au2OwQAkTFGS0e5EhZ wy2A== X-Gm-Message-State: AOAM531Mi+cuBvEnzkaB/KsQFqTreD2Z7Zb38tK/q27TnfVzbtwvROrB xoBdyFvQp+n2TgkMMZPwGoEfUw== X-Received: by 2002:a17:90a:a107:: with SMTP id s7mr11289459pjp.1.1624480787198; Wed, 23 Jun 2021 13:39:47 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id y15sm408790pjy.38.2021.06.23.13.39.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 13:39:45 -0700 (PDT) From: Kees Cook To: Greg Kroah-Hartman Cc: Kees Cook , stable@vger.kernel.org, Guillaume Tucker , David Laight , Arnd Bergmann , linux-kernel@vger.kernel.org, kernelci@groups.io, linux-kselftest@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH 2/9] selftests/lkdtm: Fix expected text for CR4 pinning Date: Wed, 23 Jun 2021 13:39:29 -0700 Message-Id: <20210623203936.3151093-3-keescook@chromium.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210623203936.3151093-1-keescook@chromium.org> References: <20210623203936.3151093-1-keescook@chromium.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=856; h=from:subject; bh=BtO+LH6joKjiA1jPQ0OLj8i4wDaw/FKwTM5xGU6TBl4=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBg05wFD1/rNKnVPI48nDGJ/4Gf4RKsbn3ohaIJBJ1z W+hDT3uJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCYNOcBQAKCRCJcvTf3G3AJgPRD/ 9554BXu8baUchD9pqZuBakcbDtoPvR4mAfpwlKhZmDIAG1GjldVg2qs85A5/51LQ1mPCqv8HQUw/5y JucMju9+zN9hyC0j4+K+mz7kiWWsbTgpvRshpU9z89xohKpQO4RgwEhcJ80nVl+g6G7xtTBM9sZjDr ZsXxJE2vxcrsPc/Jk/ucVWI36iZw/JOrEwliKBaaoVEybyEbNPM9RoOGYTOaBJFPhencB0xSczI1YK ZoykQ09IfaXPfJG1cbYhdwyAU4Yo+oLY3VaWi47ELXLhwp9H4HbI0XpZBqNRlbK0Qd/YFnW614FjI/ f+piK+8e7mlAet+zuWdo9LrPQ84Q6toQSV2Y7YsksdVBY6ZVOfatpEDU3W4eKObM0234oE10xnAzJL nPeO610vI0wZ/OhmzHfwb/ybuomHS+e8L6MH0dYsOTU+5ON6bt8TgnX4clULypm89ihL9BrSEypG5c K+QqcbauDvH3EaLB0tP891W0aQ2f5He2M9QpqlvjIQiPWFHAHRmN5nHQTkWTxrY6sqW11nZll/OS1V +cHUbHbJWW5oiXsToLDOt9JBGoCUyqlqqde6vUoGyZZMU7kB1Cm98asIvoVCgcTFGXFaf3y48e4PrX MjdV0E8cknxC9Dr8pewPuwrhjptu/C8x3lPZeduzmOqHLbqxmVuUGORZ9rIA== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The error text for CR4 pinning changed. Update the test to match. Fixes: a13b9d0b9721 ("x86/cpu: Use pinning mask for CR4 bits needing to be 0") Cc: stable@vger.kernel.org Signed-off-by: Kees Cook --- tools/testing/selftests/lkdtm/tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/lkdtm/tests.txt b/tools/testing/selftests/lkdtm/tests.txt index 11ef159be0fd..a5fce7fd4520 100644 --- a/tools/testing/selftests/lkdtm/tests.txt +++ b/tools/testing/selftests/lkdtm/tests.txt @@ -11,7 +11,7 @@ CORRUPT_LIST_ADD list_add corruption CORRUPT_LIST_DEL list_del corruption STACK_GUARD_PAGE_LEADING STACK_GUARD_PAGE_TRAILING -UNSET_SMEP CR4 bits went missing +UNSET_SMEP pinned CR4 bits changed: DOUBLE_FAULT CORRUPT_PAC UNALIGNED_LOAD_STORE_WRITE -- 2.30.2