mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 08:11:08 +00:00
75dafa2f32
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.
157 lines
4.5 KiB
C
157 lines
4.5 KiB
C
/* Copyright (C) 2004-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _STRING_H
|
|
# error "Never use <bits/string3.h> directly; include <string.h> instead."
|
|
#endif
|
|
|
|
#if !__GNUC_PREREQ (5,0)
|
|
__warndecl (__warn_memset_zero_len,
|
|
"memset used with constant zero length parameter; this could be due to transposed parameters");
|
|
#endif
|
|
|
|
#ifndef __cplusplus
|
|
/* XXX This is temporarily. We should not redefine any of the symbols
|
|
and instead integrate the error checking into the original
|
|
definitions. */
|
|
# undef memcpy
|
|
# undef memmove
|
|
# undef memset
|
|
# undef strcat
|
|
# undef strcpy
|
|
# undef strncat
|
|
# undef strncpy
|
|
# ifdef __USE_GNU
|
|
# undef mempcpy
|
|
# undef stpcpy
|
|
# endif
|
|
# ifdef __USE_MISC
|
|
# undef bcopy
|
|
# undef bzero
|
|
# endif
|
|
#endif
|
|
|
|
|
|
__fortify_function void *
|
|
__NTH (memcpy (void *__restrict __dest, const void *__restrict __src,
|
|
size_t __len))
|
|
{
|
|
return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest));
|
|
}
|
|
|
|
__fortify_function void *
|
|
__NTH (memmove (void *__dest, const void *__src, size_t __len))
|
|
{
|
|
return __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
|
|
}
|
|
|
|
#ifdef __USE_GNU
|
|
__fortify_function void *
|
|
__NTH (mempcpy (void *__restrict __dest, const void *__restrict __src,
|
|
size_t __len))
|
|
{
|
|
return __builtin___mempcpy_chk (__dest, __src, __len, __bos0 (__dest));
|
|
}
|
|
#endif
|
|
|
|
|
|
/* The first two tests here help to catch a somewhat common problem
|
|
where the second and third parameter are transposed. This is
|
|
especially problematic if the intended fill value is zero. In this
|
|
case no work is done at all. We detect these problems by referring
|
|
non-existing functions. */
|
|
__fortify_function void *
|
|
__NTH (memset (void *__dest, int __ch, size_t __len))
|
|
{
|
|
/* GCC-5.0 and newer implements these checks in the compiler, so we don't
|
|
need them here. */
|
|
#if !__GNUC_PREREQ (5,0)
|
|
if (__builtin_constant_p (__len) && __len == 0
|
|
&& (!__builtin_constant_p (__ch) || __ch != 0))
|
|
{
|
|
__warn_memset_zero_len ();
|
|
return __dest;
|
|
}
|
|
#endif
|
|
return __builtin___memset_chk (__dest, __ch, __len, __bos0 (__dest));
|
|
}
|
|
|
|
#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 *
|
|
__NTH (strcpy (char *__restrict __dest, const char *__restrict __src))
|
|
{
|
|
return __builtin___strcpy_chk (__dest, __src, __bos (__dest));
|
|
}
|
|
|
|
#ifdef __USE_GNU
|
|
__fortify_function char *
|
|
__NTH (stpcpy (char *__restrict __dest, const char *__restrict __src))
|
|
{
|
|
return __builtin___stpcpy_chk (__dest, __src, __bos (__dest));
|
|
}
|
|
#endif
|
|
|
|
|
|
__fortify_function char *
|
|
__NTH (strncpy (char *__restrict __dest, const char *__restrict __src,
|
|
size_t __len))
|
|
{
|
|
return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
|
|
}
|
|
|
|
/* XXX We have no corresponding builtin yet. */
|
|
extern char *__stpncpy_chk (char *__dest, const char *__src, size_t __n,
|
|
size_t __destlen) __THROW;
|
|
extern char *__REDIRECT_NTH (__stpncpy_alias, (char *__dest, const char *__src,
|
|
size_t __n), stpncpy);
|
|
|
|
__fortify_function char *
|
|
__NTH (stpncpy (char *__dest, const char *__src, size_t __n))
|
|
{
|
|
if (__bos (__dest) != (size_t) -1
|
|
&& (!__builtin_constant_p (__n) || __n > __bos (__dest)))
|
|
return __stpncpy_chk (__dest, __src, __n, __bos (__dest));
|
|
return __stpncpy_alias (__dest, __src, __n);
|
|
}
|
|
|
|
|
|
__fortify_function char *
|
|
__NTH (strcat (char *__restrict __dest, const char *__restrict __src))
|
|
{
|
|
return __builtin___strcat_chk (__dest, __src, __bos (__dest));
|
|
}
|
|
|
|
|
|
__fortify_function char *
|
|
__NTH (strncat (char *__restrict __dest, const char *__restrict __src,
|
|
size_t __len))
|
|
{
|
|
return __builtin___strncat_chk (__dest, __src, __len, __bos (__dest));
|
|
}
|