Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 418F8EB64D7 for ; Mon, 26 Jun 2023 08:54:02 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4DC8486199; Mon, 26 Jun 2023 10:53:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1687769617; bh=V/N6J6C+Xdd+PcoLkNMo/UTsywGPam/4cqGlLc6rN2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=QJe7G/FVZL9JDJnv3+QU5c6GKIz56YhGdT28qVJxeZtZzGhOnLAq+QPxs8sIw4qHN 2v+eX6LNMwvcmppIb51ppPn63IOMYAvv2WTDqJUvOznM6TezjjT2XedE92vCKBdKKU IbeMGr50nzavVWdAZku1LFN8R8crhLXwXV9OThQHIhSfXqGWAbiilHwEGHU7Zwm7u4 rXhKUP7lj7vJPZKL1SuRsq20E1cOtMgN6S5yl8Uef5EtmIZNzH7GrEpUzq4FmZhb6O /sk4SfIeCQJ/H50q5aDWBhFT8AeReU6sBotP16BDlPB3W0IRZ8luJDZr0nD+N2Cv/5 hqzKQ+kfbHkOQ== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 9828E8561F; Mon, 26 Jun 2023 10:53:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1687769600; bh=V/N6J6C+Xdd+PcoLkNMo/UTsywGPam/4cqGlLc6rN2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LFlhIVO2xT2GMN4W9q01prJhei3Z7Cqmvt811/gAibdhYR7wvpV+nsbMcDz7BTraR KH3TAjcANwQuaQymnFfmLGL5tgxnLs7ya6ufjDdDuSfJxtROkDrickwoWu8dznD3Z5 g+ufZcGCZZPjIQfhHy6Q9uHwNEVSQmKspVukr2RHq9TX2XjGdL4dz1TQ/N53hHgTKS vOW02iPFh5zu7Jccc6tyc7zX7nen7aoRCIfmOheOjh6L/b7/Tge6XcoFYNr+6CCUCX e+cUOcKAbIk1qFHAPZhMwc3SynUOGZrEleQQ+wlUQ+si/on3gy/DTEoe/HKz0yAjW0 +XgvxaX5ViTPQ== From: Marek Vasut To: u-boot@lists.denx.de Cc: trini@konsulko.com, Marek Vasut , "NXP i.MX U-Boot Team" , Fabio Estevam , Heiko Schocher , Heinrich Schuchardt , Rasmus Villemoes , Simon Glass , Stefano Babic , Ye Li Subject: [PATCH 4/6] spl: spl_legacy: Add extra address checks Date: Mon, 26 Jun 2023 10:52:56 +0200 Message-Id: <20230626085258.5364-4-marex@denx.de> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230626085258.5364-1-marex@denx.de> References: <20230626085258.5364-1-marex@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Check whether the loaded image or entry point does not overlap SPL. Signed-off-by: Marek Vasut --- Cc: "NXP i.MX U-Boot Team" Cc: Fabio Estevam Cc: Heiko Schocher Cc: Heinrich Schuchardt Cc: Rasmus Villemoes Cc: Simon Glass Cc: Stefano Babic Cc: Tom Rini Cc: Ye Li --- V2: - Use _start instead of __image_copy_start and __bss_end for end - Define SYS_BOOTM_LEN for LEGACY_IMAGE_FORMAT || SPL_LEGACY_IMAGE_FORMAT --- cmd/Kconfig | 3 ++- common/spl/spl_legacy.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 365371fb511..02e54f1e50f 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -362,7 +362,8 @@ config BOOTM_VXWORKS config SYS_BOOTM_LEN hex "Maximum size of a decompresed OS image" - depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ + depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ || \ + LEGACY_IMAGE_FORMAT || SPL_LEGACY_IMAGE_FORMAT default 0x4000000 if PPC || ARM64 default 0x1000000 if X86 || ARCH_MX6 || ARCH_MX7 default 0x800000 diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c index 16851c55eb5..d34bc5492e8 100644 --- a/common/spl/spl_legacy.c +++ b/common/spl/spl_legacy.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -15,6 +16,22 @@ #define LZMA_LEN (1 << 20) +static void spl_parse_legacy_validate(uintptr_t start, uintptr_t size) +{ + uintptr_t spl_start = (uintptr_t)_start; + uintptr_t spl_end = (uintptr_t)__bss_end; + uintptr_t end = start + size; + + if ((start >= spl_start && start < spl_end) || + (end > spl_start && end <= spl_end) || + (start < spl_start && end >= spl_end) || + (start > end && end > spl_start)) + panic("SPL: Image overlaps SPL\n"); + + if (size > CONFIG_SYS_BOOTM_LEN) + panic("SPL: Image too large\n"); +} + int spl_parse_legacy_header(struct spl_image_info *spl_image, const struct legacy_img_hdr *header) { @@ -58,6 +75,9 @@ int spl_parse_legacy_header(struct spl_image_info *spl_image, "payload image: %32s load addr: 0x%lx size: %d\n", spl_image->name, spl_image->load_addr, spl_image->size); + spl_parse_legacy_validate(spl_image->load_addr, spl_image->size); + spl_parse_legacy_validate(spl_image->entry_point, 0); + return 0; } -- 2.40.1