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 272A52E62C; Mon, 8 Apr 2024 13:02:03 +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=1712581323; cv=none; b=IYzkDcyGLc4ZFzXljovt1w8/wB/Fa253zYJD4l04Ma5yBjLfLHiJDR2QYsNA2JyVeeDQ5q/5kMWdGLkYYtMR36iq6p+UE5AM0NDOE44MjSKU+l1XCbN6TpcWMR2dYeQs6c36InMw2Nh4AJ6YHdr9MHTM6QWBzFUGOm0n0W+OCkI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712581323; c=relaxed/simple; bh=GQlp+sf4Mp7EJd/xKo3cdeCdPo3aUmt/+bhLRAqkiaA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BUp78MgpBjtYe0EfKCLAi3GchlLgMeN5WU2lPqYMnEur7hkKxEsvorycyPhVzqb59LY0aOcZPKqESnBhLszWL2o/r3JSv8TwyX2w/Qx+TA3Hq8t9rukhXzmZpyLi6parLo9Dd7pOWM5vlMDWas+9Cl5VY3hZtSvwejTugSSCFxM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=F/s2jCmJ; 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="F/s2jCmJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A37C2C433F1; Mon, 8 Apr 2024 13:02:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712581323; bh=GQlp+sf4Mp7EJd/xKo3cdeCdPo3aUmt/+bhLRAqkiaA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F/s2jCmJx8zEI+sS1H2/h6YKsxlJPHFtZujjj882EmJqaqPOd5Kj3Pr5qq8EuvRZK QfevMGm7tUP/ISEJZVL2auFIznj5X3orW7d+LsFYAAjxibr35S2oxXBd3sLZ8TSS+D fcS+5UC4UIvwZQN+ik+jgwMv2Ldbu2eEJESyvovw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chenyuan Yang , Richard Weinberger , Zhihao Cheng , Sasha Levin Subject: [PATCH 5.15 032/690] ubi: Check for too small LEB size in VTBL code Date: Mon, 8 Apr 2024 14:48:18 +0200 Message-ID: <20240408125400.717833241@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125359.506372836@linuxfoundation.org> References: <20240408125359.506372836@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Richard Weinberger [ Upstream commit 68a24aba7c593eafa8fd00f2f76407b9b32b47a9 ] If the LEB size is smaller than a volume table record we cannot have volumes. In this case abort attaching. Cc: Chenyuan Yang Cc: stable@vger.kernel.org Fixes: 801c135ce73d ("UBI: Unsorted Block Images") Reported-by: Chenyuan Yang Closes: https://lore.kernel.org/linux-mtd/1433EB7A-FC89-47D6-8F47-23BE41B263B3@illinois.edu/ Signed-off-by: Richard Weinberger Reviewed-by: Zhihao Cheng Signed-off-by: Sasha Levin --- drivers/mtd/ubi/vtbl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index f700f0e4f2ec4..6e5489e233dd2 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c @@ -791,6 +791,12 @@ int ubi_read_volume_table(struct ubi_device *ubi, struct ubi_attach_info *ai) * The number of supported volumes is limited by the eraseblock size * and by the UBI_MAX_VOLUMES constant. */ + + if (ubi->leb_size < UBI_VTBL_RECORD_SIZE) { + ubi_err(ubi, "LEB size too small for a volume record"); + return -EINVAL; + } + ubi->vtbl_slots = ubi->leb_size / UBI_VTBL_RECORD_SIZE; if (ubi->vtbl_slots > UBI_MAX_VOLUMES) ubi->vtbl_slots = UBI_MAX_VOLUMES; -- 2.43.0