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 ae4d44b1d5)
This commit is contained in:
Siddhesh Poyarekar 2024-09-03 14:58:33 -04:00 committed by Florian Weimer
parent f30501ca75
commit 370be85892
2 changed files with 3 additions and 1 deletions

2
NEWS
View File

@ -36,6 +36,7 @@ Security related changes:
The following bugs are resolved with this release: The following bugs are resolved with this release:
[27821] ungetc: Fix backup buffer leak on program exit
[29039] Corrupt DTV after reuse of a TLS module ID following dlclose with unused TLS [29039] Corrupt DTV after reuse of a TLS module ID following dlclose with unused TLS
[30081] resolv: Do not wait for non-existing second DNS response after error [30081] resolv: Do not wait for non-existing second DNS response after error
[30694] The iconv program no longer tells the user which given encoding name was wrong [30694] The iconv program no longer tells the user which given encoding name was wrong
@ -57,6 +58,7 @@ The following bugs are resolved with this release:
[31965] rseq extension mechanism does not work as intended [31965] rseq extension mechanism does not work as intended
[31968] mremap implementation in C does not handle arguments correctly [31968] mremap implementation in C does not handle arguments correctly
[32052] Name space violation in fortify wrappers [32052] Name space violation in fortify wrappers
[32137] libio: Attempt wide backup free only for non-legacy code
Version 2.38 Version 2.38

View File

@ -792,7 +792,7 @@ _IO_unbuffer_all (void)
/* Free up the backup area if it was ever allocated. */ /* Free up the backup area if it was ever allocated. */
if (_IO_have_backup (fp)) if (_IO_have_backup (fp))
_IO_free_backup_area (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); _IO_free_wbackup_area (fp);
if (! (fp->_flags & _IO_UNBUFFERED) if (! (fp->_flags & _IO_UNBUFFERED)