aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@sourceware.org>2024-09-03 14:58:33 -0400
committerAndreas K. Hüttel <dilfridge@gentoo.org>2024-10-03 11:53:14 +0200
commit48ec7c84fd4da02bcd29371644a6c490fe7865c6 (patch)
tree81892f04675de5574bfcc302bec540cd0afa757a
parentdebug: Fix read error handling in pcprofiledump (diff)
downloadglibc-48ec7c84fd4da02bcd29371644a6c490fe7865c6.tar.gz
glibc-48ec7c84fd4da02bcd29371644a6c490fe7865c6.tar.bz2
glibc-48ec7c84fd4da02bcd29371644a6c490fe7865c6.zip
libio: Attempt wide backup free only for non-legacy code
_wide_data and _mode are not available in legacy code, so do not attempt to free the wide backup buffer in legacy code. Resolves: BZ #32137 and BZ #27821 Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org> Reviewed-by: Florian Weimer <fweimer@redhat.com> (cherry picked from commit ae4d44b1d501421ad9a3af95279b8f4d1546f1ce) (cherry picked from commit 84f6bfce2c37e32b9888321fc3131ffbbe6deeba)
-rw-r--r--NEWS2
-rw-r--r--libio/genops.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 6079812505..8a8a92283f 100644
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,7 @@ The following CVEs were fixed in this release:
The following bugs are resolved with this release:
[19622] network: Support aliasing with struct sockaddr
+ [27821] ungetc: Fix backup buffer leak on program exit
[30081] resolv: Do not wait for non-existing second DNS response after error
[30701] time: getutxent misbehaves on 32-bit x86 when _TIME_BITS=64
[30994] REP MOVSB performance suffers from page aliasing on Zen 4
@@ -90,6 +91,7 @@ The following bugs are resolved with this release:
[31968] mremap implementation in C does not handle arguments correctly
[32026] strerror/strsignal TLS not handled correctly for secondary namespaces
[32052] Name space violation in fortify wrappers
+ [32137] libio: Attempt wide backup free only for non-legacy code
Version 2.39
diff --git a/libio/genops.c b/libio/genops.c
index bb1d9594eb..02292beed9 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -792,7 +792,7 @@ _IO_unbuffer_all (void)
/* Free up the backup area if it was ever allocated. */
if (_IO_have_backup (fp))
_IO_free_backup_area (fp);
- if (fp->_mode > 0 && _IO_have_wbackup (fp))
+ if (!legacy && fp->_mode > 0 && _IO_have_wbackup (fp))
_IO_free_wbackup_area (fp);
if (! (fp->_flags & _IO_UNBUFFERED)