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 v6 2/5] zram: reject zero-size dictionary
Date: Tue,  4 Aug 2026 17:38:38 +0800	[thread overview]
Message-ID: <20260804093841.67920-3-haoqinhuang7@gmail.com> (raw)
In-Reply-To: <20260804093841.67920-1-haoqinhuang7@gmail.com>

From: Haoqin Huang <haoqinhuang@tencent.com>

kernel_read_file_from_path() already rejects empty files (i_size <= 0)
and returns -EINVAL, but the current implementation only checks for
sz < 0 without logging any information. Use sz == 0 to reject the
zero-size case and print distinct error messages for each failure type.

Signed-off-by: Haoqin Huang <haoqinhuang@tencent.com>
Signed-off-by: Rongwei Wang <zigiwang@tencent.com>
---
 drivers/block/zram/zram_drv.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index cfa98846ac48..f73e30b61067 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1700,8 +1700,16 @@ static int comp_params_store(struct zram *zram, u32 prio, s32 level,
 						INT_MAX,
 						NULL,
 						READING_POLICY);
-		if (sz < 0)
+		if (sz < 0) {
+			pr_err("failed to load dictionary %s (err=%zd)\n",
+			       dict_path, sz);
+			return sz;
+		}
+		if (sz == 0) {
+			pr_err("failed to load dictionary %s (empty file)\n",
+			       dict_path);
 			return -EINVAL;
+		}
 	}
 
 	zram->params[prio].dict_sz = sz;
-- 
2.43.7


  parent reply	other threads:[~2026-08-04  9:39 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         ` [PATCH v5 3/4] zram: validate parameters in each backend's setup_params Haoqin Huang
2026-08-04  5:36           ` 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           ` Haoqin Huang [this message]
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=20260804093841.67920-3-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