diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-18 18:12:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-18 18:12:26 -0800 |
| commit | 6f3625006b157c5a460970ca4d651b100bfa67bf (patch) | |
| tree | 324afccda64dc1e6ccc629d03a647a5d0320bef9 /fs/erofs/decompressor.c | |
| parent | b5f66ba2d07180706ffa10df07f202335df190f1 (diff) | |
| parent | 2b872b0f466d2acb4491da845c66b49246d5cdf9 (diff) | |
| download | linux-6f3625006b157c5a460970ca4d651b100bfa67bf.tar.gz linux-6f3625006b157c5a460970ca4d651b100bfa67bf.tar.bz2 linux-6f3625006b157c5a460970ca4d651b100bfa67bf.zip | |
Merge tag 'erofs-for-6.8-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs
Pull erofs fixes from Gao Xiang:
- Fix a "BUG: kernel NULL pointer dereference" issue due to
inconsistent on-disk indices of compressed inodes against
per-sb `available_compr_algs` generated by Syzkaller
- Don't use certain unnecessary folio_*() helpers if the folio
type (page cache) is known
* tag 'erofs-for-6.8-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
erofs: Don't use certain unnecessary folio_*() functions
erofs: fix inconsistent per-file compression format
Diffstat (limited to 'fs/erofs/decompressor.c')
| -rw-r--r-- | fs/erofs/decompressor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/erofs/decompressor.c b/fs/erofs/decompressor.c index 1d65b9f60a39..072ef6a66823 100644 --- a/fs/erofs/decompressor.c +++ b/fs/erofs/decompressor.c @@ -408,7 +408,7 @@ int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb) int size, ret = 0; if (!erofs_sb_has_compr_cfgs(sbi)) { - sbi->available_compr_algs = Z_EROFS_COMPRESSION_LZ4; + sbi->available_compr_algs = 1 << Z_EROFS_COMPRESSION_LZ4; return z_erofs_load_lz4_config(sb, dsb, NULL, 0); } |