stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	patches@lists.linux.dev, Nathan Chancellor <nathan@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Nick Desaulniers <ndesaulniers@google.com>
Subject: [PATCH 6.1 01/25] x86/vdso: Conditionally export __vdso_sgx_enter_enclave()
Date: Mon, 19 Dec 2022 20:22:40 +0100	[thread overview]
Message-ID: <20221219182943.454694192@linuxfoundation.org> (raw)
In-Reply-To: <20221219182943.395169070@linuxfoundation.org>

From: Nathan Chancellor <nathan@kernel.org>

commit 45be2ad007a9c6bea70249c4cf3e4905afe4caeb upstream.

Recently, ld.lld moved from '--undefined-version' to
'--no-undefined-version' as the default, which breaks building the vDSO
when CONFIG_X86_SGX is not set:

  ld.lld: error: version script assignment of 'LINUX_2.6' to symbol '__vdso_sgx_enter_enclave' failed: symbol not defined

__vdso_sgx_enter_enclave is only included in the vDSO when
CONFIG_X86_SGX is set. Only export it if it will be present in the final
object, which clears up the error.

Fixes: 8466436952017 ("x86/vdso: Implement a vDSO for Intel SGX enclave call")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1756
Link: https://lore.kernel.org/r/20221109000306.1407357-1-nathan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 arch/x86/entry/vdso/vdso.lds.S |    2 ++
 1 file changed, 2 insertions(+)

--- a/arch/x86/entry/vdso/vdso.lds.S
+++ b/arch/x86/entry/vdso/vdso.lds.S
@@ -27,7 +27,9 @@ VERSION {
 		__vdso_time;
 		clock_getres;
 		__vdso_clock_getres;
+#ifdef CONFIG_X86_SGX
 		__vdso_sgx_enter_enclave;
+#endif
 	local: *;
 	};
 }



  reply	other threads:[~2022-12-19 19:24 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-19 19:22 [PATCH 6.1 00/25] 6.1.1-rc1 review Greg Kroah-Hartman
2022-12-19 19:22 ` Greg Kroah-Hartman [this message]
2022-12-19 19:22 ` [PATCH 6.1 02/25] libbpf: Fix uninitialized warning in btf_dump_dump_type_data Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 03/25] PCI: mt7621: Add sentinel to quirks table Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 04/25] mips: ralink: mt7621: define MT7621_SYSC_BASE with __iomem Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 05/25] mips: ralink: mt7621: soc queries and tests as functions Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 06/25] mips: ralink: mt7621: do not use kzalloc too early Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 07/25] irqchip/ls-extirq: Fix endianness detection Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 08/25] udf: Discard preallocation before extending file with a hole Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 09/25] udf: Fix preallocation discarding at indirect extent boundary Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 10/25] udf: Do not bother looking for prealloc extents if i_lenExtents matches i_size Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 11/25] udf: Fix extending file within last block Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 12/25] usb: gadget: uvc: Prevent buffer overflow in setup handler Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 13/25] USB: serial: option: add Quectel EM05-G modem Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 14/25] USB: serial: cp210x: add Kamstrup RF sniffer PIDs Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 15/25] USB: serial: f81232: fix division by zero on line-speed change Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 16/25] USB: serial: f81534: " Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 17/25] ALSA: hda/realtek: fix mute/micmute LEDs for a HP ProBook Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 18/25] xhci: Apply XHCI_RESET_TO_DEFAULT quirk to ADL-N Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 19/25] staging: r8188eu: fix led register settings Greg Kroah-Hartman
2022-12-19 19:22 ` [PATCH 6.1 20/25] igb: Initialize mailbox message for VF reset Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.1 21/25] usb: typec: ucsi: Resume in separate work Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.1 22/25] usb: dwc3: pci: Update PCIe device ID for USB3 controller on CPU sub-system for Raptor Lake Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.1 23/25] cifs: fix oops during encryption Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.1 24/25] KEYS: encrypted: fix key instantiation with user-provided data Greg Kroah-Hartman
2022-12-19 19:23 ` [PATCH 6.1 25/25] usb: ulpi: defer ulpi_register on ulpi_read_id timeout Greg Kroah-Hartman
2022-12-20  0:15 ` [PATCH 6.1 00/25] 6.1.1-rc1 review Shuah Khan
2022-12-20  0:21 ` Florian Fainelli
2022-12-20  4:45 ` Bagas Sanjaya
2022-12-20  7:41 ` Ron Economos
2022-12-20  9:20 ` Rudi Heitbaum
2022-12-20 10:51 ` Naresh Kamboju
2022-12-20 12:26 ` Sudip Mukherjee (Codethink)
2022-12-20 14:31   ` Sudip Mukherjee
2022-12-21 18:19     ` Greg Kroah-Hartman
2022-12-20 15:00 ` Guenter Roeck
2022-12-20 15:10   ` Greg Kroah-Hartman
2022-12-20 16:11     ` Guenter Roeck
2022-12-21  6:34       ` Jiri Slaby
2022-12-21 18:20         ` Greg Kroah-Hartman
2022-12-22  8:07         ` Thorsten Leemhuis
2022-12-21 16:12       ` Greg Kroah-Hartman
2022-12-20 18:57 ` Allen Pais
2022-12-21  1:13 ` Slade Watkins
2022-12-21 16:18 ` Justin Forbes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221219182943.454694192@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=nathan@kernel.org \
    --cc=ndesaulniers@google.com \
    --cc=patches@lists.linux.dev \
    --cc=stable@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).