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

inet: Fix namespace pollution in fortification header (RHEL-106206)

Browse Source 
Resolves: RHEL-106206
This commit is contained in:
Arjun Shankar 2025-08-19 11:50:53 +02:00
parent 433a7d6f10
commit e54a9f817e
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
glibc-RHEL-106206.patch Normal file
View File

@ -0,0 +1,34 @@
commit 87afbd7a1ad9c1dd116921817fa97198171045db
Author: Sam James <sam@gentoo.org>
Date: Mon Jul 28 21:55:30 2025 +0100
inet-fortified: fix namespace violation (bug 33227)
We need to use __sz, not sz, as we do elsewhere.
Reviewed-by: Florian Weimer <fweimer@redhat.com>
diff --git a/inet/bits/inet-fortified.h b/inet/bits/inet-fortified.h
index 8420a4b7fb41086f..5d16b1f871c49e6f 100644
--- a/inet/bits/inet-fortified.h
+++ b/inet/bits/inet-fortified.h
@@ -38,15 +38,15 @@ __fortify_function int
__NTH (inet_pton (int __af, const char *__restrict __src,
void * __restrict __dst))
{
- size_t sz = 0;
+ size_t __sz = 0;
if (__af == AF_INET)
- sz = sizeof (struct in_addr);
+ __sz = sizeof (struct in_addr);
else if (__af == AF_INET6)
- sz = sizeof (struct in6_addr);
+ __sz = sizeof (struct in6_addr);
else
return __inet_pton_alias (__af, __src, __dst);
- return __glibc_fortify (inet_pton, sz, sizeof (char),
+ return __glibc_fortify (inet_pton, __sz, sizeof (char),
__glibc_objsize (__dst),
__af, __src, __dst);
};

6
glibc.spec
View File

@ -157,7 +157,7 @@ end \
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
Release: 228%{?dist}
Release: 229%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for
# libraries.
@ -1338,6 +1338,7 @@ Patch1022: glibc-RHEL-105965.patch
Patch1023: glibc-RHEL-108221.patch
Patch1024: glibc-RHEL-104852-1.patch
Patch1025: glibc-RHEL-104852-2.patch
Patch1026: glibc-RHEL-106206.patch
##############################################################################
# Continued list of core "glibc" package information:
@ -3425,6 +3426,9 @@ update_gconv_modules_cache ()
%endif
%changelog
* Tue Aug 19 2025 Arjun Shankar <arjun@redhat.com> - 2.34-229
- inet: Fix namespace pollution in fortification header (RHEL-106206)
* Mon Aug 11 2025 Florian Weimer <fweimer@redhat.com> - 2.34-228
- Handle load segment gaps in _dl_find_object (RHEL-104852)