diff options
| author |   Qu Wenruo <wqu@suse.com> | 2018-05-17 14:10:29 +0800 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2018-05-30 16:46:43 +0200 |
| commit | de885e3ee281a88f52283c7e8994e762e3a5f6bd (patch) | |
| tree | 0a46bf7e4fdfc860b39de3fc76cd162d14749290 /fs/btrfs/lzo.c | |
| parent | btrfs: lzo: Add header length check to avoid potential out-of-bounds access (diff) | |
| download | linux-dev-de885e3ee281a88f52283c7e8994e762e3a5f6bd.tar.xz linux-dev-de885e3ee281a88f52283c7e8994e762e3a5f6bd.zip | |
btrfs: lzo: Harden inline lzo compressed extent decompression
For inlined extent, we only have one segment, thus less things to check.
And further more, inlined extent always has the csum in its leaf header,
it's less probable to have corrupted data.
Anyway, still check header and segment header.
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/lzo.c')
| -rw-r--r-- | fs/btrfs/lzo.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/btrfs/lzo.c b/fs/btrfs/lzo.c index 464fbb96af1a..b6a4cc178bee 100644 --- a/fs/btrfs/lzo.c +++ b/fs/btrfs/lzo.c @@ -430,15 +430,24 @@ static int lzo_decompress(struct list_head *ws, unsigned char *data_in, struct workspace *workspace = list_entry(ws, struct workspace, list); size_t in_len; size_t out_len; + size_t max_segment_len = lzo1x_worst_compress(PAGE_SIZE); int ret = 0; char *kaddr; unsigned long bytes; - BUG_ON(srclen < LZO_LEN); + if (srclen < LZO_LEN || srclen > max_segment_len + LZO_LEN * 2) + return -EUCLEAN; + in_len = read_compress_length(data_in); + if (in_len != srclen) + return -EUCLEAN; data_in += LZO_LEN; in_len = read_compress_length(data_in); + if (in_len != srclen - LZO_LEN * 2) { + ret = -EUCLEAN; + goto out; + } data_in += LZO_LEN; out_len = PAGE_SIZE; |