Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp713275pxv; Thu, 15 Jul 2021 14:12:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLpJSNUCN8igZyjkWDbPmDYKoXtvuvD7a4rGJHg3hAANUR6NIAIR3uFUdb/I3GnJ7HSDw3 X-Received: by 2002:a17:906:4f05:: with SMTP id t5mr7677331eju.351.1626383532717; Thu, 15 Jul 2021 14:12:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626383532; cv=none; d=google.com; s=arc-20160816; b=AmcLkq70PZjmZFBIXWQzzIJHpR47b7GAVUkYigzYpsHX9CGrwpXY6rp4XiQkD56iRF AxZF7qnDRdIRDRcGKihzBHYb+rQqJZiC0V4zYYxMUnJ2Z4G0E+FL79P5CXTXYnRYdhlf cxa7vijlGUeOeQREkRtr5WsRLtz4MK1Cg4H4wegyvXNKliNurc4ZDajSV7dx998x4Y+V L1oTXVaRZyXNvOsiADfNn148Xmncdi5v9Bh/WlSezI7oZGwXemqsuaxBU+qHyoTpRPqb kPOQXsGEqn8PgZx4rhtI2CiFyVPr0hWkHmsbJndKizfsru3w8JNz8SC9blFxmu73y5iQ liEg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5vjvi4+pohV8p43ioNlQuLhxkTmJO5vxzL/EgjkJScQ=; b=nmm06qXEi06J+PqmZIL4GoE9E3zD/rFKqKIAEp5Iwh9tMjaUDByUSlthJF1G9u2wPR eT/hATc2WtCX5cw8/Hy7tH3/0akhs+Yvj6IJiov19FcSdzrJSJ8nzpxaT257W1HJmBCR l61fZX/UJDoRj5IO1kMkuseoYe5rKMRwYmBIyTMcQKD68AmlA3mBQ5XUoIkR+sEbnttm 9NKTmw9NcfEkzdKixYQzAf3rufxHRmA48MQpnHEgM8xxXywRtl8bFZtmu0SmleF432rF NqUTU0iDONc3wCCgNP7S4I/8c/FepL6RuMgl4eTwSoWmV2TJEZLrQFYPBiRp7+GbQPAU SF4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JqiE5DJa; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a9si8528148ejj.647.2021.07.15.14.11.49; Thu, 15 Jul 2021 14:12:12 -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=@linuxfoundation.org header.s=korg header.b=JqiE5DJa; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243396AbhGOTWx (ORCPT + 99 others); Thu, 15 Jul 2021 15:22:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:45628 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242617AbhGOTGU (ORCPT ); Thu, 15 Jul 2021 15:06:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 85A3E613E9; Thu, 15 Jul 2021 19:02:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626375755; bh=sxeWXK9/YKizUNdUotgqt9AIZTxWnYMASNYAdk3TRhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JqiE5DJalT1vpeoyEkXxn8yGXiUK6rATGz9YRi6+PkdxTz8Ep43sGBUkFlC0aBF0c 1gI3jYjur3e3+OEiuGkH37/OjCOMfhjnib19b8wETGLVK4It/l2f7w1B4NqX/oOXOo fTC688rD0lWP4p5bMqK3wakfCECQ6WtChSaqG0n4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kees Cook Subject: [PATCH 5.12 205/242] selftests/lkdtm: Fix expected text for CR4 pinning Date: Thu, 15 Jul 2021 20:39:27 +0200 Message-Id: <20210715182629.388078198@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182551.731989182@linuxfoundation.org> References: <20210715182551.731989182@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kees Cook commit c2eb472bbe25b3f360990f23b293b3fbadfa4bc0 upstream. 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 Link: https://lore.kernel.org/r/20210623203936.3151093-3-keescook@chromium.org Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/lkdtm/tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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