diff mbox series

[5.10,45/76] parisc: Fix mask used to select futex spinlock

Message ID	20211227151326.269594782@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, John David Anglin <dave.anglin@bell.net>, Helge Deller <deller@gmx.de> Subject: [PATCH 5.10 45/76] parisc: Fix mask used to select futex spinlock Date: Mon, 27 Dec 2021 16:31:00 +0100 Message-Id: <20211227151326.269594782@linuxfoundation.org> In-Reply-To: <20211227151324.694661623@linuxfoundation.org> References: <20211227151324.694661623@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,02/76] arm64: vdso32: require CROSS_COMPILE_COMPAT for gcc+bfd [5.10,03/76] net: usb: lan78xx: add Allied Telesis AT29M2-AF [5.10,04/76] ext4: prevent partial update of the extent blocks [5.10,05/76] ext4: check for out-of-order index extents in ext4_valid_extent_entries() [5.10,06/76] ext4: check for inconsistent extents between index and leaf block [5.10,07/76] HID: holtek: fix mouse probing [5.10,08/76] HID: potential dereference of null pointer [5.10,09/76] arm64: dts: allwinner: orangepi-zero-plus: fix PHY mode [5.10,10/76] spi: change clk_disable_unprepare to clk_unprepare [5.10,11/76] ASoC: meson: aiu: fifo: Add missing dma_coerce_mask_and_coherent() [5.10,12/76] IB/qib: Fix memory leak in qib_user_sdma_queue_pkts() [5.10,13/76] RDMA/hns: Replace kfree() with kvfree() [5.10,14/76] netfilter: fix regression in looped (broad\|multi)casts MAC handling [5.10,15/76] ARM: dts: imx6qdl-wandboard: Fix Ethernet support [5.10,16/76] net: marvell: prestera: fix incorrect return of port_find [5.10,17/76] qlcnic: potential dereference null pointer of rx_queue->page_ring [5.10,18/76] net: accept UFOv6 packages in virtio_net_hdr_to_skb [5.10,19/76] net: skip virtio_net_hdr_set_proto if protocol already set [5.10,20/76] igb: fix deadlock caused by taking RTNL in RPM resume path [5.10,21/76] ipmi: Fix UAF when uninstall ipmi_si and ipmi_msghandler module [5.10,22/76] bonding: fix ad_actor_system option setting to default [5.10,23/76] fjes: Check for error irq [5.10,24/76] drivers: net: smc911x: Check for error irq [5.10,25/76] net: ks8851: Check for error irq [5.10,26/76] sfc: Check null pointer of rx_queue->page_ring [5.10,27/76] sfc: falcon: Check null pointer of rx_queue->page_ring [5.10,28/76] Input: elantech - fix stack out of bound access in elantech_change_report_id() [5.10,29/76] pinctrl: bcm2835: Change init order for gpio hogs [5.10,30/76] hwmon: (lm90) Fix usage of CONFIG2 register in detect function [5.10,31/76] hwmon: (lm90) Add basic support for TI TMP461 [5.10,32/76] hwmon: (lm90) Introduce flag indicating extended temperature support [5.10,33/76] hwmon: (lm90) Drop critical attribute support for MAX6654 [5.10,34/76] ALSA: jack: Check the return value of kstrdup() [5.10,35/76] ALSA: drivers: opl3: Fix incorrect use of vp->state [5.10,36/76] ALSA: hda/realtek: Amp init fixup for HP ZBook 15 G6 [5.10,37/76] ALSA: hda/realtek: Add new alc285-hp-amp-init model [5.10,38/76] ALSA: hda/realtek: Fix quirk for Clevo NJ51CU [5.10,39/76] ASoC: meson: aiu: Move AIU_I2S_MISC hold setting to aiu-fifo-i2s [5.10,40/76] Input: atmel_mxt_ts - fix double free in mxt_read_info_block [5.10,41/76] ipmi: bail out if init_srcu_struct fails [5.10,42/76] ipmi: ssif: initialize ssif_info->client early [5.10,43/76] ipmi: fix initialization when workqueue allocation fails [5.10,44/76] parisc: Correct completer in lws start [5.10,45/76] parisc: Fix mask used to select futex spinlock [5.10,46/76] tee: handle lookup of shm with reference count 0 [5.10,47/76] x86/pkey: Fix undefined behaviour with PKRU_WD_BIT [5.10,48/76] platform/x86: intel_pmc_core: fix memleak on registration failure [5.10,49/76] KVM: VMX: Wake vCPU when delivering posted IRQ even if vCPU == this vCPU [5.10,50/76] pinctrl: stm32: consider the GPIO offset to expose all the GPIO lines [5.10,51/76] gpio: dln2: Fix interrupts when replugging the device [5.10,52/76] mmc: sdhci-tegra: Fix switch to HS400ES mode [5.10,53/76] mmc: meson-mx-sdhc: Set MANUAL_STOP for multi-block SDIO commands [5.10,54/76] mmc: core: Disable card detect during shutdown [5.10,55/76] mmc: mmci: stm32: clear DLYB_CR after sending tuning command [5.10,56/76] ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling [5.10,57/76] mac80211: fix locking in ieee80211_start_ap error path [5.10,58/76] mm/hwpoison: clear MF_COUNT_INCREASED before retrying get_any_page() [5.10,59/76] tee: optee: Fix incorrect page free bug [5.10,60/76] f2fs: fix to do sanity check on last xattr entry in __f2fs_setxattr() [5.10,61/76] ceph: fix up non-directory creation in SGID directories [5.10,62/76] usb: gadget: u_ether: fix race in setting MAC address in setup phase [5.10,63/76] KVM: VMX: Fix stale docs for kvm-intel.emulate_invalid_guest_state [5.10,64/76] mm: mempolicy: fix THP allocations escaping mempolicy restrictions [5.10,65/76] Input: elants_i2c - do not check Remark ID on eKTH3900/eKTH5312 [5.10,66/76] Input: i8042 - enable deferred probe quirk for ASUS UM325UA [5.10,67/76] Input: goodix - add id->model mapping for the "9111" model [5.10,68/76] ASoC: tas2770: Fix setting of high sample rates [5.10,69/76] ASoC: rt5682: fix the wrong jack type detected [5.10,70/76] pinctrl: mediatek: fix global-out-of-bounds issue [5.10,71/76] hwmom: (lm90) Fix citical alarm status for MAX6680/MAX6681 [5.10,72/76] hwmon: (lm90) Do not report busy status bit as alarm [5.10,73/76] ax25: NPD bug when detaching AX25 device [5.10,74/76] hamradio: defer ax25 kfree after unregister_netdev [5.10,75/76] hamradio: improve the incomplete fix to avoid NPD [5.10,76/76] phonet/pep: refuse to enable an unbound pipe

Commit Message

Greg KH Dec. 27, 2021, 3:31 p.m. UTC

From: John David Anglin <dave.anglin@bell.net>

commit d3a5a68cff47f6eead84504c3c28376b85053242 upstream.

The address bits used to select the futex spinlock need to match those used in
the LWS code in syscall.S. The mask 0x3f8 only selects 7 bits.  It should
select 8 bits.

This change fixes the glibc nptl/tst-cond24 and nptl/tst-cond25 tests.

Signed-off-by: John David Anglin <dave.anglin@bell.net>
Fixes: 53a42b6324b8 ("parisc: Switch to more fine grained lws locks")
Cc: stable@vger.kernel.org # 5.10+
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 arch/parisc/include/asm/futex.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

--- a/arch/parisc/include/asm/futex.h
+++ b/arch/parisc/include/asm/futex.h
@@ -16,7 +16,7 @@  static inline void
 _futex_spin_lock_irqsave(u32 __user *uaddr, unsigned long int *flags)
 {
 	extern u32 lws_lock_start[];
-	long index = ((long)uaddr & 0x3f8) >> 1;
+	long index = ((long)uaddr & 0x7f8) >> 1;
 	arch_spinlock_t *s = (arch_spinlock_t *)&lws_lock_start[index];
 	local_irq_save(*flags);
 	arch_spin_lock(s);
@@ -26,7 +26,7 @@  static inline void
 _futex_spin_unlock_irqrestore(u32 __user *uaddr, unsigned long int *flags)
 {
 	extern u32 lws_lock_start[];
-	long index = ((long)uaddr & 0x3f8) >> 1;
+	long index = ((long)uaddr & 0x7f8) >> 1;
 	arch_spinlock_t *s = (arch_spinlock_t *)&lws_lock_start[index];
 	arch_spin_unlock(s);
 	local_irq_restore(*flags);