AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-08 14:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

unistd: Avoid PLT entries with _FORTIFY_SOURCE

Browse Source 
The change is meant to avoid unwanted PLT entries for the read_chk,
getdomainname_chk and getlogin_r_chk routines when _FORTIFY_SOURCE is set.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Frédéric Bérat 2023-06-07 11:34:36 +02:00
parent 391f5e9619
commit b17d65ff92
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debug/getdomainname_chk.c
View File

@ -26,3 +26,4 @@ __getdomainname_chk (char *buf, size_t buflen, size_t nreal)
return getdomainname (buf, buflen); return getdomainname (buf, buflen);
} }
libc_hidden_def (__getdomainname_chk)

1
debug/read_chk.c
View File

@ -25,3 +25,4 @@ __read_chk (int fd, void *buf, size_t nbytes, size_t buflen)
return __read (fd, buf, nbytes); return __read (fd, buf, nbytes);
} }
libc_hidden_def (__read_chk)

4
include/unistd.h
View File

@ -32,6 +32,10 @@ libc_hidden_proto (readlinkat)
libc_hidden_proto (fsync) libc_hidden_proto (fsync)
libc_hidden_proto (fdatasync) libc_hidden_proto (fdatasync)
libc_hidden_proto (__read_chk)
libc_hidden_proto (__getdomainname_chk)
libc_hidden_proto (__getlogin_r_chk)
/* Now define the internal interfaces. */ /* Now define the internal interfaces. */
extern int __access (const char *__name, int __type); extern int __access (const char *__name, int __type);
libc_hidden_proto (__access) libc_hidden_proto (__access)

1
login/getlogin_r_chk.c
View File

@ -26,3 +26,4 @@ __getlogin_r_chk (char *buf, size_t buflen, size_t nreal)
return getlogin_r (buf, buflen); return getlogin_r (buf, buflen);
} }
libc_hidden_def (__getlogin_r_chk)

6
posix/bits/unistd-decl.h
View File

@ -26,7 +26,7 @@
extern ssize_t __read_chk (int __fd, void *__buf, size_t __nbytes, extern ssize_t __read_chk (int __fd, void *__buf, size_t __nbytes,
size_t __buflen) size_t __buflen)
__wur __attr_access ((__write_only__, 2, 3)); __wur __attr_access ((__write_only__, 2, 3));
extern ssize_t __REDIRECT (__read_alias, (int __fd, void *__buf, extern ssize_t __REDIRECT_FORTIFY (__read_alias, (int __fd, void *__buf,
size_t __nbytes), read) size_t __nbytes), read)
__wur __attr_access ((__write_only__, 2, 3)); __wur __attr_access ((__write_only__, 2, 3));
extern ssize_t __REDIRECT (__read_chk_warn, extern ssize_t __REDIRECT (__read_chk_warn,
@ -157,7 +157,7 @@ extern int __REDIRECT_NTH (__ttyname_r_chk_warn,
#ifdef __USE_POSIX199506 #ifdef __USE_POSIX199506
extern int __getlogin_r_chk (char *__buf, size_t __buflen, size_t __nreal) extern int __getlogin_r_chk (char *__buf, size_t __buflen, size_t __nreal)
__nonnull ((1)) __attr_access ((__write_only__, 1, 2)); __nonnull ((1)) __attr_access ((__write_only__, 1, 2));
extern int __REDIRECT (__getlogin_r_alias, (char *__buf, size_t __buflen), extern int __REDIRECT_FORTIFY (__getlogin_r_alias, (char *__buf, size_t __buflen),
getlogin_r) __nonnull ((1)); getlogin_r) __nonnull ((1));
extern int __REDIRECT (__getlogin_r_chk_warn, extern int __REDIRECT (__getlogin_r_chk_warn,
(char *__buf, size_t __buflen, size_t __nreal), (char *__buf, size_t __buflen, size_t __nreal),
@ -184,7 +184,7 @@ extern int __REDIRECT_NTH (__gethostname_chk_warn,
#if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_UNIX98) #if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_UNIX98)
extern int __getdomainname_chk (char *__buf, size_t __buflen, size_t __nreal) extern int __getdomainname_chk (char *__buf, size_t __buflen, size_t __nreal)
__THROW __nonnull ((1)) __wur __attr_access ((__write_only__, 1, 2)); __THROW __nonnull ((1)) __wur __attr_access ((__write_only__, 1, 2));
extern int __REDIRECT_NTH (__getdomainname_alias, (char *__buf, extern int __REDIRECT_FORTIFY_NTH (__getdomainname_alias, (char *__buf,
size_t __buflen), size_t __buflen),
getdomainname) __nonnull ((1)) getdomainname) __nonnull ((1))
__wur __attr_access ((__write_only__, 1, 2)); __wur __attr_access ((__write_only__, 1, 2));