linux-kernel - [PATCH] fat: fix sector print

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Fri,  8 Jun 2018 16:38:52 +0200
From:   Arnd Bergmann <arnd@...db.de>
To:     OGAWA Hirofumi <hirofumi@...l.parknet.co.jp>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Andrew Morton <akpm@...ux-foundation.org>,
        linux-kernel@...r.kernel.org
Subject: [PATCH] fat: fix sector print

Printing a sector_t using %ld fails when that is a 64-bit type on
32-bit architectures:

fs/fat/inode.c: In function '__fat_get_block':
fs/fat/inode.c:163:9: error: format '%ld' expects argument of type 'long int', but argument 5 has type 'sector_t' {aka 'long long unsigned int'} [-Werror=format=]
         "invalid FAT chain (i_pos %lld, last_block %ld)",

The common workaround is to cast the number to a 64-bit type and print that
as %lld, that works in all configurations.

Fixes: mmotm ("fat: use fat_fs_error() instead of BUG_ON() in __fat_get_block()")
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
 fs/fat/inode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index d380d0f844bb..d168df5a4a73 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -160,8 +160,8 @@ static inline int __fat_get_block(struct inode *inode, sector_t iblock,
 		return err;
 	if (!phys) {
 		fat_fs_error(sb,
-			     "invalid FAT chain (i_pos %lld, last_block %ld)",
-			     MSDOS_I(inode)->i_pos, last_block);
+			     "invalid FAT chain (i_pos %lld, last_block %llu)",
+			     MSDOS_I(inode)->i_pos, (u64)last_block);
 		return -EIO;
 	}
 
-- 
2.9.0