mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-06 17:40:06 +00:00
5c95f7b66b
Kay Sievers reported that coreutils' stat tool has a problem with s390's statfs[64] definition: > The definition of struct statfs::f_type needs a fix. s390 is the only > architecture in the kernel that uses an int and expects magic > constants lager than INT_MAX to fit into. > > A fix is needed to make Fedora boot on s390, it currently fails to do > so. Userspace does not want to add code to paper-over this issue. [...] > Even coreutils cannot handle it: > #define RAMFS_MAGIC 0x858458f6 > # stat -f -c%t / > ffffffff858458f6 > > #define BTRFS_SUPER_MAGIC 0x9123683E > # stat -f -c%t /mnt > ffffffff9123683e The bug is caused by an implicit sign extension within the stat tool: out_uint_x (pformat, prefix_len, statfsbuf->f_type); where the format finally will be "%lx". A similar problem can be found in the 'tail' tool. s390 is the only architecture which has an int type f_type member in struct statfs[64]. Other architectures have either unsigned ints or long values, so that the problem doesn't occur there. Therefore change the type of the f_type member to unsigned int, so that we get zero extension instead sign extension when assignment to a long value happens. Reported-by: Kay Sievers <kay@vrfy.org> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
70 lines
1.9 KiB
C
70 lines
1.9 KiB
C
/* Copyright (C) 1997-2013 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _SYS_STATFS_H
|
|
# error "Never include <bits/statfs.h> directly; use <sys/statfs.h> instead."
|
|
#endif
|
|
|
|
#include <bits/types.h> /* for __fsid_t and __fsblkcnt_t. */
|
|
|
|
struct statfs
|
|
{
|
|
unsigned int f_type;
|
|
unsigned int f_bsize;
|
|
#ifndef __USE_FILE_OFFSET64
|
|
__fsblkcnt_t f_blocks;
|
|
__fsblkcnt_t f_bfree;
|
|
__fsblkcnt_t f_bavail;
|
|
__fsfilcnt_t f_files;
|
|
__fsfilcnt_t f_ffree;
|
|
#else
|
|
__fsblkcnt64_t f_blocks;
|
|
__fsblkcnt64_t f_bfree;
|
|
__fsblkcnt64_t f_bavail;
|
|
__fsfilcnt64_t f_files;
|
|
__fsfilcnt64_t f_ffree;
|
|
#endif
|
|
__fsid_t f_fsid;
|
|
unsigned int f_namelen;
|
|
unsigned int f_frsize;
|
|
unsigned int f_flags;
|
|
unsigned int f_spare[4];
|
|
};
|
|
|
|
#ifdef __USE_LARGEFILE64
|
|
struct statfs64
|
|
{
|
|
unsigned int f_type;
|
|
unsigned int f_bsize;
|
|
__fsblkcnt64_t f_blocks;
|
|
__fsblkcnt64_t f_bfree;
|
|
__fsblkcnt64_t f_bavail;
|
|
__fsfilcnt64_t f_files;
|
|
__fsfilcnt64_t f_ffree;
|
|
__fsid_t f_fsid;
|
|
unsigned int f_namelen;
|
|
unsigned int f_frsize;
|
|
unsigned int f_flags;
|
|
unsigned int f_spare[4];
|
|
};
|
|
#endif
|
|
|
|
/* Tell code we have this member. */
|
|
#define _STATFS_F_NAMELEN
|
|
#define _STATFS_F_FRSIZE
|
|
#define _STATFS_F_FLAGS
|