diff options
| author | Andreas Schwab <schwab@suse.de> | 2024-08-05 10:55:51 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2024-08-05 16:49:58 +0200 |
| commit | 39ca997ab378990d5ac1aadbaa52aaf1db6d526f (patch) | |
| tree | 09d025937fc8aa6345cfa0041c059cda9718579a /socket | |
| parent | 1b0a2062c8938c7333cd118d85d9976c4e7c92af (diff) | |
| download | glibc-39ca997ab378990d5ac1aadbaa52aaf1db6d526f.zip glibc-39ca997ab378990d5ac1aadbaa52aaf1db6d526f.tar.gz glibc-39ca997ab378990d5ac1aadbaa52aaf1db6d526f.tar.bz2 | |
Fix name space violation in fortify wrappers (bug 32052)
Rename the identifier sz to __sz everywhere.
Fixes: a643f60c53 ("Make sure that the fortified function conditionals are constant")
Diffstat (limited to 'socket')
| -rw-r--r-- | socket/bits/socket2.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/socket/bits/socket2.h b/socket/bits/socket2.h index 04780f3..bd91647 100644 --- a/socket/bits/socket2.h +++ b/socket/bits/socket2.h @@ -37,14 +37,14 @@ recv (int __fd, __fortify_clang_overload_arg0 (void *, ,__buf), size_t __n, "recv called with bigger length than " "size of destination buffer") { - size_t sz = __glibc_objsize0 (__buf); - if (__glibc_safe_or_unknown_len (__n, sizeof (char), sz)) + size_t __sz = __glibc_objsize0 (__buf); + if (__glibc_safe_or_unknown_len (__n, sizeof (char), __sz)) return __recv_alias (__fd, __buf, __n, __flags); #if !__fortify_use_clang - if (__glibc_unsafe_len (__n, sizeof (char), sz)) - return __recv_chk_warn (__fd, __buf, __n, sz, __flags); + if (__glibc_unsafe_len (__n, sizeof (char), __sz)) + return __recv_chk_warn (__fd, __buf, __n, __sz, __flags); #endif - return __recv_chk (__fd, __buf, __n, sz, __flags); + return __recv_chk (__fd, __buf, __n, __sz, __flags); } extern ssize_t __recvfrom_chk (int __fd, void *__restrict __buf, size_t __n, @@ -71,13 +71,13 @@ recvfrom (int __fd, __fortify_clang_overload_arg0 (void *, __restrict, __buf), "recvfrom called with bigger length " "than size of destination buffer") { - size_t sz = __glibc_objsize0 (__buf); - if (__glibc_safe_or_unknown_len (__n, sizeof (char), sz)) + size_t __sz = __glibc_objsize0 (__buf); + if (__glibc_safe_or_unknown_len (__n, sizeof (char), __sz)) return __recvfrom_alias (__fd, __buf, __n, __flags, __addr, __addr_len); #if !__fortify_use_clang - if (__glibc_unsafe_len (__n, sizeof (char), sz)) - return __recvfrom_chk_warn (__fd, __buf, __n, sz, __flags, __addr, + if (__glibc_unsafe_len (__n, sizeof (char), __sz)) + return __recvfrom_chk_warn (__fd, __buf, __n, __sz, __flags, __addr, __addr_len); #endif - return __recvfrom_chk (__fd, __buf, __n, sz, __flags, __addr, __addr_len); + return __recvfrom_chk (__fd, __buf, __n, __sz, __flags, __addr, __addr_len); } |