From nobody Fri Oct 2 08:26:26 2026 Received: from mail-pj2-f0.google.com (mail-pj2-f0.google.com [74.125.227.128]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 099922F7EEE for ; Mon, 3 Aug 2026 14:13:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.128 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785766408; cv=none; b=HxT7ZzqXkUrqlUlQiyILiP6iHU860vfuSUJEGUE/kT2xOoJ8BIF4anUbAX35CSfvCPsSk+cCif9qDsmxgjKGM+ltTWX1KL7Hk6nX1h4+lgaszN12l6PPB+7Kc01TQe2WSm/2DNxGW/wR3bwKUfro8bZ2Z0n0AfGRP9gYhKIc8KI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785766408; c=relaxed/simple; bh=SXp/5/NEZwyQ2T6u0pa5PIg41eZcqZD/pweYtKijIkA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bscleX2ljNnjOSSiGi1izyAit5iG3Ufb3+uXqFFevx6uN15uR7EJIjq+jTntSnmL86cqZ5AY/0qasE11Zx/8MeQ8sk9EJ4sxUo41ChHl0UXdygEfD9vso/EY5rApuhCVpfntCbe5iU3HMUpupAk71BLm63wwI9S1M7hF5bM1i5E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UGGhO4e3; arc=none smtp.client-ip=74.125.227.128 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UGGhO4e3" Received: by mail-pj2-f0.google.com with SMTP id d9443c01a7336-2cc6bb7476dso4922975ad.0 for ; Mon, 03 Aug 2026 07:13:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785766405; x=1786371205; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=u40wfBemGswFY3vLVA1SulOXv0qgjlAi2ZUYZH01yXg=; b=UGGhO4e3FLuJaWaVXL3qg9GXTr2Lo0y+6EHe0EqbGl1yuDT6ipHhUq5qJx92ncCe9f oQtgw+A/zFSN7uiOTav+FndFUn+hqpkC0BWG0oKJ3mqETKN5qLPGN/hA5ioGoP6nWn+Y XTBwF5LzDa1DOL1Kw1XVTE5gXt3b7vPqrzYJ9x5azdyT/o7NEPMkZeAoCsRtkgONVFHR LIDn6jhCao6/xkdn1qE7yZugQJNBkxY58Jl2XHswmAKKdkewvf5d/HlaxC+7gg81FF5p h8lmCJnKqlMGWkExheMJEUm3vTjvno9XZTFIZK65TReNV6SH1OiQeN8hM8CMl1V6yI/l AJkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785766405; x=1786371205; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=u40wfBemGswFY3vLVA1SulOXv0qgjlAi2ZUYZH01yXg=; b=TCntcyB1+jkTNiPgMNHU6m/VoWXnj0xcmQCB7OcNwR3bcRr1mwiTEsMMehnHauJ+L0 LVr/2S5V3nHu+kac3xdHzSb1cTu+2OFy6O5re78xQJLGraxf8UW3FWQJsHWRF6BU81F8 dIjRz5Bp36zM46rLtuV5XXf8Sa+e9YQuYbn0M4auJajC7V1p6L+AiFUuDnbwSKNjzViU mTK15LwgdRXqjFr7CWM6oQI8htPZok3Ty64lD5aHNAvTS0lmAiSUKNNsdWaoKweE+O7a Ixy8hlx6GXoUW585s9AjRGXEXw2EcU9cKyTZWvieftSmUBEmNmZGkzDl/IrKFTsPnZk1 5mPw== X-Forwarded-Encrypted: i=1; AHgh+Ronl8Y9H1f0qyrN33laUXssRFO89KlzPqHKf+UyJBZT6ricMseXBQNQIJXXAcMWBXri3Upr9Fr99EbzZX0=@vger.kernel.org X-Gm-Message-State: AOJu0YwAgOibcVblUERFjFIG5zOl2R8WoyltnQ7Jy9byMilV4bE7dVDZ DWwBTGwHeKnjyJoNXY2DZMsEChpVwTHvzf5aeK0bXyzr9Usv+6KmbeTf X-Gm-Gg: AR+sD10oFXJV++xT3yWglUcgg+5Obt6EYcqNcckxBarQ38NoqLgr9OFFljhGe6RikPU 8ztnvkhYzT+XIHq4HoOvUeB4vQi13MHwz2ZQ6PFfoqWoBqR73mflCbrhV4NNSnugQ7KDpRJ9+mu 3B+rO2A7ZV3/G+Ejl089r5tmWj1aAQjqKHVwOCkZ50zYxTLlmUkz9Ps+kdPODx9M/v7xpYyb7FA HMgSyn0bL7rn/BgqcCb6yG8HpadOlXmwv/m6gCR0UBfsuTFAL9YwZ/4/1JWP0/K/n052L6jMj7i LOjgkkmBbM0yXa4vSTWDKSZVZnfVvD2+ZkcC2XBV5F+4hJTO1cmx49+c+Yu8y0CgLVWXEk8HkAs oDHoeGCUsOSyElzMxml5qWf3kbBnS+bd+jlx7COxOeIUmIsRBE6P5Bd5Id/vCychawmYXhuTmpF Uv0N6X3iJuqj7sqfkfM0XqTCxKEkeQ7r2KlDtsVJOK0vJDGD9EVtbMmpJFTzvy7TnoK2CY6FzA3 9GrDTLYlmx1cD2EvAIgLttfnA+GaLzbFycYI9Jr/jjh X-Received: by 2002:a05:6a00:338c:b0:848:7bcf:9a9a with SMTP id d2e1a72fcca58-84ee4811e12mr8876358b3a.1.1785766405283; Mon, 03 Aug 2026 07:13:25 -0700 (PDT) Received: from HAOQINHUANG-MC0.tencent.com ([2409:8a00:1a20:7370:cd52:f161:9c8a:ee77]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84edc29ebeasm3818360b3a.30.2026.08.03.07.13.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 03 Aug 2026 07:13:23 -0700 (PDT) From: Haoqin Huang To: Minchan Kim , Sergey Senozhatsky Cc: Jens Axboe , Nick Terrell , David Sterba , Andrew Morton , linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Haoqin Huang , Rongwei Wang Subject: [PATCH v5 1/4] zram: do not release zstd global params from error paths Date: Mon, 3 Aug 2026 22:12:53 +0800 Message-ID: <20260803141256.60599-2-haoqinhuang7@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20260803141256.60599-1-haoqinhuang7@gmail.com> References: <20260730060133.80233-1-haoqinhuang7@gmail.com> <20260803141256.60599-1-haoqinhuang7@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Haoqin Huang zstd_setup_params() creates global cdict and ddict stored in params->drv_data, shared across all per-CPU contexts. The per-CPU zstd_create() error path called zstd_release_params(), which freed those globally-shared objects. This is a layering violation: a per-CPU callback should only clean up its own context, not release resources owned by the compression lifecycle. zstd_setup_params() called zstd_release_params() on its own error path as well, but zcomp_init() already calls release_params() when setup fails, so this is redundant. Remove zstd_release_params() from both error paths. Signed-off-by: Haoqin Huang Signed-off-by: Rongwei Wang --- drivers/block/zram/backend_zstd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/block/zram/backend_zstd.c b/drivers/block/zram/backend= _zstd.c index d00b548056dc..5fabc3e7e975 100644 --- a/drivers/block/zram/backend_zstd.c +++ b/drivers/block/zram/backend_zstd.c @@ -85,7 +85,6 @@ static int zstd_setup_params(struct zcomp_params *params) return 0; =20 error: - zstd_release_params(params); return -EINVAL; } =20 @@ -161,7 +160,6 @@ static int zstd_create(struct zcomp_params *params, str= uct zcomp_ctx *ctx) return 0; =20 error: - zstd_release_params(params); zstd_destroy(ctx); return -EINVAL; } --=20 2.43.7 From nobody Fri Oct 2 08:26:26 2026 Received: from mail-pz2-f1.google.com (mail-pz2-f1.google.com [74.125.228.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CAEB22D23A6 for ; Mon, 3 Aug 2026 14:13:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785766415; cv=none; b=BUdiG+sTCCoDfq4gA3mJ2at2nNge8onNkr5HFBc3eT6ulCQb89LrM30tPjBFgx4N97eGk+G9YeTPLtfBU0/D9KHvchGYrxxpVU7rJTS7yjU0YYXPGwPCRz8eizHmVIIeqOIIBjiwbp1uullyjPWPJDKMxEgI2DMi4QSPM5vV9NE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785766415; c=relaxed/simple; bh=D1O3BtqXhi2bbxwPO54hut6y0QtxHvtDzf+Ku4Ih2rY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NCpgswtVq6cniPG5KUiXj3am5okarSEgw4jS8TYc05qWvxJImdBd7YqrjH1pFbsXMebMHP3EOEIi0DRwezwQNCFPbBoKzqHOuNOBY4nzpFTbwVFwuNa+6PiAKuqMRihli1+tt5QAqFfSWdI0m4B1/ZbwBFvo8qyClz5VoLskjXs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RxhZZzAn; arc=none smtp.client-ip=74.125.228.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RxhZZzAn" Received: by mail-pz2-f1.google.com with SMTP id 41be03b00d2f7-ca7d1dc4554so1691501a12.1 for ; Mon, 03 Aug 2026 07:13:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785766413; x=1786371213; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Vl3fhYiohrdIlS9g/uSFV7y+uIWeNZ5gxUBY7VDbnfU=; b=RxhZZzAn6FR1biQ/Lju8tYQBYPReGYQzpK0wljSfF3EQO3VHyEHgxcf/TslfDgO/Kb PY6fH6pTl8BgLpq0SC+MWU8za4dby4z+KUSMk5Po/qyz8CzUH5g9df14yIM35L5JwFgf 6tOCtxSCybRj0BEzklZwsEoZlwh3CApxx7CF5harsNA1OaO8ksI0f+OoSGpkB7wVulJu cTKkk0kjVzBJNOiNtVFi7ObRhKV01cQmDD3cROYqzjpAF5XW8kwY3+sTkFsR9Ar6kESC 3diGKJWxiBUyyeRl3URUpyNsw4ZBj88L5dteJGFk7ML+Epye2y4OvOvBiQULqCE6gQcY NrHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785766413; x=1786371213; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Vl3fhYiohrdIlS9g/uSFV7y+uIWeNZ5gxUBY7VDbnfU=; b=sevULAD1030mGR3N0asgKcEzghTMyl34Mr/ErHWfxMMdrIUWUcDpHfbpakmccXQffK yDgPShItCwXv+qMTQEG/6utMdW6pvBGw5orPPLAir7rGjX0SrTH8uZyfx+Lo1lgbg+R3 QQhYBIxaSIpCMG4K3VqBrEXSmxMC7qwQ4dNFcRgIDrYpc4VadP6ydILxiZawz3ujKY6H EuMVJ27wsKZYR7XdWRH6Djw1GIqiKRq4+rxK99manFWCbAyeU8eAfszHzubd28BTvzyf eObiWcbBVMehR85idWkXikQAQbFUpPMOZhaAf7a3Xga8xq+2xjpus4gwn6+PqvLT6a3J 98lw== X-Forwarded-Encrypted: i=1; AHgh+Rpr/cVpW3w+IU+KAVWihVppaQI1zwvYBn6XtyDd2tM6p3/96Ao59h+MBS5ctE9Qt9HR5YWFrqCip+YKiVg=@vger.kernel.org X-Gm-Message-State: AOJu0YxXe2sPDYPWIV3i3/DbxusSjIb6aQhb7BKwAyy7u+hCf9ayKE5I LL106kHLOgprtj2N99LH/EdOy7Q1Klsyt10oooxesQB1qdafaTbXvwJy X-Gm-Gg: AR+sD128v9DQt7sb1GcRWRrb+Yne/AXB4c9+E37dXtKXolX03Mqvve4V2V684ZuD74d ig7RdSpV30QSeqr7rRUHIRuJd+TKYAwtjqgFAMiKaGwRXph5bD8wIECG4TH4SkNuA8D4/3nRhlk bz/Zuon7y9GWonoROPoXU5pbEAMKdm8f9243uIcGa3oqdvnkFtx14DWWRz1U7fMrD9HLvgEqnXd eTZv2m9ilphsWXiGkVBgwVC0AurmFpC9TrpO6OGs374yeSa+qA30mNamL65YdoaN3xeUAJVfnri yPtgGqD7uasioBHO0WTsvd7uRCqnaFpLse7xr/staOLbjiYuokqUFI6iP+vr9dFpUenac+Ck0q/ mNyMl+pp5SKNYZCcG9ZjPHrm8Lpn/i8G5rNGT5Xjs5T05Ry3MjgsmjbC9saiGKBhINqgcM2EbcQ k+C3DWhcuJ4MP5jlCT/kfFE/Sbe9qGHkQne9c9W/mXke7/99DheXekvRm5RPD7G7I/5kwegJ1lw OIlIlgArAhExMQQ1A9urVicPLYVyU4X3OWYLKNQlJCx X-Received: by 2002:a05:6a00:1da7:b0:848:2f6e:e537 with SMTP id d2e1a72fcca58-84ee4906dcfmr8420957b3a.75.1785766413022; Mon, 03 Aug 2026 07:13:33 -0700 (PDT) Received: from HAOQINHUANG-MC0.tencent.com ([2409:8a00:1a20:7370:cd52:f161:9c8a:ee77]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84edc29ebeasm3818360b3a.30.2026.08.03.07.13.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 03 Aug 2026 07:13:31 -0700 (PDT) From: Haoqin Huang To: Minchan Kim , Sergey Senozhatsky Cc: Jens Axboe , Nick Terrell , David Sterba , Andrew Morton , linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Haoqin Huang , Rongwei Wang Subject: [PATCH v5 2/4] zram: reject zero-size dictionary Date: Mon, 3 Aug 2026 22:12:54 +0800 Message-ID: <20260803141256.60599-3-haoqinhuang7@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20260803141256.60599-1-haoqinhuang7@gmail.com> References: <20260730060133.80233-1-haoqinhuang7@gmail.com> <20260803141256.60599-1-haoqinhuang7@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Haoqin Huang kernel_read_file_from_path() already rejects empty files (i_size <=3D 0) and returns -EINVAL, but the current implementation only checks for sz < 0 without logging any information. Use sz <=3D 0 to cover the zero-size case and print an error message if dictionary loading fails. Signed-off-by: Haoqin Huang Signed-off-by: Rongwei Wang --- drivers/block/zram/zram_drv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index cfa98846ac48..68e60c9eb8b3 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1700,8 +1700,12 @@ static int comp_params_store(struct zram *zram, u32 = prio, s32 level, INT_MAX, NULL, READING_POLICY); - if (sz < 0) + if (sz <=3D 0) { + pr_err("failed to load dictionary %s (err=3D%zd)\n", + dict_path, sz); + return -EINVAL; + } } =20 zram->params[prio].dict_sz =3D sz; --=20 2.43.7 From nobody Fri Oct 2 08:26:26 2026 Received: from mail-pz2-f1.google.com (mail-pz2-f1.google.com [74.125.228.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 762F7330644 for ; Mon, 3 Aug 2026 14:13:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785766420; cv=none; b=SqxIOyOxgxOL6Kq3+vsM76rHjpglNxHM/atK0uApeMg7KmcetTmeFnOi7jvCaiTKmP6s7/i5R6Lga+KfuatCa5HSHRezNa6ipAu17MTwgXoBohOYIeBIiptldPnzRJ0SOeHh1jL+thgP9EcQ9EBbyIGt1UqyY7x2yW6aF18o0v8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785766420; c=relaxed/simple; bh=snCwLlHVwdQDYtlAPvwM1n1QYprJfHmXHL9lGUbcfg4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SwOJQdbz/H2/ANUKkidlK8r0bpg41WKEiKbRYaGGN+3x2WAULlOTzpeI/3FUGfVZhdopby4tH1y+gB/krCu8LiMKTK6S2x3daj99zWRoWtCTxRyhvH11bzwGXHl+fa3VmC/dwZeE8YwmnOT/B45VpktXBdVDCLoiwm8nyEA5ZU8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JwMztbCZ; arc=none smtp.client-ip=74.125.228.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JwMztbCZ" Received: by mail-pz2-f1.google.com with SMTP id 41be03b00d2f7-ca696c4b152so1230002a12.1 for ; Mon, 03 Aug 2026 07:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785766419; x=1786371219; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Axodgx8kBdbHlZ8xxUIltU+O0hU6tw0N0qpmn8u1aps=; b=JwMztbCZaovPJd7OVfwZcCOrlp8RDQddwWz5s4hbC2StmEs0mrfEz3YZjdwQFDwCl1 +gGCTe7sE5K5dk9QJpFyVedhw80V6LSkGjJ+psz33/YqdK9YdbI/qFGtQc9BPkIWRKLo pt2R8BxuRwWmbHgG2AMkolucoQ96q26iSwqUmyt1YAn13mW9LKT6jo6K2GGG4/OQJVbI Pr4J9eURllod+KgMBjBrCFG+GQ593zHgEVblbASlhDoHDAZ9mlzS5wZ0O9gmmzbtBTVg vWkMEauQHHSU8oyZA1zl/r5V8EPJYaB+MHOJKmeR3UN9XsCLaJmCwLC9s/Be6YVDEcOv AQpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785766419; x=1786371219; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Axodgx8kBdbHlZ8xxUIltU+O0hU6tw0N0qpmn8u1aps=; b=HPUi1KKhHSjT+ztV0zO9/CUZ9uEJYDRMu2QnBfFXGQXR8L0PBuEUGQp+IGOqG+EUYC rL9QUj8oOARxzYf5QNfnH1ritIQX7YLjhSo64W6L1fF492fo2Nc1YH9Q9edf46SIHEL4 CmqnD0ilojq8o0sDZuxMMnH5q8pWY0yODxfKpM8LE0zzACbYKRMgQnGCxWV3T4oo4ZYP gj01pFIWxQe+w1Kic81EP3wASOeCMOSSRU1DsngwtyLo80LeOXcvfTDB651NtFvAGejs E6W1RDs7srBUY0BGCc8HtVlnCuqswzaF1Qe/cqv/2H0eHGLnv5tM8vrxnqZWL/6+95/V jbpA== X-Forwarded-Encrypted: i=1; AHgh+Rp/Qo9EaM2iJGOM1YohwPEH67DwTIMalTpL0xTytSS2HgE9IMpBbOLFli0zXHk20PzAOH108DqY1+i74/I=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5fkECGMKzxnCOnsDmgNqJWXRfCv609IWsjCu9Ar5kLIVutonq 67ygm42pyVUjLodUivIPTQ2Y5v2xtnlU57t90nau2TTnaoB4uDJdg9Sl X-Gm-Gg: AR+sD11V1aJZQgK3tygg73dr30/RvSekUIVV7+2WtJ/+0EmBASky2YX4StiZ8mpkzDA 4PlVlpTPfnDAs8lnf9fKbpJhofAGtUUSU6iC5Z/CAmgNLCJtDQJ1PVqVUh8+/xaHMIirWkBanX6 hKM6YBVyEq3oST4iWM5MI0Gs4LaZVAeJ+boMAIAr1PugLcqoMB5VbsvK81oRIcrUyhHRTcOphnG zcK0Luhy5ow8/8srQwrkTJ21U4g9qwDz4/mR7os/LNwLTxCJDI263NraUmz+w48TOOmiIVSgR4p iS37IXjvxr4EZTR76UzO1R3xKnLWccQ/ThQ/ZW2Tbtuo8lRyLCBuEoLuvKAkDyvVcOEUez5KBtl 1VZ7HyVZ1cwgcM5+BSQcIIai2Tl1atHHEBXjD1ynCh3weTE3/swDo+RR3sxcsFRcgswYbIAxElO xHsZZRpo7tiKE/vl2WZRKhgzw/Tt6P3pjhdB6D2R8XHVd/quIjNtT/XeSIEar5S+Q7ag6h7zc8P 3OSdwJxXLMufx7nBdL2SvE5JwxYo3Cb/g== X-Received: by 2002:a05:6a00:8d6:b0:848:8027:cb6 with SMTP id d2e1a72fcca58-84ee48bc736mr10168089b3a.45.1785766418665; Mon, 03 Aug 2026 07:13:38 -0700 (PDT) Received: from HAOQINHUANG-MC0.tencent.com ([2409:8a00:1a20:7370:cd52:f161:9c8a:ee77]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84edc29ebeasm3818360b3a.30.2026.08.03.07.13.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 03 Aug 2026 07:13:37 -0700 (PDT) From: Haoqin Huang To: Minchan Kim , Sergey Senozhatsky Cc: Jens Axboe , Nick Terrell , David Sterba , Andrew Morton , linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Haoqin Huang , Rongwei Wang Subject: [PATCH v5 3/4] zram: validate parameters in each backend's setup_params Date: Mon, 3 Aug 2026 22:12:55 +0800 Message-ID: <20260803141256.60599-4-haoqinhuang7@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20260803141256.60599-1-haoqinhuang7@gmail.com> References: <20260730060133.80233-1-haoqinhuang7@gmail.com> <20260803141256.60599-1-haoqinhuang7@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Haoqin Huang 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 Signed-off-by: Rongwei Wang --- 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 *para= ms) =20 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 !=3D ZCOMP_PARAM_NOT_SET) { + pr_err("842: compression level is not supported\n"); + return -EOPNOTSUPP; + } return 0; } =20 diff --git a/drivers/block/zram/backend_deflate.c b/drivers/block/zram/back= end_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) =20 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 =3D=3D ZCOMP_PARAM_NOT_SET) params->level =3D 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 =3D=3D ZCOMP_PARAM_NOT_SET) { params->deflate.winbits =3D 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) =20 if (params->level =3D=3D ZCOMP_PARAM_NOT_SET) params->level =3D LZ4_ACCELERATION_DEFAULT; + else if (params->level < LZ4_ACCELERATION_DEFAULT) { + pr_err("lz4: invalid compression level %d\n", params->level); + return -EINVAL; + } =20 if (!params->dict || !params->dict_sz) return 0; diff --git a/drivers/block/zram/backend_lz4hc.c b/drivers/block/zram/backen= d_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 *param= s) { if (params->level =3D=3D ZCOMP_PARAM_NOT_SET) params->level =3D 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; + } =20 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 *para= ms) =20 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 !=3D ZCOMP_PARAM_NOT_SET) { + pr_err("lzo: compression level is not supported\n"); + return -EOPNOTSUPP; + } return 0; } =20 diff --git a/drivers/block/zram/backend_lzorle.c b/drivers/block/zram/backe= nd_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 *p= arams) =20 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 !=3D ZCOMP_PARAM_NOT_SET) { + pr_err("lzo-rle: compression level is not supported\n"); + return -EOPNOTSUPP; + } return 0; } =20 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 =3D zp; if (params->level =3D=3D ZCOMP_PARAM_NOT_SET) params->level =3D 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; + } =20 zp->cprm =3D zstd_get_params(params->level, PAGE_SIZE); =20 --=20 2.43.7 From nobody Fri Oct 2 08:26:26 2026 Received: from mail-pz2-f0.google.com (mail-pz2-f0.google.com [74.125.228.0]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C995409137 for ; Mon, 3 Aug 2026 14:13:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.0 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785766427; cv=none; b=h/z0bEqfYdk1GUYLJ8r2wD0g+0gesK3rNhlziJtMsSExbTqaexwcDW8OQeJmbvNt76rDMNQVaCZpVQO+TqhME76+Oo7WRtf8OxjTPUJ5Wi42x1GAoM62+Z8Sd+PCx59hwgR60u65M7hbCMYQ0wWg8omNnM/x4JW5Tm4uu1z3mUo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785766427; c=relaxed/simple; bh=IuMLjQaPfv4JXSeDcgATZz8vte9WUWSgWRND4Yp1uDY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JGPeY9lekI9S7wHf+PKUYsCbw2CqQCAik5ufN1Hf+OhnRSsIAbBv8WS+XaJvAcCa39R6Dk2DH8lSnsb+0r6Jf5bQL4zXHK43foonbwC0h1IMv4L++PqISpIUFDyeVDeMOzp8FeP5fJlZ6yWO7qYsVckEh/SQc0G/6kCaM33rcc4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ThLV1SyB; arc=none smtp.client-ip=74.125.228.0 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ThLV1SyB" Received: by mail-pz2-f0.google.com with SMTP id 41be03b00d2f7-ca7fcfe1669so1956596a12.0 for ; Mon, 03 Aug 2026 07:13:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785766426; x=1786371226; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=DSnGUH2En7/Tp3ArvxF3zOvp2fk2CBZx8ROlX+KL6MQ=; b=ThLV1SyB7tSmgxZIcYkDjMMnhY4p6Uf4vZgm79wgQVPqEm1WP0trBL4UZAH3rM1nQ5 2HVdXN2S7o3sWnB5+LroAvQE2CqJz4dl/Ernu1KsJcOUl/IhsqOjnaC3fV10lFAkc/Cm /NF9mesY7Y0dOfT3tk2ZbUyksCR7aqjHNJzr9FhJRoX7kX+gqwm294gWtXm3K7GtPYIg Eq0mAQ1hI+qGSvfgYHgCJcgznWIX1RozZ00XukzPfVw0vWpYPKFoesJ/xCnA2/RKTY6k TwlQJJ8oYQGuM2H+MzfKjfTdxhQNkuPiF0NgaRdfyCqmOLfHabyrzI1VkH2eQcbN7oVT 9tSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785766426; x=1786371226; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=DSnGUH2En7/Tp3ArvxF3zOvp2fk2CBZx8ROlX+KL6MQ=; b=N1/RoukFyUcr9QhMgqDz9LFJr4UJ8VLH6Ku2qmcBoPjLDujVS3fOMrGZE6uNq9gwK/ Ft+Q68nGZ/wt0xHt7PcjaInILRf9lZsT6h+mq25J2ydXgurWRbuUSMjuX72sNfd83nAd xQCTW0ZzORxXms///sqHyXTx2NJkOA03YmCSO+FKK9uBC7kYlWJPdVeIt+YVYK/Hl85q RcTuMZYoNDpaNv27Xt9yQesWfYydgE2NN0Nip6ACAZXROMkXc+I2U2BMBO/qmwyb/kni AW9B9iA4oCFoYRKqA3NoJvew3gW62rYGrXg6Ge+O+agdlSkbOMiX41X6RgKU6fgSYFpO YzHQ== X-Forwarded-Encrypted: i=1; AHgh+RqXgW0rl1jBcI3RJ9THgDlLK+ptMAWjW8WjpGIKXhAaRzlLlRv7zIpioQG3gjQQczeI5gAcZ6dn5iwl0q4=@vger.kernel.org X-Gm-Message-State: AOJu0Ywd8cYsoP1s51areA+sVLMdK3B5+fufubVSsCvJB4TvUK/F7ufr MCYGjQwQGZqAd+M2O7vMFoO37yoizuZrl8UJtZmvQfH1GFBuZ0iPJ1Pf X-Gm-Gg: AR+sD11/ltDbgj/TJKu9Q7AsujzNybVm+FtHf4FN73fujYriCINzwSTvRW1ccpgCtx4 p9oUHBjnfwEIS78euDgBKRamzSbLJtFHrRXRMozz5VluVHUEH6TKBbiY8QOlrG43PEbL07t2e+x vbKNbu+gI76S88osaOS2NPL0r8pwlEJJm5bkERwLe1ApIG4wJanSro/fO00VMSb7AxwNPEQvohQ dKbgygVZeH0Z+smtcOgI/jqCjNhPPvN4xoOV1Gqg+zoPaAqq0ERdk1fPD/YdyWlMrP/jAyYRwHr Qt4xh/6pgDxwBOiqovSV5BVgcpor57aNirz1YrZt8IUEOyuGkhij/fAD58/LdXdisJDYKr9b4Ky c/W2H1TgNvKbUVuG44znEfgNsGwGjmqR5ba10/LXQBfn/fHefKaCC1OifKhBWa0IBVoEnx6ZACP pRIY0IAZM0ssG8Mea70BS9kRkbTW0wj32Lc+yqOU+rf5Q51sMmo1IUPh166M6sE8WOHiExHPqZV CySKayaYo/SfIcyVAf7f04xeuzZXuP0tw== X-Received: by 2002:a05:6a00:94f4:b0:848:2f73:9002 with SMTP id d2e1a72fcca58-84ee493f64fmr9115123b3a.75.1785766425596; Mon, 03 Aug 2026 07:13:45 -0700 (PDT) Received: from HAOQINHUANG-MC0.tencent.com ([2409:8a00:1a20:7370:cd52:f161:9c8a:ee77]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84edc29ebeasm3818360b3a.30.2026.08.03.07.13.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 03 Aug 2026 07:13:45 -0700 (PDT) From: Haoqin Huang To: Minchan Kim , Sergey Senozhatsky Cc: Jens Axboe , Nick Terrell , David Sterba , Andrew Morton , linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Haoqin Huang , Rongwei Wang Subject: [PATCH v5 4/4] zram: reset per-priority params when changing algorithm before init Date: Mon, 3 Aug 2026 22:12:56 +0800 Message-ID: <20260803141256.60599-5-haoqinhuang7@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20260803141256.60599-1-haoqinhuang7@gmail.com> References: <20260730060133.80233-1-haoqinhuang7@gmail.com> <20260803141256.60599-1-haoqinhuang7@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Haoqin Huang Parameters validated against one algorithm may be invalid for another (e.g. lz4 accepts level=3D65535 but zstd does not). Although algorithm changes are blocked after disksize is set, they are allowed before device initialization. Reset per-priority params on algorithm change so that stale parameters do not silently carry over. Signed-off-by: Haoqin Huang Signed-off-by: Rongwei Wang --- drivers/block/zram/zram_drv.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 68e60c9eb8b3..cc96b18bf647 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1652,6 +1652,17 @@ static void comp_algorithm_set(struct zram *zram, u3= 2 prio, const char *alg) zram->comp_algs[prio] =3D alg; } =20 +static void comp_params_reset(struct zram *zram, u32 prio) +{ + struct zcomp_params *params =3D &zram->params[prio]; + + vfree(params->dict); + params->level =3D ZCOMP_PARAM_NOT_SET; + params->deflate.winbits =3D ZCOMP_PARAM_NOT_SET; + params->dict_sz =3D 0; + params->dict =3D NULL; +} + static int __comp_algorithm_store(struct zram *zram, u32 prio, const char = *buf) { const char *alg; @@ -1672,20 +1683,10 @@ static int __comp_algorithm_store(struct zram *zram= , u32 prio, const char *buf) } =20 comp_algorithm_set(zram, prio, alg); + comp_params_reset(zram, prio); return 0; } =20 -static void comp_params_reset(struct zram *zram, u32 prio) -{ - struct zcomp_params *params =3D &zram->params[prio]; - - vfree(params->dict); - params->level =3D ZCOMP_PARAM_NOT_SET; - params->deflate.winbits =3D ZCOMP_PARAM_NOT_SET; - params->dict_sz =3D 0; - params->dict =3D NULL; -} - static int comp_params_store(struct zram *zram, u32 prio, s32 level, const char *dict_path, struct deflate_params *deflate_params) --=20 2.43.7