AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move fortified explicit_bzero back to string3

Browse Source 
Commit 38765ab68f moved the bzero, bcopy, and explicit_bzero
fortified macros to a common header (strings_fortified.h).  However
the side effect is a fortified explicit_bzero is defined when including
only strings.h.

This patch moves back the fortified explicit_bzero definition to
strings3.h header.

Checked on x86_64-linux-gnu.

	* string/bits/strings_fortified.h (explicit_bzero): Move back to ..
	* string/bits/string3.h: ... here.
This commit is contained in:
Adhemerval Zanella 2017-01-06 11:05:27 -02:00
parent f68fcd95d3
commit 75dafa2f32
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2017-01-09 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* string/bits/strings_fortified.h (explicit_bzero): Move back to ..
* string/bits/string3.h: ... here.
2017-01-05 Joseph Myers <joseph@codesourcery.com>
[BZ #21028]

9
string/bits/string3.h
View File

@ -92,6 +92,15 @@ __NTH (memset (void *__dest, int __ch, size_t __len))
#ifdef __USE_MISC
# include <bits/strings_fortified.h>
void __explicit_bzero_chk (void *__dest, size_t __len, size_t __destlen)
__THROW __nonnull ((1));
__fortify_function void
__NTH (explicit_bzero (void *__dest, size_t __len))
{
__explicit_bzero_chk (__dest, __len, __bos0 (__dest));
}
#endif
__fortify_function char *

9
string/bits/strings_fortified.h
View File

@ -31,13 +31,4 @@ __NTH (bzero (void *__dest, size_t __len))
(void) __builtin___memset_chk (__dest, '\0', __len, __bos0 (__dest));
}
void __explicit_bzero_chk (void *__dest, size_t __len, size_t __destlen)
__THROW __nonnull ((1));
__fortify_function void
__NTH (explicit_bzero (void *__dest, size_t __len))
{
__explicit_bzero_chk (__dest, __len, __bos0 (__dest));
}
#endif