From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794590689; b=kHhPMXHOO1T5e5ep8EzdeUcHGIQOF7mVOiOHzJKc/HpbVoQJNSAPfmIYrVzZfov+4/Jw KYCM6PKl5ikOhDHl3YnkU6go3nEa4znE7Vbh2j1cM2VE/eH0VsifsdpS7ZLP3zLGcZEeo +BzKHyKLMrM6RyQRnnjGdrDFRxzgiqFqoIOtxLPwkR9Nmkh22Wn8gyyYQnjzruMExSLlf 5CoHzZJubxY+QRhxS0zg8BGHoSHYlFEgfU4UpHvKAYjpnMXeK8ctF5vRVP5iEpxG8+Jx9 RUaXJR0aDrKgq60Q68S6tpH7ZZqT9n7o4HWF1eIogdwAekD68hJZoPzN8HthMyvxGLA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794590689; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=kGQrFRFVOd4oQnFoxmEokg0hI9PsJhB56uZHVjsyXjo=; b=h/t/VIX3CAAUOpOfuiiI5SNN4YWZtxYn1FXykQq2dvH9m6TT5BfuZQfAysUb+T1sRZWd ThQTaxHyPXCKUJh9SxsaGr+Se02YJ16LrRfbIOpa8AwbZEwh5zA+9FLz9wnDh9ACyi/mX INRkWWBz1Cr6ZLvofFzalrpfcMNk760n+sP+c8BVZhO+q1L1bI3ZXH+SV9CbYO4Q83e9M HfuEE8f8J9H8tYpE57kTxmlD3q/2hwzIi5ebmf4Zl+zdnMFqbpWa59AiyZFJmJhVeGGLc Ndz8BIUeVxb9NOwmTRuWfWSSBishhDSAjZjTtHeGQqAnn8+RkDzOYCCD5Fc+8BjEL2A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Y6ykitnT; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E12BE606B216; Fri, 13 Nov 2026 17:24:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Y6ykitnT Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C7721F000C4; Fri, 13 Nov 2026 17:24:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794590688; bh=kGQrFRFVOd4oQnFoxmEokg0hI9PsJhB56uZHVjsyXjo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Y6ykitnTzVK8kCitEQMiQVZm+TtDiS/YmTiRDgCewTzHFV3UqBlX7LW4HS6qz1+IN lQBEQJ5KFOJRTIfHHEJjrmSC9vzfCg6zSXvBv2f0wbEyr9VX2AQXwQYjNtK/6c+pUN k2lQkqyNCcxBKsKd4qg8Xls5RwK388spKDEwL7nU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Kaixuan Li , Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 6.18 599/686] f2fs: bound the SIT/NAT bitmaps by the checkpoint pack Date: Fri, 13 Nov 2026 10:52:12 -0500 Message-ID: <20261113153842.228179241@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153820.902362109@linuxfoundation.org> References: <20261113153820.902362109@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kaixuan Li [ Upstream commit 080833a32fd5dc10b3acf2fa9af9b3213e6cb617 ] sit_ver_bitmap_bytesize and nat_ver_bitmap_bytesize are used as memcpy lengths into and out of sbi->ckpt, which is sized from cp_payload alone, and nothing compares either length against that allocation. sanity_check_ckpt() has checked these two fields since c77ec61ca0a4, which added them after a crafted image overran build_sit_info(). That check ties each length to a segment count; it never compares either against the allocation, which is the half this adds. Mounting over-reads in build_sit_info() and build_node_manager(), and the first checkpoint writes the same lengths back through the same pointers, so the over-read's contents reach the on-disk checkpoint. An unmount is enough; the filesystem does not have to be used. Bound both ends the way __bitmap_ptr() lays them out. The three branches differ, so a single sum of the two lengths would still admit a small overflow when cp_payload is non-zero. Fixes: 39a53e0ce0df ("f2fs: add superblock and major in-memory structure") Cc: stable@kernel.org Signed-off-by: Kaixuan Li Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim [ sashal: replaced the two F2FS_BLKSIZE(sbi) calls with the F2FS_BLKSIZE constant ] Signed-off-by: Sasha Levin --- fs/f2fs/super.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 69d36e1a301bf..93e6575706add 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -4128,6 +4128,7 @@ int f2fs_sanity_check_ckpt(struct f2fs_sb_info *sbi) block_t avail_node_count, valid_node_count; unsigned int nat_blocks, nat_bits_bytes, nat_bits_blocks; unsigned int sit_blk_cnt; + unsigned long long ckpt_size, sit_end, nat_end; int i, j; total = le32_to_cpu(raw_super->segment_count); @@ -4259,6 +4260,29 @@ int f2fs_sanity_check_ckpt(struct f2fs_sb_info *sbi) return 1; } + /* + * Nothing above ties the bitmap lengths to sbi->ckpt, which is + * (1 + cp_payload) blocks. Bound both ends the way __bitmap_ptr() + * lays them out. + */ + ckpt_size = (unsigned long long)(cp_payload + 1) * F2FS_BLKSIZE; + if (__is_set_ckpt_flags(ckpt, CP_LARGE_NAT_BITMAP_FLAG)) { + nat_end = CP_MIN_CHKSUM_OFFSET + sizeof(__le32) + nat_bitmap_size; + sit_end = nat_end + sit_bitmap_size; + } else if (cp_payload > 0) { + nat_end = CP_MIN_CHKSUM_OFFSET + nat_bitmap_size; + sit_end = F2FS_BLKSIZE + sit_bitmap_size; + } else { + sit_end = CP_MIN_CHKSUM_OFFSET + sit_bitmap_size; + nat_end = sit_end + nat_bitmap_size; + } + + if (sit_end > ckpt_size || nat_end > ckpt_size) { + f2fs_err(sbi, "Bitmaps do not fit the checkpoint pack: sit ends at %llu, nat at %llu, pack is %llu bytes", + sit_end, nat_end, ckpt_size); + return 1; + } + if (__is_set_ckpt_flags(ckpt, CP_LARGE_NAT_BITMAP_FLAG) && le32_to_cpu(ckpt->checksum_offset) != CP_MIN_CHKSUM_OFFSET) { f2fs_warn(sbi, "using deprecated layout of large_nat_bitmap, " -- 2.53.0