stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Paul Burton <paulburton@kernel.org>,
	"Jason A. Donenfeld" <Jason@zx2c4.com>,
	Arnd Bergmann <arnd@arndb.de>,
	Christian Brauner <christian.brauner@canonical.com>,
	Vincenzo Frascino <vincenzo.frascino@arm.com>,
	linux-mips@vger.kernel.org
Subject: [PATCH 4.14 25/74] MIPS: Avoid VDSO ABI breakage due to global register variable
Date: Tue,  7 Jan 2020 21:54:50 +0100	[thread overview]
Message-ID: <20200107205155.093712308@linuxfoundation.org> (raw)
In-Reply-To: <20200107205135.369001641@linuxfoundation.org>

From: Paul Burton <paulburton@kernel.org>

commit bbcc5672b0063b0e9d65dc8787a4f09c3b5bb5cc upstream.

Declaring __current_thread_info as a global register variable has the
effect of preventing GCC from saving & restoring its value in cases
where the ABI would typically do so.

To quote GCC documentation:

> If the register is a call-saved register, call ABI is affected: the
> register will not be restored in function epilogue sequences after the
> variable has been assigned. Therefore, functions cannot safely return
> to callers that assume standard ABI.

When our position independent VDSO is built for the n32 or n64 ABIs all
functions it exposes should be preserving the value of $gp/$28 for their
caller, but in the presence of the __current_thread_info global register
variable GCC stops doing so & simply clobbers $gp/$28 when calculating
the address of the GOT.

In cases where the VDSO returns success this problem will typically be
masked by the caller in libc returning & restoring $gp/$28 itself, but
that is by no means guaranteed. In cases where the VDSO returns an error
libc will typically contain a fallback path which will now fail
(typically with a bad memory access) if it attempts anything which
relies upon the value of $gp/$28 - eg. accessing anything via the GOT.

One fix for this would be to move the declaration of
__current_thread_info inside the current_thread_info() function,
demoting it from global register variable to local register variable &
avoiding inadvertently creating a non-standard calling ABI for the VDSO.
Unfortunately this causes issues for clang, which doesn't support local
register variables as pointed out by commit fe92da0f355e ("MIPS: Changed
current_thread_info() to an equivalent supported by both clang and GCC")
which introduced the global register variable before we had a VDSO to
worry about.

Instead, fix this by continuing to use the global register variable for
the kernel proper but declare __current_thread_info as a simple extern
variable when building the VDSO. It should never be referenced, and will
cause a link error if it is. This resolves the calling convention issue
for the VDSO without having any impact upon the build of the kernel
itself for either clang or gcc.

Signed-off-by: Paul Burton <paulburton@kernel.org>
Fixes: ebb5e78cc634 ("MIPS: Initial implementation of a VDSO")
Reported-by: Jason A. Donenfeld <Jason@zx2c4.com>
Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com>
Tested-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Christian Brauner <christian.brauner@canonical.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: <stable@vger.kernel.org> # v4.4+
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/mips/include/asm/thread_info.h |   20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

--- a/arch/mips/include/asm/thread_info.h
+++ b/arch/mips/include/asm/thread_info.h
@@ -52,8 +52,26 @@ struct thread_info {
 #define init_thread_info	(init_thread_union.thread_info)
 #define init_stack		(init_thread_union.stack)
 
-/* How to get the thread information struct from C.  */
+/*
+ * A pointer to the struct thread_info for the currently executing thread is
+ * held in register $28/$gp.
+ *
+ * We declare __current_thread_info as a global register variable rather than a
+ * local register variable within current_thread_info() because clang doesn't
+ * support explicit local register variables.
+ *
+ * When building the VDSO we take care not to declare the global register
+ * variable because this causes GCC to not preserve the value of $28/$gp in
+ * functions that change its value (which is common in the PIC VDSO when
+ * accessing the GOT). Since the VDSO shouldn't be accessing
+ * __current_thread_info anyway we declare it extern in order to cause a link
+ * failure if it's referenced.
+ */
+#ifdef __VDSO__
+extern struct thread_info *__current_thread_info;
+#else
 register struct thread_info *__current_thread_info __asm__("$28");
+#endif
 
 static inline struct thread_info *current_thread_info(void)
 {



  parent reply	other threads:[~2020-01-07 21:14 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-07 20:54 [PATCH 4.14 00/74] 4.14.163-stable review Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 01/74] nvme_fc: add module to ops template to allow module references Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 02/74] iio: adc: max9611: Fix too short conversion time delay Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 03/74] PM / devfreq: Dont fail devfreq_dev_release if not in list Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 04/74] RDMA/cma: add missed unregister_pernet_subsys in init failure Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 05/74] rxe: correctly calculate iCRC for unaligned payloads Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 06/74] scsi: lpfc: Fix memory leak on lpfc_bsg_write_ebuf_set func Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 07/74] scsi: qla2xxx: Dont call qlt_async_event twice Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 08/74] scsi: iscsi: qla4xxx: fix double free in probe Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 09/74] scsi: libsas: stop discovering if oob mode is disconnected Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 10/74] drm/nouveau: Move the declaration of struct nouveau_conn_atom up a bit Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 11/74] usb: gadget: fix wrong endpoint desc Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 12/74] net: make socket read/write_iter() honor IOCB_NOWAIT Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 13/74] md: raid1: check rdev before reference in raid1_sync_request func Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 14/74] s390/cpum_sf: Adjust sampling interval to avoid hitting sample limits Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 15/74] s390/cpum_sf: Avoid SBD overflow condition in irq handler Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 16/74] IB/mlx4: Follow mirror sequence of device add during device removal Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 17/74] xen-blkback: prevent premature module unload Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 18/74] xen/balloon: fix ballooned page accounting without hotplug enabled Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 19/74] PM / hibernate: memory_bm_find_bit(): Tighten node optimisation Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 20/74] xfs: fix mount failure crash on invalid iclog memory access Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 21/74] taskstats: fix data-race Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 22/74] drm: limit to INT_MAX in create_blob ioctl Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 23/74] ALSA: ice1724: Fix sleep-in-atomic in Infrasonic Quartet support code Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 24/74] drm/sun4i: hdmi: Remove duplicate cleanup calls Greg Kroah-Hartman
2020-01-07 20:54 ` Greg Kroah-Hartman [this message]
2020-01-07 20:54 ` [PATCH 4.14 26/74] media: pulse8-cec: fix lost cec_transmit_attempt_done() call Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 27/74] media: cec: CEC 2.0-only bcast messages were ignored Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 28/74] media: cec: avoid decrementing transmit_queue_sz if it is 0 Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 29/74] mm/zsmalloc.c: fix the migrated zspage statistics Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 30/74] memcg: account security cred as well to kmemcg Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 31/74] pstore/ram: Write new dumps to start of recycled zones Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 32/74] locks: print unsigned ino in /proc/locks Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 33/74] dmaengine: Fix access to uninitialized dma_slave_caps Greg Kroah-Hartman
2020-01-07 20:54 ` [PATCH 4.14 34/74] compat_ioctl: block: handle Persistent Reservations Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 35/74] compat_ioctl: block: handle BLKREPORTZONE/BLKRESETZONE Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 36/74] ata: libahci_platform: Export again ahci_platform_<en/dis>able_phys() Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 37/74] ata: ahci_brcm: Allow optional reset controller to be used Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 38/74] ata: ahci_brcm: Fix AHCI resources management Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 39/74] gpiolib: fix up emulated open drain outputs Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 40/74] tracing: Fix lock inversion in trace_event_enable_tgid_record() Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 41/74] tracing: Have the histogram compare functions convert to u64 first Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 42/74] ALSA: cs4236: fix error return comparison of an unsigned integer Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 43/74] ALSA: firewire-motu: Correct a typo in the clock proc string Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 44/74] exit: panic before exit_mm() on global init exit Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 45/74] ftrace: Avoid potential division by zero in function profiler Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 46/74] arm64: Revert support for execute-only user mappings Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 47/74] PM / devfreq: Check NULL governor in available_governors_show Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 48/74] nfsd4: fix up replay_matches_cache() Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 49/74] scsi: qla2xxx: Drop superfluous INIT_WORK of del_work Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 50/74] xfs: dont check for AG deadlock for realtime files in bunmapi Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 51/74] platform/x86: pmc_atom: Add Siemens CONNECT X300 to critclk_systems DMI table Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 52/74] Bluetooth: btusb: fix PM leak in error case of setup Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 53/74] Bluetooth: delete a stray unlock Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 54/74] Bluetooth: Fix memory leak in hci_connect_le_scan Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 55/74] media: flexcop-usb: ensure -EIO is returned on error condition Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 56/74] regulator: ab8500: Remove AB8505 USB regulator Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 57/74] media: usb: fix memory leak in af9005_identify_state Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 58/74] dt-bindings: clock: renesas: rcar-usb2-clock-sel: Fix typo in example Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 59/74] tty: serial: msm_serial: Fix lockup for sysrq and oops Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 60/74] fix compat handling of FICLONERANGE, FIDEDUPERANGE and FS_IOC_FIEMAP Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 61/74] scsi: qedf: Do not retry ELS request if qedf_alloc_cmd fails Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 62/74] drm/mst: Fix MST sideband up-reply failure handling Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 63/74] powerpc/pseries/hvconsole: Fix stack overread via udbg Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 64/74] selftests: rtnetlink: add addresses with fixed life time Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 65/74] coresight: tmc-etf: Do not call smp_processor_id from preemptible Greg Kroah-Hartman
2020-01-07 23:08   ` Nathan Chancellor
2020-01-08  6:51     ` Greg Kroah-Hartman
2020-01-08  9:28     ` Suzuki Kuruppassery Poulose
2020-01-07 20:55 ` [PATCH 4.14 66/74] coresight: etb10: " Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 67/74] rxrpc: Fix possible NULL pointer access in ICMP handling Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 68/74] ath9k_htc: Modify byte order for an error message Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 69/74] ath9k_htc: Discard undersized packets Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 70/74] arm64: dts: meson: odroid-c2: Disable usb_otg bus to avoid power failed warning Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 71/74] net: add annotations on hh->hh_len lockless accesses Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 72/74] s390/smp: fix physical to logical CPU map for SMT Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 73/74] xen/blkback: Avoid unmapping unmapped grant pages Greg Kroah-Hartman
2020-01-07 20:55 ` [PATCH 4.14 74/74] perf/x86/intel/bts: Fix the use of page_private() Greg Kroah-Hartman
2020-01-08  2:44 ` [PATCH 4.14 00/74] 4.14.163-stable review shuah
2020-01-08 15:43 ` Guenter Roeck
2020-01-08 16:22 ` Jon Hunter
2020-01-08 16:36 ` Naresh Kamboju

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=20200107205155.093712308@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=Jason@zx2c4.com \
    --cc=arnd@arndb.de \
    --cc=christian.brauner@canonical.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=paulburton@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=vincenzo.frascino@arm.com \
    /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).