Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1468245pxj; Fri, 21 May 2021 15:21:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZ5+HM3/tnKDhjPF2sFHwl4CsLs9WBcpQUXetqxANmHbYG5IU8WkHzd3U90L/f54qMp/7j X-Received: by 2002:a17:906:1699:: with SMTP id s25mr12049277ejd.238.1621635662795; Fri, 21 May 2021 15:21:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621635662; cv=none; d=google.com; s=arc-20160816; b=RHdILdehwXVBPVCx/hNpM4fhQEhV8mKxiLIngmzuSiyvpe2xWHPfLJg3Gcga45lSCp C/CgCxE7WSdsZJJ7uTjeiXUwO7u5iKxfSAvRWp7xTg+lWVoZ2RxJjl9X4ei5ETvFyMTp hbFVYGMSEPdDAXf9pQOqTWW+ZzirfeIaXdLgwbPJ4DISL+U0SyG/vcIZIG6IxL3TsHx2 j87FNkbagOQJA+ab8cSAG2xUVj7T2T54YmUhdTqsc/ZxX2mvc3CrTDibhobnDMGHRpdJ 5sZ5F3VAj3Rtt+uUAQvttrQLMQ2D+0CcZh7iVLohy7+lAeJi7vcuhggMAvXAnJwlTkdM NCbQ== 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 :ironport-sdr:ironport-sdr; bh=xvIiIzOQ2N1hIjXhJ7bht6jjUIbYPhlJu5CrEhp3XVQ=; b=u+ZyPr+S/h8KYxoKMFomJ6NjTY4UcizRLzsuahQnzrXtqhSna1f7StZLig8gNIdpv1 BhirVSkjhfmpUYpHOgsoJ1ZT9AWnTu5n9Fs1L29bkctsVu7b2O+ZTqcfIf/+zm7x6div Nmh63LRQyQeJvV173o3keeXTjETtvUIkznuUedy6OU6xiDnjuGuVAlX3PEN3SM5+dzeZ jvpP5hGQAy0NECMyECdt8qkwGweG0SbpigxkIiLa5xsqOzl9bJu7PN3oueBpeTd4WtQl AyEDL1PaGKMYyLY8uHdVCy6DgsAaZq3TUSHRR8j+57PSXBj9HXeG0NJciW/Xor5HZ+72 E8Sw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u24si217430ejy.37.2021.05.21.15.20.40; Fri, 21 May 2021 15:21:02 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229951AbhEUWTO (ORCPT + 99 others); Fri, 21 May 2021 18:19:14 -0400 Received: from mga05.intel.com ([192.55.52.43]:55706 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230087AbhEUWSq (ORCPT ); Fri, 21 May 2021 18:18:46 -0400 IronPort-SDR: rKscn9/GLbdl0/u6Bzo4I11r0s5OpE/Oxs1Nm2Xg/KrJ2xfYCjDFL6L/L28jSwa7AWs9ThytMQ kNUSUPLqc5SA== X-IronPort-AV: E=McAfee;i="6200,9189,9991"; a="287124418" X-IronPort-AV: E=Sophos;i="5.82,319,1613462400"; d="scan'208";a="287124418" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2021 15:16:29 -0700 IronPort-SDR: 6FPLG67WGIJ/ad6OETWV3vSK1kPZaiCDZqfLQpIwDoAKgpkklqNQvjZbrJYMbl0gX+Lw/VaLQk 6TASBfqAQUMg== X-IronPort-AV: E=Sophos;i="5.82,319,1613462400"; d="scan'208";a="441269450" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2021 15:16:29 -0700 From: Yu-cheng Yu To: x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H.J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V. Shankar" , Vedvyas Shanbhogue , Dave Martin , Weijiang Yang , Pengfei Xu , Haitao Huang Cc: Yu-cheng Yu Subject: [PATCH v27 06/10] x86/cet/ibt: Update arch_prctl functions for Indirect Branch Tracking Date: Fri, 21 May 2021 15:15:27 -0700 Message-Id: <20210521221531.30168-7-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20210521221531.30168-1-yu-cheng.yu@intel.com> References: <20210521221531.30168-1-yu-cheng.yu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "H.J. Lu" Update ARCH_X86_CET_STATUS and ARCH_X86_CET_DISABLE for Indirect Branch Tracking. Signed-off-by: H.J. Lu Signed-off-by: Yu-cheng Yu Reviewed-by: Kees Cook --- arch/x86/kernel/cet_prctl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/kernel/cet_prctl.c b/arch/x86/kernel/cet_prctl.c index b426d200e070..bd3c80d402e7 100644 --- a/arch/x86/kernel/cet_prctl.c +++ b/arch/x86/kernel/cet_prctl.c @@ -22,6 +22,9 @@ static int cet_copy_status_to_user(struct thread_shstk *shstk, u64 __user *ubuf) buf[2] = shstk->size; } + if (shstk->ibt) + buf[0] |= GNU_PROPERTY_X86_FEATURE_1_IBT; + return copy_to_user(ubuf, buf, sizeof(buf)); } @@ -46,6 +49,8 @@ int prctl_cet(int option, u64 arg2) return -EINVAL; if (arg2 & GNU_PROPERTY_X86_FEATURE_1_SHSTK) shstk_disable(); + if (arg2 & GNU_PROPERTY_X86_FEATURE_1_IBT) + ibt_disable(); return 0; case ARCH_X86_CET_LOCK: -- 2.21.0