diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2011-10-17 16:40:02 -0400 |
---|---|---|
committer | root <root@serles.lst.de> | 2011-10-28 08:58:53 -0400 |
commit | 1448c721e4fa2faf742029a0403b4b787fccb7fa (patch) | |
tree | f79332dccc85550b4c16510840850e11115cfff0 /arch/s390/include/asm/compat.h | |
parent | a877ee03ac010ded434b77f7831f43cbb1fcc60f (diff) |
compat: sync compat_stats with statfs.
This was found by inspection while tracking a similar
bug in compat_statfs64, that has been fixed in mainline
since decemeber.
- This fixes a bug where not all of the f_spare fields
were cleared on mips and s390.
- Add the f_flags field to struct compat_statfs
- Copy f_flags to userspace in case someone cares.
- Use __clear_user to copy the f_spare field to userspace
to ensure that all of the elements of f_spare are cleared.
On some architectures f_spare is has 5 ints and on some
architectures f_spare only has 4 ints. Which makes
the previous technique of clearing each int individually
broken.
I don't expect anyone actually uses the old statfs system
call anymore but if they do let them benefit from having
the compat and the native version working the same.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/s390/include/asm/compat.h')
-rw-r--r-- | arch/s390/include/asm/compat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h index da359ca6fe55..cdb9b78f6c08 100644 --- a/arch/s390/include/asm/compat.h +++ b/arch/s390/include/asm/compat.h | |||
@@ -131,7 +131,8 @@ struct compat_statfs { | |||
131 | compat_fsid_t f_fsid; | 131 | compat_fsid_t f_fsid; |
132 | s32 f_namelen; | 132 | s32 f_namelen; |
133 | s32 f_frsize; | 133 | s32 f_frsize; |
134 | s32 f_spare[6]; | 134 | s32 f_flags; |
135 | s32 f_spare[5]; | ||
135 | }; | 136 | }; |
136 | 137 | ||
137 | #define COMPAT_RLIM_OLD_INFINITY 0x7fffffff | 138 | #define COMPAT_RLIM_OLD_INFINITY 0x7fffffff |