From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 53A8A346E54 for ; Tue, 25 Aug 2026 01:53:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787622840; cv=none; b=rBq4jKPm4bFQX1rshT96O7OkuOm4jIlpDs3KAkjhgfhybCzMBQf6xLWKXXkVdZy4t2m68ku+zMJqj+AanuhZXoy6MQDV7XD/yV8wu5pZOE7ClrLN8vzn0dK2oC8nT9D6QF+Y/Y+sgerLaKJJ8nCQEMNqrWawgvWt0Bb98F5IuQE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787622840; c=relaxed/simple; bh=tD4NHRMOa+YS3AD4Q1jOd+L8yMoidhg/JXb+O70RVHU=; h=Date:To:From:Subject:Message-Id; b=lixjSgAUAH96SbHfaHSlI449Xdi7jw2Pqm0lCNROrcEmqyaq5D8LThsLItkXcXDMnIHHktDcB4TeUvpDh8WYr47gkBwB1cBV1wlANKbhd0pZ7g4GZgBhEv7DXpQw9KGCxMLNcBhZ1ki2TxozgbxfXhP0mrmUMBj3e3OleXx1jyg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=Qbw5GC/J; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="Qbw5GC/J" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A9651F000E9; Tue, 25 Aug 2026 01:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1787622839; bh=sm6St/iwX/S3uetgBSwpJhgiCQG3cTzDQp89yQhvEiQ=; h=Date:To:From:Subject; b=Qbw5GC/J+D/Fs3R8K+MlJtd3ZuFFoM2mR44/3IieAlQs/YC4H7l5jexVC9yPyS3KA 6rXYCeKoGHlh36OocFHIffq+BDQ5ABMW+etx7hBuAlJmcHVLb0PvmyWFF7IO2k50HO QVGxy7NzN9WK+L+QbFIHMC33sREtc9HNrwLQDKK0= Date: Mon, 24 Aug 2026 18:53:58 -0700 To: mm-commits@vger.kernel.org,zigiwang@tencent.com,terrelln@fb.com,senozhatsky@chromium.org,minchan@kernel.org,dsterba@suse.com,axboe@kernel.dk,haoqinhuang@tencent.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] zram-validate-parameters-in-each-backends-setup_params.patch removed from -mm tree Message-Id: <20260825015359.2A9651F000E9@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: zram: validate parameters in each backend's setup_params has been removed from the -mm tree. Its filename was zram-validate-parameters-in-each-backends-setup_params.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Haoqin Huang Subject: zram: validate parameters in each backend's setup_params Date: Tue, 4 Aug 2026 17:38:40 +0800 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. Link: https://lore.kernel.org/20260804093841.67920-5-haoqinhuang7@gmail.com Signed-off-by: Haoqin Huang Signed-off-by: Rongwei Wang Reviewed-by: Sergey Senozhatsky Tested-by: Sergey Senozhatsky Cc: David Sterba Cc: Jens Axboe Cc: Minchan Kim Cc: Nick Terrell Signed-off-by: Andrew Morton --- drivers/block/zram/backend_842.c | 8 ++++++++ drivers/block/zram/backend_deflate.c | 13 ++++++++++++- drivers/block/zram/backend_lz4.c | 6 +++++- drivers/block/zram/backend_lz4hc.c | 12 +++++++++++- drivers/block/zram/backend_lzo.c | 8 ++++++++ drivers/block/zram/backend_lzorle.c | 8 ++++++++ drivers/block/zram/backend_zstd.c | 7 ++++++- 7 files changed, 58 insertions(+), 4 deletions(-) --- a/drivers/block/zram/backend_842.c~zram-validate-parameters-in-each-backends-setup_params +++ a/drivers/block/zram/backend_842.c @@ -15,6 +15,14 @@ static void release_params_842(struct zc static int setup_params_842(struct zcomp_params *params) { + if (params->dict_sz) { + pr_err("dictionary is not supported\n"); + return -EOPNOTSUPP; + } + if (params->level != ZCOMP_PARAM_NOT_SET) { + pr_err("compression level is not supported\n"); + return -EOPNOTSUPP; + } return 0; } --- a/drivers/block/zram/backend_deflate.c~zram-validate-parameters-in-each-backends-setup_params +++ a/drivers/block/zram/backend_deflate.c @@ -24,8 +24,19 @@ static void deflate_release_params(struc static int deflate_setup_params(struct zcomp_params *params) { - if (params->level == ZCOMP_PARAM_NOT_SET) + if (params->dict_sz) { + pr_err("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("invalid compression level %d\n", params->level); + return -EINVAL; + } + if (params->deflate.winbits == ZCOMP_PARAM_NOT_SET) { params->deflate.winbits = DEFLATE_DEF_WINBITS; } else { --- a/drivers/block/zram/backend_lz4.c~zram-validate-parameters-in-each-backends-setup_params +++ a/drivers/block/zram/backend_lz4.c @@ -32,8 +32,12 @@ static int lz4_setup_params(struct zcomp LZ4_stream_t *dict_stream; int ret; - if (params->level == ZCOMP_PARAM_NOT_SET) + if (params->level == ZCOMP_PARAM_NOT_SET) { params->level = LZ4_ACCELERATION_DEFAULT; + } else if (params->level < LZ4_ACCELERATION_DEFAULT) { + pr_err("invalid compression level %d\n", params->level); + return -EINVAL; + } if (!params->dict || !params->dict_sz) return 0; --- a/drivers/block/zram/backend_lz4hc.c~zram-validate-parameters-in-each-backends-setup_params +++ a/drivers/block/zram/backend_lz4hc.c @@ -22,8 +22,18 @@ static void lz4hc_release_params(struct static int lz4hc_setup_params(struct zcomp_params *params) { - if (params->level == ZCOMP_PARAM_NOT_SET) + if (params->level == ZCOMP_PARAM_NOT_SET) { params->level = LZ4HC_DEFAULT_CLEVEL; + } else if (params->level < 1 || params->level > LZ4HC_MAX_CLEVEL) { + /* + * Use < 1 rather than < LZ4HC_MIN_CLEVEL here because + * LZ4HC_compress_generic() only clamps levels below 1 + * (levels 1 and 2 are valid). LZ4HC_MIN_CLEVEL (3) is + * advisory and not enforced by the library. + */ + pr_err("invalid compression level %d\n", params->level); + return -EINVAL; + } return 0; } --- a/drivers/block/zram/backend_lzo.c~zram-validate-parameters-in-each-backends-setup_params +++ a/drivers/block/zram/backend_lzo.c @@ -14,6 +14,14 @@ static void lzo_release_params(struct zc static int lzo_setup_params(struct zcomp_params *params) { + if (params->dict_sz) { + pr_err("dictionary is not supported\n"); + return -EOPNOTSUPP; + } + if (params->level != ZCOMP_PARAM_NOT_SET) { + pr_err("compression level is not supported\n"); + return -EOPNOTSUPP; + } return 0; } --- a/drivers/block/zram/backend_lzorle.c~zram-validate-parameters-in-each-backends-setup_params +++ a/drivers/block/zram/backend_lzorle.c @@ -14,6 +14,14 @@ static void lzorle_release_params(struct static int lzorle_setup_params(struct zcomp_params *params) { + if (params->dict_sz) { + pr_err("dictionary is not supported\n"); + return -EOPNOTSUPP; + } + if (params->level != ZCOMP_PARAM_NOT_SET) { + pr_err("compression level is not supported\n"); + return -EOPNOTSUPP; + } return 0; } --- a/drivers/block/zram/backend_zstd.c~zram-validate-parameters-in-each-backends-setup_params +++ a/drivers/block/zram/backend_zstd.c @@ -60,8 +60,13 @@ static int zstd_setup_params(struct zcom return -ENOMEM; params->drv_data = zp; - if (params->level == ZCOMP_PARAM_NOT_SET) + 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("invalid compression level %d\n", params->level); + goto error; + } zp->cprm = zstd_get_params(params->level, PAGE_SIZE); _ Patches currently in -mm which might be from haoqinhuang@tencent.com are