Skip to contentSkip to conversation

Patch "MIPS: fix truncation in __cmpxchg_small for short values" has been added to the 4.20-stable tree

PATCH [email protected] 1 participant 1 message Mar 2, 2019

Subsystems (2)
lore
Share & tools
lore

[email protected]

author Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

MIPS: fix truncation in __cmpxchg_small for short values

to the 4.20-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mips-fix-truncation-in-__cmpxchg_small-for-short-values.patch
and it can be found in the queue-4.20 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From 94ee12b507db8b5876e31c9d6c9d84f556a4b49f Mon Sep 17 00:00:00 2001
From: Michael Clark <[email protected]>
Date: Mon, 11 Feb 2019 17:38:29 +1300
Subject: MIPS: fix truncation in __cmpxchg_small for short values

From: Michael Clark <[email protected]>

commit 94ee12b507db8b5876e31c9d6c9d84f556a4b49f upstream.

__cmpxchg_small erroneously uses u8 for load comparison which can be either char or short. This patch changes the local variable to u32 which is sufficiently sized, as the loaded value is already masked and shifted appropriately. Using an integer size avoids any unnecessary canonicalization from use of non native widths.

This patch is part of a series that adapts the MIPS small word atomics code for xchg and cmpxchg on short and char to RISC-V.

Cc RISC-V Patches <[email protected]>
Cc Linux RISC-V <[email protected]>
Cc Linux MIPS <[email protected]>

[[email protected]:
- Fix varialble typo per Jonas Gorski.
- Consolidate load variable with other declarations.]

Fixes 3ba7f44d2b19 ("MIPS: cmpxchg: Implement 1 byte & 2 byte cmpxchg()")
Cc [email protected] # v4.13+
---
 arch/mips/kernel/cmpxchg.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/mips/kernel/cmpxchg.c +1 -2
@@ -54,10 +54,9 @@ unsigned long __xchg_small(volatile void
 unsigned long __cmpxchg_small(volatile void *ptr, unsigned long old,
 			      unsigned long new, unsigned int size)
 {
-	u32 mask, old32, new32, load32;
+	u32 mask, old32, new32, load32, load;
 	volatile u32 *ptr32;
 	unsigned int shift;
-	u8 load;
 
 	/* Check that ptr is naturally aligned */
 	WARN_ON((unsigned long)ptr & (size - 1));

Patches currently in stable-queue which might be from [email protected] are

queue-4.20/mips-fix-truncation-in-__cmpxchg_small-for-short-values.patch

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv