668eaab0c7
* Fri Jul 22 2022 Arjun Shankar <arjun@redhat.com> - 2.34-40
- Sync with upstream branch release/2.34/master,
commit b2f32e746492615a6eb3e66fac1e766e32e8deb1:
- malloc: Simplify implementation of __malloc_assert
- Update syscall-names.list for Linux 5.18
- x86: Add missing IS_IN (libc) check to strncmp-sse4_2.S
- x86: Move mem{p}{mov|cpy}_{chk_}erms to its own file
- x86: Move and slightly improve memset_erms
- x86: Add definition for __wmemset_chk AVX2 RTM in ifunc impl list
- x86: Put wcs{n}len-sse4.1 in the sse4.1 text section
- x86: Align entry for memrchr to 64-bytes.
- x86: Add BMI1/BMI2 checks for ISA_V3 check
- x86: Cleanup bounds checking in large memcpy case
- x86: Add bounds `x86_non_temporal_threshold`
- x86: Add sse42 implementation to strcmp's ifunc
- x86: Fix misordered logic for setting `rep_movsb_stop_threshold`
- x86: Align varshift table to 32-bytes
- x86: ZERO_UPPER_VEC_REGISTERS_RETURN_XTEST expect no transactions
- x86: Shrink code size of memchr-evex.S
- x86: Shrink code size of memchr-avx2.S
- x86: Optimize memrchr-avx2.S
- x86: Optimize memrchr-evex.S
- x86: Optimize memrchr-sse2.S
- x86: Add COND_VZEROUPPER that can replace vzeroupper if no `ret`
- x86: Create header for VEC classes in x86 strings library
- x86_64: Add strstr function with 512-bit EVEX
- x86-64: Ignore r_addend for R_X86_64_GLOB_DAT/R_X86_64_JUMP_SLOT
- x86_64: Implement evex512 version of strlen, strnlen, wcslen and wcsnlen
- x86_64: Remove bzero optimization
- x86_64: Remove end of line trailing spaces
- nptl: Fix ___pthread_unregister_cancel_restore asynchronous restore
- linux: Fix mq_timereceive check for 32 bit fallback code (BZ 29304)
Resolves: #2109505
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
commit 4b246b2bbd1d5a77035bb990d6097b7337c34bbb
|
|
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
Date: Thu Jun 30 09:08:31 2022 -0300
|
|
|
|
linux: Fix mq_timereceive check for 32 bit fallback code (BZ 29304)
|
|
|
|
On success, mq_receive() and mq_timedreceive() return the number of
|
|
bytes in the received message, so it requires to check if the value
|
|
is larger than 0.
|
|
|
|
Checked on i686-linux-gnu.
|
|
|
|
(cherry picked from commit 71d87d85bf54f6522813aec97c19bdd24997341e)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/mq_timedreceive.c b/sysdeps/unix/sysv/linux/mq_timedreceive.c
|
|
index 7f3a112d7f2cbbe7..1fc98752e7d6d506 100644
|
|
--- a/sysdeps/unix/sysv/linux/mq_timedreceive.c
|
|
+++ b/sysdeps/unix/sysv/linux/mq_timedreceive.c
|
|
@@ -41,7 +41,7 @@ ___mq_timedreceive_time64 (mqd_t mqdes, char *__restrict msg_ptr, size_t msg_len
|
|
{
|
|
int r = SYSCALL_CANCEL (mq_timedreceive_time64, mqdes, msg_ptr, msg_len,
|
|
msg_prio, abs_timeout);
|
|
- if (r == 0 || errno != ENOSYS)
|
|
+ if (r >= 0 || errno != ENOSYS)
|
|
return r;
|
|
__set_errno (EOVERFLOW);
|
|
return -1;
|