From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B26DD13AC6; Sat, 3 Feb 2024 04:11:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933497; cv=none; b=YJJjIxhW84Wt93v3+DNc7KIUn+13gBL2efL3YY+MCfBBihegmU5Eb4YPTA0t+fC5hbKbLw+2kSxWDEeWKbsDC5DXLsglH8IMZEcIzhdiaDFj7qitzdiGutbGctCEC2AXfbdDWVRFFNUL6CiiO/YVVS7qgLY4yUdS27N9znoWZEs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933497; c=relaxed/simple; bh=W6wSVK+x7QkXQLMZGVXibEhPGvKPb2halY/xGvez3XE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hcy3oBoN/57lfrBBLXamfwnsDoMC97RwkLZKSGoEUk9MkKKMn45beHQxDA6fUq6KxHRrSDqQvVzKnjXH448iqGypdyJqTX7cbuNa4+T0Pm7BAyTCQuM1wKA7OXt5Thqe32jjvwrbEJbsyarS1wO1LxcPqk7SggPa4kzqR2KOw7g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=oBLOLyzQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="oBLOLyzQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7CB20C433F1; Sat, 3 Feb 2024 04:11:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706933497; bh=W6wSVK+x7QkXQLMZGVXibEhPGvKPb2halY/xGvez3XE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oBLOLyzQvYIUAwpvmbe4Bw/uFnCZl6h9BwFW7LwjC0v1ux3dpYWS5UcYvMJalfWNZ xnm4J/gJ79PKBs9ZGPmUD2TtOKOdqoOHzhYVhz6uj+D6Vn6OpYSpzATXt+dbU3yFGQ hdg8IMrb63I48ELQmRl0bhtSZa6IEJ2ldm4VhcYQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, kernel test robot , Dan Carpenter , Manas Ghandat , Dave Kleikamp , Sasha Levin Subject: [PATCH 6.6 028/322] jfs: fix slab-out-of-bounds Read in dtSearch Date: Fri, 2 Feb 2024 20:02:05 -0800 Message-ID: <20240203035359.960063650@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240203035359.041730947@linuxfoundation.org> References: <20240203035359.041730947@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Manas Ghandat [ Upstream commit fa5492ee89463a7590a1449358002ff7ef63529f ] Currently while searching for current page in the sorted entry table of the page there is a out of bound access. Added a bound check to fix the error. Dave: Set return code to -EIO Reported-by: kernel test robot Reported-by: Dan Carpenter Closes: https://lore.kernel.org/r/202310241724.Ed02yUz9-lkp@intel.com/ Signed-off-by: Manas Ghandat Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- fs/jfs/jfs_dtree.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c index f3d3e8b3f50c..031d8f570f58 100644 --- a/fs/jfs/jfs_dtree.c +++ b/fs/jfs/jfs_dtree.c @@ -633,6 +633,11 @@ int dtSearch(struct inode *ip, struct component_name * key, ino_t * data, for (base = 0, lim = p->header.nextindex; lim; lim >>= 1) { index = base + (lim >> 1); + if (stbl[index] < 0) { + rc = -EIO; + goto out; + } + if (p->header.flag & BT_LEAF) { /* uppercase leaf name to compare */ cmp = -- 2.43.0