morello atomic: Trim gcvalue from the spin loop of arithmetic atomics #2249

bsdjhb · 2024-11-15T16:25:16Z

Use a ptraddr_t as the input that can be assigned to the register
constraint as is done for RISC-V. This allows the compiler to either
hoist the gcvalue out of the loop, or to just use the x portion of the
relevant register.

Use a ptraddr_t as the input that can be assigned to the register constraint as is done for RISC-V. This allows the compiler to either hoist the gcvalue out of the loop, or to just use the x portion of the relevant register.

bsdjhb · 2024-11-16T17:46:54Z

sys/arm64/include/atomic.h

@@ -667,21 +667,19 @@ static __inline void							\
 atomic_##op##_##bar##ptr(volatile uintptr_t *p, uintptr_t val)		\
 {									\
 	uintptr_t previous;						\
-	ptraddr_t tmp1, tmp2;						\
+	ptraddr_t tmp;							\
 	int res;							\
 									\
 	__asm __volatile(						\
 		"1:"							\
 		"ld" #a "xr %0, [%4]\n"					\
 		"gcvalue %2, %0\n"					\


This could be eliminated if there was an equivalent to %wN to denote the X version of the C register as then we could use that as the second operand in the scvalue instruction below.

Security fixes: CTSRD-CHERI#2158 rpm: calculate huge header sizes correctly CTSRD-CHERI#2160 util: fix out of boundary access in mktemp functions CTSRD-CHERI#2168 uu: stop processing if lines are too long CTSRD-CHERI#2174 lzop: prevent integer overflow CTSRD-CHERI#2172 rar4: protect copy_from_lzss_window_to_unp() (CVE-2024-20696) CTSRD-CHERI#2175 unzip: unify EOF handling CTSRD-CHERI#2179 rar4: fix out of boundary access with large files CTSRD-CHERI#2203 rar4: fix OOB access with unicode filenames CTSRD-CHERI#2210 rar4: add boundary checks to rgb filter CTSRD-CHERI#2248 rar4: fix OOB in delta filter CTSRD-CHERI#2249 rar4: fix OOB in audio filter CTSRD-CHERI#2256 fix multiple vulnerabilities identified by SAST CTSRD-CHERI#2258 cpio: ignore out-of-range gid/uid/size/ino and harden AFIO parsing CTSRD-CHERI#2265 rar5: clear 'data ready' cache on window buffer reallocs CTSRD-CHERI#2269 rar4: fix CVE-2024-26256 (CVE-2024-26256) Important bugfixes: CTSRD-CHERI#2150 xar: fix another infinite loop and expat error handling CTSRD-CHERI#2173 shar: check strdup return value CTSRD-CHERI#2161 lha: fix integer truncation on 32-bit systems CTSRD-CHERI#2245 7zip: fix issue when skipping first file in 7zip archive that is a multiple of 65536 bytes CTSRD-CHERI#2259 rar5: don't try to read rediculously long names CTSRD-CHERI#2290 ar: fix archive entries having no type Obtained from: libarchive Vendor commit: 12ecf8418ab3595d66cdea1abadcea8b6a9d288b CVE: CVE-2024-20696, CVE-2024-26256

Libarchive 3.7.7 Security fixes: CTSRD-CHERI#2158 rpm: calculate huge header sizes correctly CTSRD-CHERI#2160 util: fix out of boundary access in mktemp functions CTSRD-CHERI#2168 uu: stop processing if lines are too long CTSRD-CHERI#2174 lzop: prevent integer overflow CTSRD-CHERI#2172 rar4: protect copy_from_lzss_window_to_unp() (CVE-2024-20696) CTSRD-CHERI#2175 unzip: unify EOF handling CTSRD-CHERI#2179 rar4: fix out of boundary access with large files CTSRD-CHERI#2203 rar4: fix OOB access with unicode filenames CTSRD-CHERI#2210 rar4: add boundary checks to rgb filter CTSRD-CHERI#2248 rar4: fix OOB in delta filter CTSRD-CHERI#2249 rar4: fix OOB in audio filter CTSRD-CHERI#2256 fix multiple vulnerabilities identified by SAST CTSRD-CHERI#2258 cpio: ignore out-of-range gid/uid/size/ino and harden AFIO parsing CTSRD-CHERI#2265 rar5: clear 'data ready' cache on window buffer reallocs CTSRD-CHERI#2269 rar4: fix CVE-2024-26256 (CVE-2024-26256) #2330 iso: be more cautious about parsing ISO-9660 timestamps #2343 tar: clean up linkpath between entries #2364 tar: don't crash on truncated tar archives #2366 gzip: prevent a hang when processing a malformed gzip inside a gzip #2377 tar: fix two leaks in tar header parsing Important bugfixes: CTSRD-CHERI#2096 rar5: report encrypted entries CTSRD-CHERI#2150 xar: fix another infinite loop and expat error handling CTSRD-CHERI#2173 shar: check strdup return value CTSRD-CHERI#2161 lha: fix integer truncation on 32-bit systems #2338 tar: fix memory leaks when processing symlinks or parsing pax headers CTSRD-CHERI#2245 7zip: fix issue when skipping first file in 7zip archive that is a multiple of 65536 bytes CTSRD-CHERI#2252 7-zip: read/write symlink paths as UTF-8 CTSRD-CHERI#2259 rar5: don't try to read rediculously long names CTSRD-CHERI#2290 ar: fix archive entries having no type #2360 tar: fix truncation of entry pathnames in specific archives CVE: CVE-2024-20696, CVE-2024-26256 PR: 282047 (exp-run) MFC after: 1 week

bsdjhb requested a review from jrtc27 November 15, 2024 16:25

bsdjhb commented Nov 16, 2024

View reviewed changes

jrtc27 approved these changes Nov 20, 2024

View reviewed changes

bsdjhb merged commit 1237cbe into CTSRD-CHERI:dev Dec 3, 2024
29 checks passed

bsdjhb deleted the morello_atomic branch December 3, 2024 15:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

morello atomic: Trim gcvalue from the spin loop of arithmetic atomics #2249

morello atomic: Trim gcvalue from the spin loop of arithmetic atomics #2249

bsdjhb commented Nov 15, 2024

bsdjhb Nov 16, 2024

morello atomic: Trim gcvalue from the spin loop of arithmetic atomics #2249

morello atomic: Trim gcvalue from the spin loop of arithmetic atomics #2249

Conversation

bsdjhb commented Nov 15, 2024

bsdjhb Nov 16, 2024

Choose a reason for hiding this comment