From a505a2cc56acf493607fdf24cbf129393a0873fa Mon Sep 17 00:00:00 2001 From: Yuta Hayama Date: Fri, 13 Feb 2026 14:55:22 +0100 Subject: fsck.ubifs: fix platform dependant ino_t and loff_t formatting On architectures such as armv7-a, ino_t and loff_t are unsigned long long rather than unsigned long. In such cases, the printf format specifier "%lu" is not appropriate and causes an incorrect address offset. mtd-utils/ubifs-utils/fsck.ubifs/problem.c:224 log_out(c, "problem: %s, ino %lu, unreachable dentry %s, type %s%s", problem->desc, ifp->file->inum, c->encrypted && !ifp->file->ino.is_xattr ? "" : dent_node->name, ubifs_get_type_name(dent_node->type), key_type(c, &dent_node->key) == UBIFS_XENT_KEY ? "(xattr)" : ""); fsck.ubifs[484] (/dev/ubi0_0,danger mode): problem: Dentry is unreachable, ino 917, unreachable dentry (null), type checksum_typefile Furthermore, running fsck.ubifs with the --debug=4 option will almost certainly cause a SEGV at the following point. mtd-utils/ubifs-utils/fsck.ubifs/check_files.c:103 dbg_fsck("construct file(%lu) for %s node, TNC location %d:%d, in %s", inum, ubifs_get_key_name(key_type(c, key)), sn->lnum, sn->offs, c->dev_name); To ensure functionality regardless of environment, cast ino_t to unsigned long, since it will never be more than 4 bytes. For loff_t, use %lld and cast accordingly. Signed-off-by: Yuta Hayama Signed-off-by: Tomas Alvarez Vanoli Reviewed-by: Zhihao Cheng Signed-off-by: David Oberhollenzer --- ubifs-utils/fsck.ubifs/handle_disconnected.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ubifs-utils/fsck.ubifs/handle_disconnected.c') diff --git a/ubifs-utils/fsck.ubifs/handle_disconnected.c b/ubifs-utils/fsck.ubifs/handle_disconnected.c index be62522..9e5d925 100644 --- a/ubifs-utils/fsck.ubifs/handle_disconnected.c +++ b/ubifs-utils/fsck.ubifs/handle_disconnected.c @@ -117,7 +117,7 @@ static int handle_disonnected_file(struct ubifs_info *c, struct ubifs_inode *target_ui; err = snprintf(file_name, sizeof(file_name), - "INO_%lu_%u", file->inum, index); + "INO_%lu_%u", (unsigned long)file->inum, index); if (err < 0) goto free_ui; fname_name(&nm) = file_name; @@ -138,7 +138,7 @@ static int handle_disonnected_file(struct ubifs_info *c, kfree(ui); kfree(lost_found_ui); log_out(c, "Too many duplicated names(%u) in lost+found for inum %lu", - index, file->inum); + index, (unsigned long)file->inum); goto delete_file; } @@ -150,7 +150,7 @@ static int handle_disonnected_file(struct ubifs_info *c, goto delete_file; } dbg_fsck("recover disconnected file %lu, in %s", - file->inum, c->dev_name); + (unsigned long)file->inum, c->dev_name); free_ui: kfree(ui); -- cgit v1.2.3