Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1172304pxk; Fri, 25 Sep 2020 08:01:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNk5otzncCSPlYC2gpGhVC0kRzSl86uGhcyXcctZ5QJjrzJOTeAZWakx/Is36VXOOy6yqd X-Received: by 2002:a5d:4d51:: with SMTP id a17mr4957838wru.248.1601046085396; Fri, 25 Sep 2020 08:01:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601046085; cv=none; d=google.com; s=arc-20160816; b=ZUorB05xjRSsWufsCHd4mgfdChqGT+1raoJkWyRPLMj6sjmrrTezHrr/58jqco4/tF Rd/V4TWijQUfp7rgJMYJe/Lya92xwa3tHXxpZD8pD4rAqDDp1ULUXMODk2GDX8Ycqx4Y g37z7aehRE0LvucVZ03yHQgRnaCtt81M9yUMmQGa5mDb9Z8H2DxV0kXJWfWkXIUXsvuD AsSLJEjC9llXQa/wbS9x/j/91ZpOHtVfipEilXt7f46Pq7tJ6A3/87wlwhYs9GgZIL6z 3nzH3108TrbRrWhJ8sbtXn0A221W9swTy/pqlM2PiTNxeMyBOpXUyj6LwZg3zCUgnTHy kriw== 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=K9v4jO5cJ+kuFUcUXrFX1Kmepd/uqavv0DxFIqToK9eABy2Yo4p5YnYCdfH64FTWyU IqP5xSiXuYODziTIFV2ZZzR6phghBxi2TAnOMhTLMKnspCZxn5vH5mxBJzU1WhDLGFof 0oMyVMuhWzawxQxg4FfD1V+n5jRlVaKFjMhid78aprfwMn2KiHwiEeIV8W85fZhBS23l Vg5TsQZfvcn2si/Y9Hlbq932WT9LlyFQDrqqUJRN7SgiJyP/DChrWJJp0J3z7uHpSkLY r+nG4SCoptbyCVBpcPj2dr1SBS3FDwcHm40MVQxJLYkhPmLTfJewl+WKZ0DcJBYdLDRC nsEw== 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 d26si1930148edx.497.2020.09.25.08.01.01; Fri, 25 Sep 2020 08:01: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 S1729245AbgIYO6n (ORCPT + 99 others); Fri, 25 Sep 2020 10:58:43 -0400 Received: from mga07.intel.com ([134.134.136.100]:47916 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729137AbgIYO6Q (ORCPT ); Fri, 25 Sep 2020 10:58:16 -0400 IronPort-SDR: dm7XkAfT1Pn9f4iszUy1Ix5Eah89atcuw9Of7T5AoMYxcYBJGRA6i2ElaxLFim7K8Vspa4uXDq au40bdD998SA== X-IronPort-AV: E=McAfee;i="6000,8403,9755"; a="225704494" X-IronPort-AV: E=Sophos;i="5.77,302,1596524400"; d="scan'208";a="225704494" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2020 07:58:15 -0700 IronPort-SDR: /xYfSw8Dn/zExQtH9j5R+QYIsdZssY8Ygp2yq1GuThrHK2HC0qe9nJKAoN1NtCPf2HKXE/Q/e5 En2YMISETexA== X-IronPort-AV: E=Sophos;i="5.77,302,1596524400"; d="scan'208";a="512916979" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2020 07:58:14 -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 v13 6/8] x86/vdso/32: Add ENDBR32 to __kernel_vsyscall entry point Date: Fri, 25 Sep 2020 07:58:02 -0700 Message-Id: <20200925145804.5821-7-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200925145804.5821-1-yu-cheng.yu@intel.com> References: <20200925145804.5821-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