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

sysdeps/stat: Handle 64-bit ino_t types on 32-bit hosts

Browse Source 
On a 32-bit platform with a 64-bit ino_t type (__INO_T_MATCHES_INO64_T
defined) we want to update the stat struct to remove the padding as it
isn't required. As we don't have the padding we also need to update the
overflow checker to not access the undefined members.
This commit is contained in:
Alistair Francis 2019-08-13 13:18:06 -07:00
parent 76aaa13d5d
commit c82005921e
4 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysdeps/unix/sysv/linux/generic/Makefile
View File

@ -1,3 +1,3 @@
ifeq ($(subdir),misc) ifeq ($(subdir),misc)
sysdep_routines += epoll_create inotify_init sysdep_routines += epoll_create inotify_init stat-check
endif endif

5
sysdeps/unix/sysv/linux/generic/bits/stat.h
View File

@ -42,7 +42,10 @@
#if defined __USE_FILE_OFFSET64 #if defined __USE_FILE_OFFSET64
# define __field64(type, type64, name) type64 name # define __field64(type, type64, name) type64 name
#elif __WORDSIZE == 64 #elif __WORDSIZE == 64 || defined __INO_T_MATCHES_INO64_T
# if defined __INO_T_MATCHES_INO64_T && !defined __OFF_T_MATCHES_OFF64_T
# error "ino_t and off_t must both be the same type"
# endif
# define __field64(type, type64, name) type name # define __field64(type, type64, name) type name
#elif __BYTE_ORDER == __LITTLE_ENDIAN #elif __BYTE_ORDER == __LITTLE_ENDIAN
# define __field64(type, type64, name) \ # define __field64(type, type64, name) \

29
sysdeps/unix/sysv/linux/generic/stat-check.c Normal file
View File

@ -0,0 +1,29 @@
/* Static assert for __blkcnt64_t when __INO_T_MATCHES_INO64_T is defined.
Copyright (C) 2019 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
<https://www.gnu.org/licenses/>. */
#include <sys/stat.h>
#include <bits/typesizes.h>
/* This is due to the layout code in bits/stat.h and the overflow handling in
wordsize-32/overflow.h, requiring either all or none of the three types
concerned to have padding. */
#if defined __INO_T_MATCHES_INO64_T
_Static_assert (sizeof (__blkcnt_t) == sizeof (__blkcnt64_t),
"__blkcnt_t and __blkcnt64_t must match");
#endif

4
sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h
View File

@ -36,12 +36,16 @@ static inline off_t lseek_overflow (loff_t res)
static inline int stat_overflow (struct stat *buf) static inline int stat_overflow (struct stat *buf)
{ {
#if defined __INO_T_MATCHES_INO64_T
return 0;
#else
if (buf->__st_ino_pad == 0 && buf->__st_size_pad == 0 if (buf->__st_ino_pad == 0 && buf->__st_size_pad == 0
&& buf->__st_blocks_pad == 0) && buf->__st_blocks_pad == 0)
return 0; return 0;
__set_errno (EOVERFLOW); __set_errno (EOVERFLOW);
return -1; return -1;
#endif
} }
/* Note that f_files and f_ffree may validly be a sign-extended -1. */ /* Note that f_files and f_ffree may validly be a sign-extended -1. */