From: Michael Bommarito <michael.bommarito@gmail.com>
To: Gao Xiang <xiang@kernel.org>, Chao Yu <chao@kernel.org>
Cc: Yue Hu <zbestahu@gmail.com>,
Jeffle Xu <jefflexu@linux.alibaba.com>,
Sandeep Dhavale <dhavale@google.com>,
Hongbo Li <lihongbo22@huawei.com>,
Chunhai Guo <guochunhai@vivo.com>,
linux-erofs@lists.ozlabs.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: [PATCH v2] erofs: cap LZMA stream pool size
Date: Sat, 11 Jul 2026 10:34:19 -0400 [thread overview]
Message-ID: <20260711143419.2762894-1-michael.bommarito@gmail.com> (raw)
fs/erofs/decompressor_lzma.c sizes the module-global MicroLZMA stream
pool from num_possible_cpus() or the lzma_streams module parameter, then
z_erofs_load_lzma_config() preallocates one image-supplied dictionary per
stream, accepting dictionaries up to 8 MiB. On high-CPU systems, a small
EROFS image can pin hundreds of MiB of vmalloc-backed decoder state until
the erofs module is unloaded.
Impact: an attacker-supplied EROFS image mounted by the system can pin up
to 8 MiB times the LZMA stream count of kernel vmalloc memory.
Bound the LZMA stream pool by a new CONFIG_EROFS_FS_ZIP_LZMA_MAX_STREAMS
option, default 16. The default keeps the worst-case preallocated
dictionary pool at 128 MiB while preserving the existing per-image
dictionary limit; memory-constrained systems can lower it and large
servers can raise it.
Fixes: 622ceaddb764 ("erofs: lzma compression support")
Cc: stable@vger.kernel.org
Assisted-by: Claude:claude-opus-4-8
Signed-off-by: Michael Bommarito <michael.bommarito@gmail.com>
---
v2: bound the pool with a Kconfig option
(CONFIG_EROFS_FS_ZIP_LZMA_MAX_STREAMS, default 16) instead of a
hardcoded 16, per Gao Xiang's review, so memory-constrained and
server deployments can size it. Kept the EROFS_FS_ZIP_ prefix of
the sibling options.
v1: https://lore.kernel.org/linux-erofs/20260710023036.3745254-1-michael.bommarito@gmail.com/
fs/erofs/Kconfig | 20 ++++++++++++++++++++
fs/erofs/decompressor_lzma.c | 7 +++++++
2 files changed, 27 insertions(+)
diff --git a/fs/erofs/Kconfig b/fs/erofs/Kconfig
index 4789b1077d8ce..3e4731dd03e7c 100644
--- a/fs/erofs/Kconfig
+++ b/fs/erofs/Kconfig
@@ -131,6 +131,26 @@ config EROFS_FS_ZIP_LZMA
Say N if you want to disable LZMA compression support.
+config EROFS_FS_ZIP_LZMA_MAX_STREAMS
+ int "EROFS LZMA maximum decompression stream pool size"
+ depends on EROFS_FS_ZIP_LZMA
+ range 1 1024
+ default 16
+ help
+ EROFS preallocates a pool of MicroLZMA decoder streams, one per
+ possible CPU by default, or as set by the lzma_streams module
+ parameter. Each stream can hold a dictionary of up to 8 MiB taken
+ from the mounted image, so on systems with a large number of CPUs a
+ single small image can pin a large amount of vmalloc memory until the
+ erofs module is unloaded.
+
+ This bounds the number of preallocated streams. The worst-case
+ preallocated dictionary memory is 8 MiB times this value. Lower it on
+ memory-constrained or embedded systems; raise it on large servers that
+ decompress many EROFS images in parallel.
+
+ If unsure, keep the default of 16.
+
config EROFS_FS_ZIP_DEFLATE
bool "EROFS DEFLATE compressed data support"
depends on EROFS_FS_ZIP
diff --git a/fs/erofs/decompressor_lzma.c b/fs/erofs/decompressor_lzma.c
index f6692d0f2f04d..882684c663f47 100644
--- a/fs/erofs/decompressor_lzma.c
+++ b/fs/erofs/decompressor_lzma.c
@@ -52,6 +52,13 @@ static int __init z_erofs_lzma_init(void)
/* by default, use # of possible CPUs instead */
if (!z_erofs_lzma_nstrms)
z_erofs_lzma_nstrms = num_possible_cpus();
+ /*
+ * Each stream can pin an 8 MiB image-supplied dictionary, so bound the
+ * module-global pool to keep the worst-case preallocation in check on
+ * systems with many CPUs (or a large lzma_streams request).
+ */
+ z_erofs_lzma_nstrms = min_t(unsigned int, z_erofs_lzma_nstrms,
+ CONFIG_EROFS_FS_ZIP_LZMA_MAX_STREAMS);
for (i = 0; i < z_erofs_lzma_nstrms; ++i) {
struct z_erofs_lzma *strm = kzalloc_obj(*strm);
--
2.53.0
next reply other threads:[~2026-07-11 14:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-11 14:34 Michael Bommarito [this message]
2026-07-13 6:10 ` [PATCH v2] erofs: cap LZMA stream pool size Gao Xiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260711143419.2762894-1-michael.bommarito@gmail.com \
--to=michael.bommarito@gmail.com \
--cc=chao@kernel.org \
--cc=dhavale@google.com \
--cc=guochunhai@vivo.com \
--cc=jefflexu@linux.alibaba.com \
--cc=lihongbo22@huawei.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=xiang@kernel.org \
--cc=zbestahu@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox