diff --git a/fs/squashfs/block.c b/fs/squashfs/block.c index 581ce9519339..1c7c5500206b 100644 --- a/fs/squashfs/block.c +++ b/fs/squashfs/block.c @@ -314,9 +314,11 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length, bio_uninit(bio); kfree(bio); + printk("datal: %d \n", length); compressed = SQUASHFS_COMPRESSED(length); length = SQUASHFS_COMPRESSED_SIZE(length); index += 2; + printk("datal2: %d, c:%d, i:%d \n", length, compressed, index); TRACE("Block @ 0x%llx, %scompressed size %d\n", index - 2, compressed ? "" : "un", length); @@ -324,6 +326,7 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length, if (length < 0 || length > output->length || (index + length) > msblk->bytes_used) { res = -EIO; + printk("srd: l:%d, ol: %d, bu: %d \n", length, output->length, msblk->bytes_used); goto out; } @@ -340,6 +343,7 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length, goto out_free_bio; } res = msblk->thread_ops->decompress(msblk, bio, offset, length, output); + printk("srd6: r: %d \n", res); } else { res = copy_bio_to_actor(bio, output, offset, length); } diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c index 5062326d0efb..dac9eedea868 100644 --- a/fs/squashfs/cache.c +++ b/fs/squashfs/cache.c @@ -340,6 +340,7 @@ int squashfs_read_metadata(struct super_block *sb, void *buffer, if (unlikely(length < 0)) return -EIO; + printk("srm: %d\n", length); while (length) { entry = squashfs_cache_get(sb, msblk->block_cache, *block, 0); if (entry->error) { @@ -381,6 +382,7 @@ struct squashfs_cache_entry *squashfs_get_fragment(struct super_block *sb, { struct squashfs_sb_info *msblk = sb->s_fs_info; + printk("sgf: %d\n", length); return squashfs_cache_get(sb, msblk->fragment_cache, start_block, length); } @@ -396,6 +398,7 @@ struct squashfs_cache_entry *squashfs_get_datablock(struct super_block *sb, { struct squashfs_sb_info *msblk = sb->s_fs_info; + printk("sgd: %d\n", length); return squashfs_cache_get(sb, msblk->read_page, start_block, length); } diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c index 8ba8c4c50770..b54d6b993357 100644 --- a/fs/squashfs/file.c +++ b/fs/squashfs/file.c @@ -461,6 +461,12 @@ static int squashfs_read_folio(struct file *file, struct folio *folio) TRACE("Entered squashfs_readpage, page index %lx, start block %llx\n", page->index, squashfs_i(inode)->start); + if (!file_end) { + printk("i:%p, is:%d, %s\n", inode, i_size_read(inode), __func__); + res = -EINVAL; + goto out; + } + if (page->index >= ((i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT)) goto out; @@ -547,6 +553,11 @@ static void squashfs_readahead(struct readahead_control *ractl) int i, file_end = i_size_read(inode) >> msblk->block_log; unsigned int max_pages = 1UL << shift; + if (!file_end && !start) { + printk("i:%p, is:%d, %s\n", inode, i_size_read(inode), __func__); + return; + } + readahead_expand(ractl, start, (len | mask) + 1); pages = kmalloc_array(max_pages, sizeof(void *), GFP_KERNEL); diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c index aa3411354e66..f3b0111e6fbd 100644 --- a/fs/squashfs/inode.c +++ b/fs/squashfs/inode.c @@ -175,6 +175,7 @@ int squashfs_read_inode(struct inode *inode, long long ino) u64 frag_blk; struct squashfs_lreg_inode *sqsh_ino = &squashfs_ino.lreg; + printk("in0: %p, fs: %d, it: %d, %s\n", inode, inode->i_size, type, __func__); err = squashfs_read_metadata(sb, sqsh_ino, &block, &offset, sizeof(*sqsh_ino)); if (err < 0) @@ -403,6 +404,7 @@ int squashfs_read_inode(struct inode *inode, long long ino) } else squashfs_i(inode)->xattr_count = 0; + printk("in: %p, fs: %d, it: %d, %s\n", inode, inode->i_size, type, __func__); return 0; failed_read: