From mboxrd@z Thu Jan 1 00:00:00 1970 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 B9E99214A84; Sat, 12 Sep 2026 12:32:37 +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=1789216358; cv=none; b=UrWbDi91WaWu+G2qLADgoQ40c7TA0Fs3bg4AQLxDanBm7NNuTXtwflM+eAKeDsfofKqZ1bc8G12MGbu8U9kwQLdyD9WWthynB21gfMzGF6nmVe0Z+JgYjfx4ZqVPFLZztOniUStFsipp/g1wHEeIhjsFJj3Xi+1TJIuNMsNGfiQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789216358; c=relaxed/simple; bh=b055+tCSzXj+e0xjQ45ZYdEMSgouvDqdUtdu5H7/xOA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Thbj9QbapWkv6M1t/7o9yQAQYz1lUI33mpItVNIGrREoSETFD23Cs9f2LXTgn6CUGAJ3ps/H27dkdwI2ndX2aJP6sh53LqfUR/wuINAsbyYpAzu/Ojp05EOfz6kqe7Ry07mDpCwA52BzR+zEFAMBnDIDYjxKyY4Go084/oxWd3I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xonFGkzv; 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="xonFGkzv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38BBE1F000FF; Sat, 12 Sep 2026 12:32:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789216357; bh=R+OHtq9lA9msx5DJQp3Ft4hkMD1Q+u3JJywrY1Pl8Wk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xonFGkzveB6BBoNI3MNFlp/pKDLV15GsxWZftFdCS11CG73t9sGlRESSIiQIzHFU+ pyWVGvSfmtKUpkYtdtu5YARjlRL8MAi9AgPmpCRuo2c1z06EgPR5LXlbL40ep2hs/+ cmd1cAN9nDDpSY9ULMO0Q7ayaNNmIfCDkU2M/3T8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Lee , Ryusuke Konishi , Viacheslav Dubeyko , Sasha Levin Subject: [PATCH 6.12 0720/1376] nilfs2: prevent out-of-bounds read in super root block parsing Date: Sat, 12 Sep 2026 08:52:26 +0200 Message-ID: <20260912065623.587617338@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.535295758@linuxfoundation.org> References: <20260912065607.535295758@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: David Lee [ Upstream commit 7cb2f76a6a2ba2130b577cb8ac13e1e46c4fc689 ] super-root inode metadata size is trusted before nilfs_read_inode_common(). Reject super-root inode sizes whose computed on-disk footprint exceeds the filesystem block size. This prevents malformed filesystem images from making nilfs_read_inode_common() read past the end of the super-root block. [ryusuke: clarify the commit title] Fixes: 8a9d2191e9f4 ("nilfs2: operations for the_nilfs core object") Signed-off-by: David Lee Assisted-by: Codex:gpt-5.5 Signed-off-by: Ryusuke Konishi Signed-off-by: Viacheslav Dubeyko Signed-off-by: Sasha Levin --- fs/nilfs2/the_nilfs.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c index ecd71c1908859..6069353bb945a 100644 --- a/fs/nilfs2/the_nilfs.c +++ b/fs/nilfs2/the_nilfs.c @@ -448,6 +448,12 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs, nilfs->ns_inode_size); return -EINVAL; } + if (NILFS_SR_BYTES(nilfs->ns_inode_size) > nilfs->ns_blocksize) { + nilfs_err(nilfs->ns_sb, + "too large inode size for super root: %d bytes", + nilfs->ns_inode_size); + return -EINVAL; + } nilfs->ns_first_ino = le32_to_cpu(sbp->s_first_ino); if (nilfs->ns_first_ino < NILFS_USER_INO) { -- 2.53.0