Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp634965pxv; Thu, 15 Jul 2021 12:05:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPtL8uJNSgeqO3NElgvzRkNt+7OrbyzEOs0pP4TJWShof4nLwhfB0TkrHuwbNbMSBIaCdz X-Received: by 2002:a92:c0ca:: with SMTP id t10mr3835357ilf.241.1626375900051; Thu, 15 Jul 2021 12:05:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626375900; cv=none; d=google.com; s=arc-20160816; b=BdLtqRTCIhj0cwPfJuVjUd/u5161tB/YtB+dxaG1bPuA8AJZu5tFGh7s3eT3y5PHdj WtRBB8bhiUrVc7OgWdILvqwKT7QF7kE3wGY3f+3NnEa+q4+lYgRsmzQg9DyGzN8QEz11 0udsnQg90XtJSHXYsHogEFCpVpsR0dhgqGwDS9C98kXfsRCdII717ry8N4ZOVjWT+UQ/ Q1X+SIYPC2aTzwPAWE+iY/5+Nv8tPgkDpryO1xKGt0PbluqqOLbIOymwYhYrJMUEO2eu eeXyldIy/zkCivmD1rLSKUahczAHgk3aSEmAudpdDGxUJ9O6Yj0obH7KadHM+DCrhkc4 XSPg== 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=OQLCQSsC0cSCUADbp+xCI8O6HH+4CqQUKN97pTQj4MxQysTi6uFvT4I2S0rm/ChUF7 7ti/In+v8iT7Qb8rdGz+SmYaJ2rXmtvpTh0GZLvTQJS6+OjC/xcBG0riaiuMcm4uRIOn T3kD+2ZCbZGIoM4scCpkO+suL+vQ+vjWx8s3Uylnh4gXcl2PH8ABuebS6X3dl0RKJqh4 HLuxAnjJqddGo6XXpaOUTOrEa+hrcARMHdpJ7wkYEeR60nJDL+kmTiYsJxPWNIAMlLeP WyBmD2ybvvVp5rkFJQZ0C9UMNWIQxSlEGdNM+5kzlywoD+p1Ybf6zDGIVbR5y+Q3W+S1 M9Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oBsOsOuW; 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 h12si7747351ilc.40.2021.07.15.12.04.47; Thu, 15 Jul 2021 12:05:00 -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=oBsOsOuW; 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 S242682AbhGOTFY (ORCPT + 99 others); Thu, 15 Jul 2021 15:05:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:60204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241428AbhGOSzm (ORCPT ); Thu, 15 Jul 2021 14:55:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E8BA6613CA; Thu, 15 Jul 2021 18:52:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626375167; bh=sxeWXK9/YKizUNdUotgqt9AIZTxWnYMASNYAdk3TRhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oBsOsOuW2XmQ1/VxAusUds/XobxwGh3Ucz58zzYH4uvdR+mVQ8VGdDb+uovXFRh4N zqpYcjaBV9VOwXoillv8+HFkfjSEB+HM8yFvwBIp3iVfTlvJ8i2VYf1AtKMjj1Hgdg TIQ/20B0Q3Dr3SB9CIiMg2B6Bit1xYmAnpOMv3yM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kees Cook Subject: [PATCH 5.10 186/215] selftests/lkdtm: Fix expected text for CR4 pinning Date: Thu, 15 Jul 2021 20:39:18 +0200 Message-Id: <20210715182632.130526073@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182558.381078833@linuxfoundation.org> References: <20210715182558.381078833@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