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 B120043498D; Thu, 17 Sep 2026 19:01:13 +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=1789671682; cv=none; b=UvqstnsceeC4Of08Uf/I++QF3cfB4gme0SdaHWa73NR4Pu/TfcDfwxzlslAV49DmEH1zclC/nWslh1XXzPXq5rVyoKw3EhaTQQrq7ferybuKb8ysAI7eGYccNVvdupEe7MLF24ep8PlPunI0xcvxgpKPwALuSZKh4aonwL2jkiA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789671682; c=relaxed/simple; bh=ipmAJ5GXSkOQ2Zg1WPt5aGu+HXOyBzhKRQjgFEKo8e0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mAr5GZkl+iEEuF9ABnsToGbNmV6D8/hxVbsaUM0iutQTIpr/9VjZsIHeLmSOfZPrudkIN2q5xRIz2KmVyBwhRFg8joI8+iAy/gByxfFM8Uve/he62d7pJcWmMXH98iPrqBgs0mHZcBafgcyKdUgqsXT2B5ueCfEAtkC6LCXt4EI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cS0SZcDh; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cS0SZcDh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07D121F0089E; Thu, 17 Sep 2026 19:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789671660; bh=KAClkUbWyHK5DvS/CNrZOkIMH9C9kelxjeZQ7qRLN7M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cS0SZcDh9T8EvgnzmcDRx+ICTs5+5uOK+S8YvhFuKeLxnBwdNIcgXWWYgV8VjaGHY 58lQ1KG5ewMFSaS8QFWGneEPpxes2p3jrD1wfjmp8BEIJZsr39BJlfhQtANugsR1Ho 7rgfvGoZ2chCqaF3p3PvHXDNMGqLokxeecA3cn+U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sergey Senozhatsky , Chris Mason , Brian Geffon , David Stevens , Minchan Kim , Richard Chang , Andrew Morton , Sasha Levin Subject: [PATCH 6.12 1011/1102] zram: fixup read_block_state() Date: Thu, 17 Sep 2026 16:15:54 +0100 Message-ID: <20260917151606.128011984@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151539.408551884@linuxfoundation.org> References: <20260917151539.408551884@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sergey Senozhatsky [ Upstream commit 8b05d2d8af817c6a1e23032df51e7ad83030d543 ] ac_time is now in seconds, do not use ktime_to_timespec64() [akpm@linux-foundation.org: remove now-unused local `ts'] [akpm@linux-foundation.org: fix build] Link: https://lkml.kernel.org/r/20260115033031.3818977-1-senozhatsky@chromium.org Signed-off-by: Sergey Senozhatsky Reported-by: Chris Mason Closes: https://lkml.kernel.org/r/20260114124522.1326519-1-clm@meta.com Cc: Brian Geffon Cc: David Stevens Cc: Minchan Kim Cc: Richard Chang Signed-off-by: Andrew Morton [ Stable tree note: The ac_time conversion described above is not present here, so retain the ktime_t conversion and microsecond output. Move the timespec64 temporary into the scan loop instead, allowing the follow-up bounds fix to move nr_pages initialization under init_lock cleanly. ] Stable-dep-of: 391f057f44a5 ("zram: fix out-of-bounds access in read_block_state()") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/block/zram/zram_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -869,7 +869,6 @@ static ssize_t read_block_state(struct f ssize_t index, written = 0; struct zram *zram = file->private_data; unsigned long nr_pages = zram->disksize >> PAGE_SHIFT; - struct timespec64 ts; kbuf = kvmalloc(count, GFP_KERNEL); if (!kbuf) @@ -884,6 +883,7 @@ static ssize_t read_block_state(struct f for (index = *ppos; index < nr_pages; index++) { int copied; + struct timespec64 ts; zram_slot_lock(zram, index); if (!zram_allocated(zram, index))