rpms/glibc
6
0
Fork 2
Code Issues Pull Requests Releases Activity

import UBI glibc-2.34-168.el9_6.24

Browse Source
This commit is contained in:
eabdullin 2025-11-05 07:11:02 +00:00
parent cc2a2a379f
commit 1e4fd33b14
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
SOURCES/glibc-RHEL-114261.patch Normal file
View File

@ -0,0 +1,45 @@
commit 0fceed254559836b57ee05188deac649bc505d05
Author: Florian Weimer <fweimer@redhat.com>
Date: Fri Sep 12 21:33:34 2025 +0200
nss: Group merge does not react to ERANGE during merge (bug 33361)
The break statement in CHECK_MERGE is expected to exit the surrounding
while loop, not the do-while loop with in the macro. Remove the
do-while loop from the macro. It is not needed to turn the macro
expansion into a single statement due to the way CHECK_MERGE is used
(and the statement expression would cover this anyway).
Reviewed-by: Collin Funk <collin.funk1@gmail.com>
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
index c344528f72a2dcab..30f913876eb81594 100644
--- a/nss/getXXbyYY_r.c
+++ b/nss/getXXbyYY_r.c
@@ -158,19 +158,15 @@ __merge_einval (LOOKUP_TYPE *a,
#define CHECK_MERGE(err, status) \
({ \
- do \
+ if (err) \
{ \
- if (err) \
- { \
- __set_errno (err); \
- if (err == ERANGE) \
- status = NSS_STATUS_TRYAGAIN; \
- else \
- status = NSS_STATUS_UNAVAIL; \
- break; \
- } \
+ __set_errno (err); \
+ if (err == ERANGE) \
+ status = NSS_STATUS_TRYAGAIN; \
+ else \
+ status = NSS_STATUS_UNAVAIL; \
+ break; \
} \
- while (0); \
})
/* Type of the lookup function we need here. */

6
SPECS/glibc.spec
View File

@ -157,7 +157,7 @@ end \
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
Release: 168%{?dist}.23
Release: 168%{?dist}.24
# In general, GPLv2+ is used by programs, LGPLv2+ is used for
# libraries.
@ -1184,6 +1184,7 @@ Patch876: glibc-RHEL-95547-3.patch
Patch877: glibc-RHEL-104150.patch
Patch878: glibc-RHEL-105328.patch
Patch879: glibc-RHEL-106230.patch
Patch880: glibc-RHEL-114261.patch
##############################################################################
# Continued list of core "glibc" package information:
@ -3177,6 +3178,9 @@ update_gconv_modules_cache ()
%endif
%changelog
* Wed Oct 01 2025 Florian Weimer <fweimer@redhat.com> - 2.34-168.24
- nss: Group merge does not react to ERANGE during merge (RHEL-114261)
* Tue Jul 29 2025 Florian Weimer <fweimer@redhat.com> - 2.34-168.23
- Fix namespace pollution in inet_ntop with fortification (RHEL-106230)