Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp660388pxv; Thu, 15 Jul 2021 12:46:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxL/oCBREHIwZwYWd0kJSFz9PoFPanue9UJm5MugqzgskPd+CXdMSKh5H4lInBKdpj/yKFN X-Received: by 2002:a05:6402:781:: with SMTP id d1mr9552016edy.32.1626378369186; Thu, 15 Jul 2021 12:46:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626378369; cv=none; d=google.com; s=arc-20160816; b=Hj2Xu2hb2L4nAyBnAaUdzn435PuyH8DA2PcRD/rW+taxw8KTZrtjMRAbdTGZmVL4yb MaeK9Gzjg7opLcYX6+f0m9rrHN7F7rm6H0Kv3T7eea6tCqcfEu5ud6at5fQanyHom1a+ YsNvYY6eTZSx6XZq/NeJHD3QHYSwWzIutWXo43ZjqYyZEgfOLZMJ+pJUlyvH7A6gDO26 0ebYuKngphq92dw4xrVe5FrN0++qPqhbS0ubYGGFTeaoGRbtU139uM8pf5f4S/0OnZcP T8fGR+5sBLWSz459QzEI6V7V9DXsaAnrocmJpUwWPSrtbCpbFRd1W1y/lthMaTx90VAx 2raw== 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=GK/w1UbP5h2dDvzWLs8Ds6FT5oidy13rFWEELECszUbQYZxP8+3q167K8DhFDvifOA fpthr4GBS38QXDX98Jf5pxGmrWgRFlqRSN/EENcSbXFeA+fcOEpFzgxxQgy/LQlTLnPo Lfec3HmJXOi8bEGMbYUeyoDaHn09coM5s0yXThg63bufvMuXz/PV4piMKEIPmJbUFwQI wF99CwHLEOaMJg/q2jpKOIZNdVQMIQQJciuD9YxaM2tfvvTQ2HDUeCAYIRC/kkJ4HY5A MmyWTIG5rOyEHvGGUhgCDG+pL8Ll8bx8iSC7JyN0vzu8+Vals3X6J/kvMPK06vkrwN38 uJbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=n87vHVpC; 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 d12si10023017ejj.130.2021.07.15.12.45.46; Thu, 15 Jul 2021 12:46:09 -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=n87vHVpC; 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 S1343650AbhGOTru (ORCPT + 99 others); Thu, 15 Jul 2021 15:47:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:51284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243965AbhGOTQN (ORCPT ); Thu, 15 Jul 2021 15:16:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 09C47613D0; Thu, 15 Jul 2021 19:12:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626376339; bh=sxeWXK9/YKizUNdUotgqt9AIZTxWnYMASNYAdk3TRhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n87vHVpCTzyZHJ6FMfSnNLvLKxMWU6XuYKXFalc5hFJpRSi0ENaleLjEPBhkRyjgx 1tEV7FJB2iQyUsZoFaWq18Dc8EIVYxTgi6ifUl2zX6cAysZEGqTggNnyaolpnp6JRi BrkJ6obD0pHCv9y2fWU77VPbFR2kF3fVE/WphaqM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kees Cook Subject: [PATCH 5.13 229/266] selftests/lkdtm: Fix expected text for CR4 pinning Date: Thu, 15 Jul 2021 20:39:44 +0200 Message-Id: <20210715182649.623039848@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182613.933608881@linuxfoundation.org> References: <20210715182613.933608881@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