From: Phillip Lougher <phillip@squashfs.org.uk>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
akpm@linux-foundation.org
Cc: Phillip Lougher <phillip@squashfs.org.uk>
Subject: [PATCH v2 07/22] Squashfs: fix offset in squashfs_read_inode() TRACE statements
Date: Wed, 11 Nov 2026 23:43:47 +0000 [thread overview]
Message-ID: <20261111234402.252354-8-phillip@squashfs.org.uk> (raw)
In-Reply-To: <20261111234402.252354-1-phillip@squashfs.org.uk>
The offset used in the TRACE statements has been advanced past the start
of the inode header by the squashfs_read_metadata() call. This means
the offset printed is incorrect.
Fix this by using the original offset, which is obtained by calling
squashfs_inode_offset(ino).
Fixes: 6545b246a2c81 ("Squashfs: inode operations")
Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
---
fs/squashfs/inode.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c
index bc7c81d442f2..66858fabed1a 100644
--- a/fs/squashfs/inode.c
+++ b/fs/squashfs/inode.c
@@ -184,7 +184,8 @@ int squashfs_read_inode(struct inode *inode, long long ino)
TRACE("File inode %x:%x, start_block %llx, block_list_start "
"%llx, offset %x\n", squashfs_inode_blk(ino),
- offset, squashfs_i(inode)->start, block, offset);
+ squashfs_inode_offset(ino),
+ squashfs_i(inode)->start, block, offset);
break;
}
case SQUASHFS_LREG_TYPE: {
@@ -244,7 +245,8 @@ int squashfs_read_inode(struct inode *inode, long long ino)
TRACE("File inode %x:%x, start_block %llx, block_list_start "
"%llx, offset %x\n", squashfs_inode_blk(ino),
- offset, squashfs_i(inode)->start, block, offset);
+ squashfs_inode_offset(ino), squashfs_i(inode)->start,
+ block, offset);
break;
}
case SQUASHFS_DIR_TYPE: {
@@ -266,7 +268,8 @@ int squashfs_read_inode(struct inode *inode, long long ino)
squashfs_i(inode)->parent = le32_to_cpu(sqsh_ino->parent_inode);
TRACE("Directory inode %x:%x, start_block %llx, offset %x\n",
- squashfs_inode_blk(ino), offset,
+ squashfs_inode_blk(ino),
+ squashfs_inode_offset(ino),
squashfs_i(inode)->start,
le16_to_cpu(sqsh_ino->offset));
break;
@@ -293,7 +296,8 @@ int squashfs_read_inode(struct inode *inode, long long ino)
squashfs_i(inode)->parent = le32_to_cpu(sqsh_ino->parent_inode);
TRACE("Long directory inode %x:%x, start_block %llx, offset "
- "%x\n", squashfs_inode_blk(ino), offset,
+ "%x\n", squashfs_inode_blk(ino),
+ squashfs_inode_offset(ino),
squashfs_i(inode)->start,
le16_to_cpu(sqsh_ino->offset));
break;
@@ -337,8 +341,8 @@ int squashfs_read_inode(struct inode *inode, long long ino)
}
TRACE("Symbolic link inode %x:%x, start_block %llx, offset "
- "%x\n", squashfs_inode_blk(ino), offset,
- block, offset);
+ "%x\n", squashfs_inode_blk(ino),
+ squashfs_inode_offset(ino), block, offset);
break;
}
case SQUASHFS_BLKDEV_TYPE:
@@ -361,7 +365,8 @@ int squashfs_read_inode(struct inode *inode, long long ino)
squashfs_i(inode)->parent = 0;
TRACE("Device inode %x:%x, rdev %x\n",
- squashfs_inode_blk(ino), offset, rdev);
+ squashfs_inode_blk(ino),
+ squashfs_inode_offset(ino), rdev);
break;
}
case SQUASHFS_LBLKDEV_TYPE:
@@ -386,7 +391,8 @@ int squashfs_read_inode(struct inode *inode, long long ino)
squashfs_i(inode)->parent = 0;
TRACE("Device inode %x:%x, rdev %x\n",
- squashfs_inode_blk(ino), offset, rdev);
+ squashfs_inode_blk(ino),
+ squashfs_inode_offset(ino), rdev);
break;
}
case SQUASHFS_FIFO_TYPE:
--
2.47.3
next prev parent reply other threads:[~2026-11-11 23:44 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-11 23:43 [PATCH v2 00/22] Squashfs: fix a lot of AI issues and AI style issues Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 01/22] Squashfs: convert SQUASHFS_COMPRESSED_* to inline functions Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 02/22] Squashfs: convert SQUASHFS_INODE_* and SQUASHFS_MKINODE " Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 03/22] Squashfs: convert SQUASHFS_FRAGMENT_* " Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 04/22] Squashfs: convert SQUASHFS_LOOKUP_* " Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 05/22] Squashfs: convert SQUASHFS_ID_* " Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 06/22] Squashfs: convert SQUASHFS_XATTR_* " Phillip Lougher
2026-11-11 23:43 ` Phillip Lougher [this message]
2026-11-11 23:43 ` [PATCH v2 08/22] Squashfs: fix fragment bytes overflow on 32-bit architectures Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 09/22] Squashfs: fix fragment index table length too large exploit Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 10/22] Squashfs: sanity check inode metadata block location Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 11/22] Squashfs: sanity check directory " Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 12/22] Squashfs: widen xattr count variables and add sanity check Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 13/22] Squashfs: very large files can exceed an int block count Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 15/22] Squashfs: sanity check fragment block location and range Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 16/22] Squashfs: sanity check block list sizes " Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 18/22] Squashfs: don't store large fragment table indexes in memory Phillip Lougher
2026-11-11 23:43 ` [PATCH v2 19/22] Squashfs: don't store large xattr id " Phillip Lougher
2026-11-11 23:44 ` [PATCH v2 20/22] Squashfs: fix variables in directory code and add more sanity checks Phillip Lougher
2026-11-11 23:44 ` [PATCH v2 21/22] Squashfs: fix regression in squashfs_copy_cache() Phillip Lougher
2026-11-11 23:44 ` [PATCH v2 22/22] Squashfs: check index isn't greater than S64_MAX in squashfs_read_data() Phillip Lougher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261111234402.252354-8-phillip@squashfs.org.uk \
--to=phillip@squashfs.org.uk \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®