Linux block layer
 help / color / mirror / Atom feed
From: Haoqin Huang <haoqinhuang7@gmail.com>
To: Minchan Kim <minchan@kernel.org>,
	Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Jens Axboe <axboe@kernel.dk>, Nick Terrell <terrelln@fb.com>,
	David Sterba <dsterba@suse.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	linux-kernel@vger.kernel.org, linux-block@vger.kernel.org,
	Haoqin Huang <haoqinhuang@tencent.com>,
	Rongwei Wang <zigiwang@tencent.com>
Subject: [PATCH v5 3/4] zram: validate parameters in each backend's setup_params
Date: Mon,  3 Aug 2026 22:12:55 +0800	[thread overview]
Message-ID: <20260803141256.60599-4-haoqinhuang7@gmail.com> (raw)
In-Reply-To: <20260803141256.60599-1-haoqinhuang7@gmail.com>

From: Haoqin Huang <haoqinhuang@tencent.com>

Dict and level parameters are silently accepted even for backends
that do not support them. Validate these parameters in each backend's
.setup_params() to reject unsupported combinations and out-of-range
levels with a specific error message.

Signed-off-by: Haoqin Huang <haoqinhuang@tencent.com>
Signed-off-by: Rongwei Wang <zigiwang@tencent.com>
---
 drivers/block/zram/backend_842.c     |  8 ++++++++
 drivers/block/zram/backend_deflate.c | 11 +++++++++++
 drivers/block/zram/backend_lz4.c     |  4 ++++
 drivers/block/zram/backend_lz4hc.c   |  4 ++++
 drivers/block/zram/backend_lzo.c     |  8 ++++++++
 drivers/block/zram/backend_lzorle.c  |  8 ++++++++
 drivers/block/zram/backend_zstd.c    |  5 +++++
 7 files changed, 48 insertions(+)

diff --git a/drivers/block/zram/backend_842.c b/drivers/block/zram/backend_842.c
index 10d9d5c60f53..91a22313fe82 100644
--- a/drivers/block/zram/backend_842.c
+++ b/drivers/block/zram/backend_842.c
@@ -13,6 +13,14 @@ static void release_params_842(struct zcomp_params *params)
 
 static int setup_params_842(struct zcomp_params *params)
 {
+	if (params->dict_sz) {
+		pr_err("842: dictionary is not supported\n");
+		return -EOPNOTSUPP;
+	}
+	if (params->level != ZCOMP_PARAM_NOT_SET) {
+		pr_err("842: compression level is not supported\n");
+		return -EOPNOTSUPP;
+	}
 	return 0;
 }
 
diff --git a/drivers/block/zram/backend_deflate.c b/drivers/block/zram/backend_deflate.c
index b3f7d08b49d9..b2074c44b2d0 100644
--- a/drivers/block/zram/backend_deflate.c
+++ b/drivers/block/zram/backend_deflate.c
@@ -22,8 +22,19 @@ static void deflate_release_params(struct zcomp_params *params)
 
 static int deflate_setup_params(struct zcomp_params *params)
 {
+	if (params->dict_sz) {
+		pr_err("deflate: dictionary is not supported\n");
+		return -EOPNOTSUPP;
+	}
+
 	if (params->level == ZCOMP_PARAM_NOT_SET)
 		params->level = Z_DEFAULT_COMPRESSION;
+	else if (params->level < Z_DEFAULT_COMPRESSION ||
+		 params->level > Z_BEST_COMPRESSION) {
+		pr_err("deflate: invalid compression level %d\n", params->level);
+		return -EINVAL;
+	}
+
 	if (params->deflate.winbits == ZCOMP_PARAM_NOT_SET) {
 		params->deflate.winbits = DEFLATE_DEF_WINBITS;
 	} else {
diff --git a/drivers/block/zram/backend_lz4.c b/drivers/block/zram/backend_lz4.c
index c449d511ba86..f4f5111220c7 100644
--- a/drivers/block/zram/backend_lz4.c
+++ b/drivers/block/zram/backend_lz4.c
@@ -30,6 +30,10 @@ static int lz4_setup_params(struct zcomp_params *params)
 
 	if (params->level == ZCOMP_PARAM_NOT_SET)
 		params->level = LZ4_ACCELERATION_DEFAULT;
+	else if (params->level < LZ4_ACCELERATION_DEFAULT) {
+		pr_err("lz4: invalid compression level %d\n", params->level);
+		return -EINVAL;
+	}
 
 	if (!params->dict || !params->dict_sz)
 		return 0;
diff --git a/drivers/block/zram/backend_lz4hc.c b/drivers/block/zram/backend_lz4hc.c
index f6a336acfe20..d7cd97b898bd 100644
--- a/drivers/block/zram/backend_lz4hc.c
+++ b/drivers/block/zram/backend_lz4hc.c
@@ -20,6 +20,10 @@ static int lz4hc_setup_params(struct zcomp_params *params)
 {
 	if (params->level == ZCOMP_PARAM_NOT_SET)
 		params->level = LZ4HC_DEFAULT_CLEVEL;
+	else if (params->level < 1 || params->level > LZ4HC_MAX_CLEVEL) {
+		pr_err("lz4hc: invalid compression level %d\n", params->level);
+		return -EINVAL;
+	}
 
 	return 0;
 }
diff --git a/drivers/block/zram/backend_lzo.c b/drivers/block/zram/backend_lzo.c
index 4c906beaae6b..cdbb89aaa0de 100644
--- a/drivers/block/zram/backend_lzo.c
+++ b/drivers/block/zram/backend_lzo.c
@@ -12,6 +12,14 @@ static void lzo_release_params(struct zcomp_params *params)
 
 static int lzo_setup_params(struct zcomp_params *params)
 {
+	if (params->dict_sz) {
+		pr_err("lzo: dictionary is not supported\n");
+		return -EOPNOTSUPP;
+	}
+	if (params->level != ZCOMP_PARAM_NOT_SET) {
+		pr_err("lzo: compression level is not supported\n");
+		return -EOPNOTSUPP;
+	}
 	return 0;
 }
 
diff --git a/drivers/block/zram/backend_lzorle.c b/drivers/block/zram/backend_lzorle.c
index 10640c96cbfc..58f7ddf5a55f 100644
--- a/drivers/block/zram/backend_lzorle.c
+++ b/drivers/block/zram/backend_lzorle.c
@@ -12,6 +12,14 @@ static void lzorle_release_params(struct zcomp_params *params)
 
 static int lzorle_setup_params(struct zcomp_params *params)
 {
+	if (params->dict_sz) {
+		pr_err("lzo-rle: dictionary is not supported\n");
+		return -EOPNOTSUPP;
+	}
+	if (params->level != ZCOMP_PARAM_NOT_SET) {
+		pr_err("lzo-rle: compression level is not supported\n");
+		return -EOPNOTSUPP;
+	}
 	return 0;
 }
 
diff --git a/drivers/block/zram/backend_zstd.c b/drivers/block/zram/backend_zstd.c
index 5fabc3e7e975..e071fa584f6b 100644
--- a/drivers/block/zram/backend_zstd.c
+++ b/drivers/block/zram/backend_zstd.c
@@ -60,6 +60,11 @@ static int zstd_setup_params(struct zcomp_params *params)
 	params->drv_data = zp;
 	if (params->level == ZCOMP_PARAM_NOT_SET)
 		params->level = zstd_default_clevel();
+	else if (params->level < zstd_min_clevel() ||
+		 params->level > zstd_max_clevel()) {
+		pr_err("zstd: invalid compression level %d\n", params->level);
+		goto error;
+	}
 
 	zp->cprm = zstd_get_params(params->level, PAGE_SIZE);
 
-- 
2.43.7


  parent reply	other threads:[~2026-08-03 14:13 UTC|newest]

Thread overview: 81+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-27  7:02 [PATCH 1/3] zram: fix zstd dict use-after-free on per-CPU error path Haoqin Huang
2026-06-27  7:02 ` [PATCH 2/3] zram: add per-backend capability flags and validate parameters early Haoqin Huang
2026-07-24  5:27   ` Sergey Senozhatsky
2026-07-27 16:50     ` haoqin huang
2026-07-28  1:19       ` Sergey Senozhatsky
2026-07-28  9:07         ` haoqin huang
2026-07-28  1:27   ` Sergey Senozhatsky
2026-07-28  9:09     ` haoqin huang
2026-06-27  7:02 ` [PATCH 3/3] zram: reset per-priority params when changing algorithm before init Haoqin Huang
2026-07-24  5:19   ` Sergey Senozhatsky
2026-07-07  7:19 ` [PATCH 1/3] zram: fix zstd dict use-after-free on per-CPU error path Sergey Senozhatsky
2026-07-24  5:17 ` Sergey Senozhatsky
2026-07-27 16:06   ` haoqin huang
2026-07-28  1:21     ` Sergey Senozhatsky
2026-07-28  9:29 ` [PATCH v2 1/5] zram: fix early release of global cdict/ddict in " Haoqin Huang
2026-07-28  9:29   ` [PATCH v2 2/5] zram: make dict update in comp_params_store() atomic Haoqin Huang
2026-07-29  2:30     ` Sergey Senozhatsky
2026-07-29  4:06       ` haoqin huang
2026-07-29  4:16         ` Sergey Senozhatsky
2026-07-29  4:25           ` haoqin huang
2026-07-28  9:29   ` [PATCH v2 3/5] zstd: move ZSTD_MAX_CLEVEL to zstd_lib.h Haoqin Huang
2026-07-29  3:03     ` Sergey Senozhatsky
2026-07-29  4:16       ` haoqin huang
2026-07-29  4:22         ` Sergey Senozhatsky
2026-07-29  4:32           ` haoqin huang
2026-07-29  4:49             ` Sergey Senozhatsky
2026-07-30  2:48               ` haoqin huang
2026-07-28  9:29   ` [PATCH v2 4/5] zram: add per-backend caps and validate parameters early Haoqin Huang
2026-07-29  2:26     ` Sergey Senozhatsky
2026-07-29  3:53       ` haoqin huang
2026-07-28  9:29   ` [PATCH v2 5/5] zram: reset per-priority params when changing algorithm before init Haoqin Huang
2026-07-29  0:34   ` [PATCH v2 1/5] zram: fix early release of global cdict/ddict in per-CPU error path Andrew Morton
2026-07-29  2:49     ` Sergey Senozhatsky
2026-07-29  3:33     ` haoqin huang
2026-07-29  2:20   ` Sergey Senozhatsky
2026-07-29  3:40     ` haoqin huang
2026-07-29  2:40   ` Sergey Senozhatsky
2026-07-30  2:52   ` [PATCH v3 0/5] zram: fix zstd per-CPU error path and add parameter validation Haoqin Huang
2026-07-30  2:52     ` [PATCH v3 1/5] zram: do not release zstd params in per-CPU error path Haoqin Huang
2026-07-30  2:52     ` [PATCH v3 2/5] zram: reject zero-size dictionary Haoqin Huang
2026-07-30  2:52     ` [PATCH v3 3/5] zram: add level validation in zstd setup_params Haoqin Huang
2026-07-30  3:10       ` Sergey Senozhatsky
2026-07-30  5:55         ` haoqin huang
2026-07-30  2:52     ` [PATCH v3 4/5] zram: add per-backend caps and validate parameters early Haoqin Huang
2026-07-30  3:14       ` Sergey Senozhatsky
2026-07-30  5:57         ` haoqin huang
2026-07-30  2:52     ` [PATCH v3 5/5] zram: reset per-priority params when changing algorithm before init Haoqin Huang
2026-07-30  6:01     ` [PATCH v4 0/4] zram: fix zstd per-CPU error path and add parameter validation Haoqin Huang
2026-07-30  6:01       ` [PATCH v4 1/4] zram: do not release zstd params in per-CPU error path Haoqin Huang
2026-07-30  6:01       ` [PATCH v4 2/4] zram: reject zero-size dictionary Haoqin Huang
2026-07-30  7:00         ` Sergey Senozhatsky
2026-07-30  6:01       ` [PATCH v4 3/4] zram: validate parameters in each backend's setup_params Haoqin Huang
2026-07-30  7:24         ` Sergey Senozhatsky
2026-08-03 12:20           ` haoqin huang
2026-08-04  4:42             ` Sergey Senozhatsky
2026-08-05  1:26               ` Jaegeuk Kim
2026-07-30  7:35         ` Sergey Senozhatsky
2026-07-30  6:01       ` [PATCH v4 4/4] zram: reset per-priority params when changing algorithm before init Haoqin Huang
2026-07-30  7:28         ` Sergey Senozhatsky
2026-08-03 14:12       ` [PATCH v5 0/4] zram: fix zstd error paths and add parameter validation Haoqin Huang
2026-08-03 14:12         ` [PATCH v5 1/4] zram: do not release zstd global params from error paths Haoqin Huang
2026-08-03 14:12         ` [PATCH v5 2/4] zram: reject zero-size dictionary Haoqin Huang
2026-08-04  5:32           ` Sergey Senozhatsky
2026-08-04  7:15             ` haoqin huang
2026-08-03 14:12         ` Haoqin Huang [this message]
2026-08-04  5:36           ` [PATCH v5 3/4] zram: validate parameters in each backend's setup_params Sergey Senozhatsky
2026-08-04  7:02             ` haoqin huang
2026-08-04  8:30               ` Sergey Senozhatsky
2026-08-04  5:48           ` Sergey Senozhatsky
2026-08-04  7:13             ` haoqin huang
2026-08-04  8:28               ` Sergey Senozhatsky
2026-08-03 14:12         ` [PATCH v5 4/4] zram: reset per-priority params when changing algorithm before init Haoqin Huang
2026-08-04  9:38         ` [PATCH v6 0/5] zram: fix zstd error paths and add parameter validation Haoqin Huang
2026-08-04  9:38           ` [PATCH v6 1/5] zram: do not release zstd global params from error paths Haoqin Huang
2026-08-04  9:38           ` [PATCH v6 2/5] zram: reject zero-size dictionary Haoqin Huang
2026-08-04  9:38           ` [PATCH v6 3/5] zram: add pr_fmt to backend files Haoqin Huang
2026-08-04  9:38           ` [PATCH v6 4/5] zram: validate parameters in each backend's setup_params Haoqin Huang
2026-08-04  9:38           ` [PATCH v6 5/5] zram: reset per-priority params when changing algorithm before init Haoqin Huang
2026-08-04  9:53           ` [PATCH v6 0/5] zram: fix zstd error paths and add parameter validation Sergey Senozhatsky
2026-08-04  9:55             ` Sergey Senozhatsky
2026-08-04 19:55           ` Andrew Morton

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=20260803141256.60599-4-haoqinhuang7@gmail.com \
    --to=haoqinhuang7@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=axboe@kernel.dk \
    --cc=dsterba@suse.com \
    --cc=haoqinhuang@tencent.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=minchan@kernel.org \
    --cc=senozhatsky@chromium.org \
    --cc=terrelln@fb.com \
    --cc=zigiwang@tencent.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