From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f1.google.com (mail-pj2-f1.google.com [74.125.227.129]) (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 55D82345725 for ; Thu, 30 Jul 2026 06:02:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.129 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785391327; cv=none; b=rUcJncZaeDfTJXumqOlQnFSq09tCwUwPExDlF+c+deF8RXQ7E+3cOkiBTYPHpcZ7cGPIpC+voW8iDSHk3q2KEHZg/l3Y9sdxSZ4PEmhkqma6T+7TyMjAg8o+PEIB1JBLxSIAunDTbhtlztSXpIj5Hpm0WGOaCGJ6unOQyVYyWGQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785391327; c=relaxed/simple; bh=OVI3grYltlw8TEMzAc6RccUMxHliopAQ4GJh+tnP7m8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O/SoVLixgamvHI3VFMF+Itq7LSPbBlKuNQPFWO6xYjgqUFJRPlDsCwF+TSWXY72BKrV8gn6OgxJ6zbnPXhD2XlTCKm5I6OyIFuV64hJ7opzwzbBDbQlRhrBS6ysdMCWRFx3MuUlJmLLTq9VEKsTVetihJZbjB1n+Mtc0m8ku5W8= 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=DLdfop5+; arc=none smtp.client-ip=74.125.227.129 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="DLdfop5+" Received: by mail-pj2-f1.google.com with SMTP id 98e67ed59e1d1-381072761d4so993490a91.0 for ; Wed, 29 Jul 2026 23:02:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785391322; x=1785996122; 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=sNqtlK3uwCms2Apl6MmALo5xujwy//J/YyXeEh4+pMI=; b=DLdfop5+c2tMZORUs2GKfRuE5hROm7HimA/wZe7FF/A1M5zt/NsEHRA44GZBPaWpYT 90p1KyLGjXFoy9483kF2fHzol+wS9hdljeO7hUtDXGroQqgI1pW7BLo7gQKCAMl4YDP2 PyK8YJRaAqprb94qsis8kO0dlFfFK+M+cN8ItetSNAH6BWhuHWz1SRlQgKenHByxypkD 6x4a/0NsQ2Co4Q2818c570VJYw2CkfTxfxtAGWPIyxhWJ81nDPA+/NIfqhNh4yEdaozK FS2YiHicbpP1kIRbpXq+GSRLK5vnHGMj5SSw6JIe2C2hOaON21VFFDvkMRE3OuZ9u8s4 IGkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785391322; x=1785996122; 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=sNqtlK3uwCms2Apl6MmALo5xujwy//J/YyXeEh4+pMI=; b=MzgCa9kZ0rKKhK0R/GKWVvmPXxY5pGDiM0Tl22YMfYKBGYWYYhRJvzDsgLdDvZmVv8 A0onirhMHdRtf2WmS6Q0u2Um0ZFGlPrySBDd4zcB+v91lalcX3NuLjaePfBExMZKQHHJ JN23tq5O37dUhvQ7yFkTaQT8ovrefYOCTZxosUKphJNcDgFkwtd7hEY3XHRjDMa1EsEF iPGfCZ/fOgK5ZiiRhzkJm3nNEwBhfwmBaEDLnGb1vVc92py2otLsOPcScDJuoutG9Zhd X13Byy6p0QP96upEwhBRb+XbieZwxZNShdWi6Kn1LtxInJcA4gDLMTNbmpxp0fCWkffb nHEw== X-Forwarded-Encrypted: i=1; AHgh+RqcLJqE0hBSnG7ruha2C0a8RB9dQc2FPvw+mVXQNPwF4WvBS+1w/2uoSrP/quIHOAIWnuHZ7nwg91tVvzg=@vger.kernel.org X-Gm-Message-State: AOJu0YwaXL27l9ijk5buV85YHtLIQm2kQZ79p7yQQJgoV0hWCu16lTAI e7mVuFzl4/3CZJzd2rYhgNy7ir4knE8z0qimDxqx/hvtNF0XDf0vgbWF X-Gm-Gg: AR+sD101JQtryY+HmVMnP/weAOqgDC8we5hi3bbEZPFgdRInNgtHtAEcdLVwh3xIGua PbagAvujy1aWKnuEy1UoDElG7qfNhEbGvQK+u/yeV9mB+fxhV4A2d21u2x2DQRFkEZ79toBSkWy TYed5AoB5LLmZOVn3CtFxl8ValuaSIB+1S3TUmaJE8KEWHlFt06gQSLtlvHZrERgWGYtTCQ09EH GwGFEwTNPeYpxM/rTy3p/XmyHNRuxwRS0XRaHtPZt8okbFuCqx1lFGvEO0nKazDcIOo6db8UpaA qOKkI6oWFgJexPUZ30cKBU3UdTX9tXQBPssKkZARDTkOkuTjJ+IQAGqv92ozDiTPxzKPzNUCtxH 64K4q3Yc1W2TURKSZzL3mrQ2Vx6juqjeZXCIQRiCmrSgz7nL+Bbkd4CjatTvPIaPBDdlQW3x2DY xl+Oszq0+062tg2e4it4nhQENAv6YaMhPcqEuz4HoH06rg2kYXzVkGzR9fbwfe1KLwe1W34zoGi KH2eM39oxAQu3nCc3MnosR1OnhjEulWXrKAr8nUrDNs X-Received: by 2002:a17:90b:3811:b0:38e:79f:76ad with SMTP id 98e67ed59e1d1-38f9bece571mr1204259a91.23.1785391322053; Wed, 29 Jul 2026 23:02:02 -0700 (PDT) Received: from HAOQINHUANG-MC0.tencent.com ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f9b42d6c8sm430737a91.3.2026.07.29.23.01.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Jul 2026 23:02:01 -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 v4 2/4] zram: reject zero-size dictionary Date: Thu, 30 Jul 2026 14:01:31 +0800 Message-ID: <20260730060133.80233-3-haoqinhuang7@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20260730060133.80233-1-haoqinhuang7@gmail.com> References: <20260730025240.17724-1-haoqinhuang7@gmail.com> <20260730060133.80233-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: 8bit From: Haoqin Huang 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 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index ace65c586072..0223fd83bbba 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1709,8 +1709,11 @@ 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("zram: failed to load dictionary %s (err=%zd)\n", + dict_path, sz); return -EINVAL; + } } zram->params[prio].dict_sz = sz; -- 2.43.7