Merge tag 'cramfs_fixes' of git://git.linaro.org/people/nicolas.pitre/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Oct 2018 19:46:25 +0000 (12:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Oct 2018 19:46:25 +0000 (12:46 -0700)
Pull cramfs fixes from Nicolas Pitre:
 "Make the Cramfs code more robust against filesystem corruptions, plus
  trivial indentation fixes"

* tag 'cramfs_fixes' of git://git.linaro.org/people/nicolas.pitre/linux:
  Cramfs: trivial whitespace fixes
  Cramfs: fix abad comparison when wrap-arounds occur

fs/cramfs/inode.c

index 0c35e62..9352487 100644 (file)
@@ -202,7 +202,8 @@ static void *cramfs_blkdev_read(struct super_block *sb, unsigned int offset,
                        continue;
                blk_offset = (blocknr - buffer_blocknr[i]) << PAGE_SHIFT;
                blk_offset += offset;
-               if (blk_offset + len > BUFFER_SIZE)
+               if (blk_offset > BUFFER_SIZE ||
+                   blk_offset + len > BUFFER_SIZE)
                        continue;
                return read_buffers[i] + blk_offset;
        }
@@ -872,8 +873,8 @@ static int cramfs_readpage(struct file *file, struct page *page)
                        if (unlikely(block_start & CRAMFS_BLK_FLAG_DIRECT_PTR)) {
                                /* See comments on earlier code. */
                                u32 prev_start = block_start;
-                              block_start = prev_start & ~CRAMFS_BLK_FLAGS;
-                              block_start <<= CRAMFS_BLK_DIRECT_PTR_SHIFT;
+                               block_start = prev_start & ~CRAMFS_BLK_FLAGS;
+                               block_start <<= CRAMFS_BLK_DIRECT_PTR_SHIFT;
                                if (prev_start & CRAMFS_BLK_FLAG_UNCOMPRESSED) {
                                        block_start += PAGE_SIZE;
                                } else {