From c4c5fd41124f38a5afee02b8f604ddc21d3b199a Mon Sep 17 00:00:00 2001 From: jvoisin Date: Tue, 30 Dec 2025 11:32:19 +0100 Subject: Change __access into __fortify_access to fix potential conflicts --- include/unistd.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'include/unistd.h') diff --git a/include/unistd.h b/include/unistd.h index a6c2ed1..a2b3105 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -41,7 +41,7 @@ extern "C" { #undef ttyname_r #undef write -__access(write_only, 2, 3) +__fortify_access(write_only, 2, 3) _FORTIFY_FN(confstr) size_t confstr(int __n, char * _FORTIFY_POS0 __s, size_t __l) { size_t __b = __bos(__s, 0); @@ -52,7 +52,7 @@ _FORTIFY_FN(confstr) size_t confstr(int __n, char * _FORTIFY_POS0 __s, size_t __ return __r; } -__access(write_only, 1, 2) +__fortify_access(write_only, 1, 2) _FORTIFY_FN(getcwd) char *getcwd(char * _FORTIFY_POS0 __s, size_t __l) { size_t __b = __bos(__s, 0); @@ -64,7 +64,7 @@ _FORTIFY_FN(getcwd) char *getcwd(char * _FORTIFY_POS0 __s, size_t __l) #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #undef getdomainname -__access(write_only, 1, 2) +__fortify_access(write_only, 1, 2) _FORTIFY_FN(getdomainname) int getdomainname(char * _FORTIFY_POS0 __s, size_t __l) { size_t __b = __bos(__s, 0); @@ -84,7 +84,7 @@ _FORTIFY_FN(getgroups) int getgroups(int __l, gid_t * _FORTIFY_POS0 __s) return __orig_getgroups(__l, __s); } -__access(write_only, 1, 2) +__fortify_access(write_only, 1, 2) _FORTIFY_FN(gethostname) int gethostname(char * _FORTIFY_POS0 __s, size_t __l) { size_t __b = __bos(__s, 0); @@ -94,7 +94,7 @@ _FORTIFY_FN(gethostname) int gethostname(char * _FORTIFY_POS0 __s, size_t __l) return __orig_gethostname(__s, __l); } -__access(write_only, 1, 2) +__fortify_access(write_only, 1, 2) _FORTIFY_FN(getlogin_r) int getlogin_r(char * _FORTIFY_POS0 __s, size_t __l) { size_t __b = __bos(__s, 0); @@ -114,7 +114,7 @@ _FORTIFY_FN(pread) ssize_t pread(int __f, void * _FORTIFY_POS0 __s, return __orig_pread(__f, __s, __n, __o); } -__access(write_only, 2, 3) +__fortify_access(write_only, 2, 3) _FORTIFY_FN(read) ssize_t read(int __f, void * _FORTIFY_POS0 __s, size_t __n) { size_t __b = __bos(__s, 0); @@ -124,7 +124,7 @@ _FORTIFY_FN(read) ssize_t read(int __f, void * _FORTIFY_POS0 __s, size_t __n) return __orig_read(__f, __s, __n); } -__access(write_only, 2, 3) +__fortify_access(write_only, 2, 3) _FORTIFY_FN(readlink) ssize_t readlink(const char *__p, char * _FORTIFY_POS0 __s, size_t __n) { @@ -135,7 +135,7 @@ _FORTIFY_FN(readlink) ssize_t readlink(const char *__p, return __orig_readlink(__p, __s, __n); } -__access(write_only, 3, 4) +__fortify_access(write_only, 3, 4) _FORTIFY_FN(readlinkat) ssize_t readlinkat(int __f, const char *__p, char * _FORTIFY_POS0 __s, size_t __n) { @@ -146,7 +146,7 @@ _FORTIFY_FN(readlinkat) ssize_t readlinkat(int __f, const char *__p, return __orig_readlinkat(__f, __p, __s, __n); } -__access(write_only, 2, 3) +__fortify_access(write_only, 2, 3) _FORTIFY_FN(ttyname_r) int ttyname_r(int __f, char * _FORTIFY_POS0 __s, size_t __n) { @@ -157,7 +157,7 @@ _FORTIFY_FN(ttyname_r) int ttyname_r(int __f, char * _FORTIFY_POS0 __s, return __orig_ttyname_r(__f, __s, __n); } -__access(read_only, 2, 3) +__fortify_access(read_only, 2, 3) _FORTIFY_FN(write) ssize_t write(int __f, const void * _FORTIFY_POS0 __s, size_t __n) { -- cgit v1.3