Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp4072126pxu; Mon, 12 Oct 2020 08:47:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtVhd0xMvz1sb94WWRyy3jNLEoRdJ37Uo1QDvWQMlOiGCp3D7b5tLslm031orcsBapzKg8 X-Received: by 2002:a50:88c6:: with SMTP id d64mr15229963edd.141.1602517645632; Mon, 12 Oct 2020 08:47:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602517645; cv=none; d=google.com; s=arc-20160816; b=mAs5CSi/T6fmMnJwwns3LnFiEsqR2WhaiJ8WrsZqf5ez5pkoAPBiXyhyKujUyDqVuU tmhQE5FYsX2BUxC3+uoGeRdx1rZAlWE2kNQMH7KFqsDWHmGbxPYi244vUIm6HUhRrzK+ 96k6QzRwKbgS/comY+QOOWJ3REak9I2BLs1MzGZBHQQ5T3W8jgW8boFjeSoA0zThTFxq VCcbHeq7Z/YkPGfWnNDLKdC+iXF16OOUoiZ8zyAi8OLz5tqHd9nIRkPKRYYEf2yUW847 RnB1CotNlPRkjpYjVtgprM08Jo97tOO7Ff8veLi7dWxsrRx+U9ywKMDBdIcJJtTF7ua1 jT6w== 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=ZZtAzlbsUYaClW2Ll8RD2l6/93UubCtwT/nlVie/OsI=; b=DVNQMKeJq7fozMXTUXo7jyTU9DKtKO00SR8hLCYjiaU8WwJPCelCpF8aHTtVkFck3d XHPqPpWMfb1K570nzsrx8VcKQfT/G/XkGIsp/cl56aV7n9vZkNaylb0Ca/yxB0Vw6xNJ mjfmKf3xRIV/Pg1fhZ1J0qdRTGRrJJV3BeePUX23FyCCJ3pbpnn0+93yM3J3TEmDtftr sGhYmnI5Xmbx5YcB3EzyDAWGdB+cxfEdP2qOQnJpJbWkrLVNYgqcVSEOp6umOpdj4MTG G37OeE/d4yi6FlMu8ib3Xv5eunG5FBQCeJg6geL8Pt9Jv/X5PCYRXSnK55h+Fw5W2OFG k0mA== 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 v17si12478280eje.376.2020.10.12.08.47.02; Mon, 12 Oct 2020 08:47:25 -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 S2390464AbgJLPp5 (ORCPT + 99 others); Mon, 12 Oct 2020 11:45:57 -0400 Received: from mga07.intel.com ([134.134.136.100]:28365 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390385AbgJLPpy (ORCPT ); Mon, 12 Oct 2020 11:45:54 -0400 IronPort-SDR: JfgnEf0AJiwh5dJr7I934aMDVnxniAD13vf2MsQ9380uSuWgpXn6s9AS9+aML0pT+G9uXGHv4G 3MhPOO4AeUMA== X-IronPort-AV: E=McAfee;i="6000,8403,9772"; a="229939281" X-IronPort-AV: E=Sophos;i="5.77,367,1596524400"; d="scan'208";a="229939281" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Oct 2020 08:45:54 -0700 IronPort-SDR: 57ycsLhE56v+1hN2jfK4axGyzqj7oD2nP1WDNWa6/0kQZ3lFCB5rT+5Y7Qc46fyUgDb78OAXCX Ve22lnVXQ6eA== X-IronPort-AV: E=Sophos;i="5.77,367,1596524400"; d="scan'208";a="530012651" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Oct 2020 08:45:53 -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 Cc: Yu-cheng Yu Subject: [PATCH v14 6/7] x86/vdso/32: Add ENDBR32 to __kernel_vsyscall entry point Date: Mon, 12 Oct 2020 08:45:29 -0700 Message-Id: <20201012154530.28382-7-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201012154530.28382-1-yu-cheng.yu@intel.com> References: <20201012154530.28382-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" Add ENDBR32 to __kernel_vsyscall entry point. Signed-off-by: H.J. Lu Signed-off-by: Yu-cheng Yu Acked-by: Andy Lutomirski --- arch/x86/entry/vdso/vdso32/system_call.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/entry/vdso/vdso32/system_call.S b/arch/x86/entry/vdso/vdso32/system_call.S index de1fff7188aa..e331fcdebd95 100644 --- a/arch/x86/entry/vdso/vdso32/system_call.S +++ b/arch/x86/entry/vdso/vdso32/system_call.S @@ -14,6 +14,9 @@ ALIGN __kernel_vsyscall: CFI_STARTPROC +#ifdef CONFIG_X86_BRANCH_TRACKING_USER + endbr32 +#endif /* * Reshuffle regs so that all of any of the entry instructions * will preserve enough state. -- 2.21.0