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 4CD4130C60F; Sat, 12 Sep 2026 16:26:31 +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=1789230392; cv=none; b=L1ylZOxiLMoHxK62qpPtP2VTak9kO0JIHQOpteu7mjED8yVpIefF6TZx8C8aJmAZxWMKJ9kjzJI6a/aOYp3S5haeO+cpicuXLFfciA6bmF5FaTlDSRuue//Vv2w5PF8EoJwETRlr0z9fK5DhS8pkWyMPtreMlRBl9AdNfjyVzlM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789230392; c=relaxed/simple; bh=BQyvaIfH28ntFzKETi1mtOrFe6cY2U+aypvDP/emdmc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IWv3GXE1DID9FGLKeWl8NFz5GkDVumu+5T+mzI69dcZh8yoRO4HdLCwMwwLKT72tC7RvNC6zL31qZzvKsS1UoFeTGFwn01tdF1EMK0QIn9nX1ZKgWa+bCV6+edkLQv9k10Bk7m03DxkaSis20MDNxW6vU29BnJzN7kIKBvzySyA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Pr5LhGg1; 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="Pr5LhGg1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DE361F000FF; Sat, 12 Sep 2026 16:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789230391; bh=pCtclaCnMLyUDDrBP0ATqpqmS51PJqW5QXUVlRSIZEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Pr5LhGg1dGHmFRbnWknO8okpfiaWziLXtY5NVSCS7dypBYzokVCvCyw4u6DRn8C/V ANn5iIIHqZGB0aHb40X2RMQf2XkcZjO53ZlqQdNlhZjJcdrm9i4RrWRFd1njl7WlxA NKSPmzV8omxuObcISZJbQH90XBmHFRhO1G+BOetM= 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.1 0741/1191] nilfs2: prevent out-of-bounds read in super root block parsing Date: Sat, 12 Sep 2026 08:57:49 +0200 Message-ID: <20260912065604.925156987@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@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.1-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 05fdbbc63e1f5..d1891dd4a5109 100644 --- a/fs/nilfs2/the_nilfs.c +++ b/fs/nilfs2/the_nilfs.c @@ -450,6 +450,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