s390,alpha: switch to 64-bit ino_t

s390 and alpha are the only 64 bit architectures with a 32-bit ino_t.
Since this is quite unusual this causes bugs from time to time.

See e.g. commit ebce3eb2f7ef ("ceph: fix inode number handling on
arches with 32-bit ino_t") for an example.

This (obviously) also prevents s390 and alpha to use 64-bit ino_t for
tmpfs. See commit b85a7a8bb573 ("tmpfs: disallow CONFIG_TMPFS_INODE64
on s390").

Therefore switch both s390 and alpha to 64-bit ino_t. This should only
have an effect on the ustat system call. To prevent ABI breakage
define struct ustat compatible to the old layout and change
sys_ustat() accordingly.

Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/Kconfig b/arch/Kconfig
index 24862d15f3a36936fae1036821cf2b948208da59..383c98e86a70c0c8372a9f86fa00fb7a5696830c 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -327,6 +327,10 @@ config ARCH_32BIT_OFF_T
          still support 32-bit off_t. This option is enabled for all such
          architectures explicitly.
 
+# Selected by 64 bit architectures which have a 32 bit f_tinode in struct ustat
+config ARCH_32BIT_USTAT_F_TINODE
+       bool
+
 config HAVE_ASM_MODVERSIONS
        bool
        help

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 1f51437d576576e2b329bbb57782c35f7da86667..96ce6565890eea6c34ae81a734106ad2aac3219f 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -2,6 +2,7 @@
 config ALPHA
        bool
        default y
+       select ARCH_32BIT_USTAT_F_TINODE
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_MIGHT_HAVE_PC_SERIO
        select ARCH_NO_PREEMPT

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 5de9f409e4d0ad856f85051b87cda78eb632105d..b68e6952866d7090a1d64e7e41abec3e2cac61de 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -58,6 +58,7 @@ config S390
        # Note: keep this list sorted alphabetically
        #
        imply IMA_SECURE_AND_OR_TRUSTED_BOOT
+       select ARCH_32BIT_USTAT_F_TINODE
        select ARCH_BINFMT_ELF_STATE
        select ARCH_HAS_DEBUG_VM_PGTABLE
        select ARCH_HAS_DEBUG_WX

diff --git a/fs/statfs.c b/fs/statfs.c
index 68cb077887504f23b6eef7041ce7926a1f29d963..0ba34c1355932401d44ad7007679e82fba2abb3a 100644 (file)
--- a/fs/statfs.c
+++ b/fs/statfs.c
@@ -255,7 +255,10 @@ SYSCALL_DEFINE2(ustat, unsigned, dev, struct ustat __user *, ubuf)
 
        memset(&tmp,0,sizeof(struct ustat));
        tmp.f_tfree = sbuf.f_bfree;
-       tmp.f_tinode = sbuf.f_ffree;
+       if (IS_ENABLED(CONFIG_ARCH_32BIT_USTAT_F_TINODE))
+               tmp.f_tinode = min_t(u64, sbuf.f_ffree, UINT_MAX);
+       else
+               tmp.f_tinode = sbuf.f_ffree;
 
        return copy_to_user(ubuf, &tmp, sizeof(struct ustat)) ? -EFAULT : 0;
 }

diff --git a/include/linux/types.h b/include/linux/types.h
index a147977602b5ea8b4dc815c602a965c0c543983e..ac825ad90e44ab2f11fa9ee9e04d9dbfdf0b185e 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -14,7 +14,7 @@ typedef u32 __kernel_dev_t;
 
 typedef __kernel_fd_set                fd_set;
 typedef __kernel_dev_t         dev_t;
-typedef __kernel_ino_t         ino_t;
+typedef __kernel_ulong_t       ino_t;
 typedef __kernel_mode_t                mode_t;
 typedef unsigned short         umode_t;
 typedef u32                    nlink_t;
@@ -189,7 +189,11 @@ struct hlist_node {
 
 struct ustat {
        __kernel_daddr_t        f_tfree;
-       __kernel_ino_t          f_tinode;
+#ifdef CONFIG_ARCH_32BIT_USTAT_F_TINODE
+       unsigned int            f_tinode;
+#else
+       unsigned long           f_tinode;
+#endif
        char                    f_fname[6];
        char                    f_fpack[6];
 };