Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a220a703 authored by Linus Torvalds's avatar Linus Torvalds Committed by Greg Kroah-Hartman
Browse files

squashfs: more metadata hardening 



commit d512584780d3e6a7cacb2f482834849453d444a1 upstream.

Anatoly reports another squashfs fuzzing issue, where the decompression
parameters themselves are in a compressed block.

This causes squashfs_read_data() to be called in order to read the
decompression options before the decompression stream having been set
up, making squashfs go sideways.

Reported-by: default avatarAnatoly Trosinenko <anatoly.trosinenko@gmail.com>
Acked-by: default avatarPhillip Lougher <phillip.lougher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1aa222b3

fs/squashfs/block.c

+2 −0
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length, 
	}



	if (compressed) {

		if (!msblk->stream)

			goto read_failure;

		length = squashfs_decompress(msblk, bh, b, offset, length,

			output);

		if (length < 0)