Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795058141; b=4CE+WtI0DDy/4WZgPgvXjkgBgOTlWTPYMDyuvkGXedkI5L1zst1Ybk8aCPjjMbWxntcJ awSmFjeG/FdHxFqPbhxwPfcx1/gVjc1ZzSBd88pRHyaBzW500IQNRAOo2PfBB2IMMS1un wQMN+FA7x9sQ0zKflq5oY6agL9eQsMx2hcnijY9ffoUcDej7tAqdgDs8e87EO450v2JVp JKtPN5fXFVaTBWGqycqK1Ibvx1mpw4l09bFq9HwSVUFrRYGb5ACB5Gvh+rjh5mTiIMgbI u0OTE2ug43dRNFhKcbPnSz1yDU4yL2Uk3u9prj8MNcHnlekvjhhGJJIzBnquEx4sf8g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795058141; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=54L/Qgcwu316ykNJPrr31ySIMwsWRN3mwlswCQW84sQ=; b=h89GdojVJnfAcQsukDPALlRODneVW1u9+ZKXwoz0SCIo+ckFo7jeW5fPDfLoc9X+wYGb dVFiweX0krLNETMT3e0kwwMbxy0d4J326huGVfhWwcay5HYkY3hnKP/4SYrKTXUybDUNW 7X3oc1qjGtJYLJyPN7w1nG2aPn4AhxXIxLfj73+rjQfoiYTesw2dePpB6P7ygEYpJ+BSq IZ/p74KIlRxZBUWbEiQ+W+J9xzQgJjkqFXNBuAzGGa/RSm4XbfIUP/GAE+UZ+AlxLWFBd 0rgnnGHVI0+lcFfRQeDpR6m1OLj3l1dAkuznl6QPCHzS1H5NITdBlWkcl0JpzBefB/g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=TmCBl2F3; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AD7B9606A31C; Thu, 19 Nov 2026 03:15:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=TmCBl2F3 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06F061F000C4; Thu, 19 Nov 2026 03:15:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795058141; bh=54L/Qgcwu316ykNJPrr31ySIMwsWRN3mwlswCQW84sQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TmCBl2F3ICfZtvbA4HLE1a7hFuvTVE/ZkztYH8/oS0mv08f6tQJzyUFhiifvTxwf2 JQvsdIy9R0s9m2iSudKcemFsNOqUNjTeOxPZNDoQmp7IER2EdQoOiohMto93SUbr5P krslBbX4s/Q9OKA3V+ceKAxugr9ofvKrxkVGdVRs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, HyeongJun An , Mathieu Poirier , Sasha Levin Subject: [PATCH 5.10 0353/1848] remoteproc: elf_loader: Bound the section header table Date: Wed, 18 Nov 2026 15:39:51 +0100 Message-ID: <20261118145927.543173058@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: HyeongJun An [ Upstream commit b32177ead5f8925aa66ceed2bd533a85196f4f0c ] The rproc_elf_sanity_check() only checks the image is big enough to hold one section header. But find_table() walks e_shnum of them, and first dereferences the header at e_shstrndx to locate the section name table. Both fields are u16 and both come from the image, so an e_shstrndx of 65535 reads about 4 MB past the buffer. The commit 9f9967fed9d0 ("soc: qcom: mdt_loader: Ensure we don't read past the ELF header") added the same check to the MDT loader, and says the header "is sanitized beforehand" under remoteproc. That is what this patch makes true. Check e_shoff against the image size first, so the two bounds can use size_add() without an e_shoff above SIZE_MAX wrapping on 32-bit. The bounds are separate because e_shnum may be zero while find_table() still reads the e_shstrndx header. Fixes: 400e64df6b23 ("remoteproc: add framework for controlling remote processors") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-4-8 Signed-off-by: HyeongJun An Link: https://lore.kernel.org/r/20260724025322.2341205-1-sammiee5311@gmail.com Signed-off-by: Mathieu Poirier Signed-off-by: Sasha Levin --- drivers/remoteproc/remoteproc_elf_loader.c | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/remoteproc/remoteproc_elf_loader.c b/drivers/remoteproc/remoteproc_elf_loader.c index 334b3f9f88149..2694741e89841 100644 --- a/drivers/remoteproc/remoteproc_elf_loader.c +++ b/drivers/remoteproc/remoteproc_elf_loader.c @@ -46,8 +46,9 @@ int rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw) struct elf32_hdr *ehdr; u32 elf_shdr_get_size; u64 phoff, shoff; + size_t shend; char class; - u16 phnum; + u16 phnum, shnum, shstrndx; if (!fw) { dev_err(dev, "failed to load %s\n", name); @@ -90,9 +91,27 @@ int rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw) phoff = elf_hdr_get_e_phoff(class, fw->data); shoff = elf_hdr_get_e_shoff(class, fw->data); phnum = elf_hdr_get_e_phnum(class, fw->data); + shnum = elf_hdr_get_e_shnum(class, fw->data); + shstrndx = elf_hdr_get_e_shstrndx(class, fw->data); elf_shdr_get_size = elf_size_of_shdr(class); - if (fw->size < shoff + elf_shdr_get_size) { + /* keeps shoff in size_t range for the two bounds below */ + if (shoff > fw->size) { + dev_err(dev, "Section header table is out of bounds\n"); + return -EINVAL; + } + + if (shnum) { + shend = size_add(size_mul(elf_shdr_get_size, shnum), shoff); + if (shend > fw->size) { + dev_err(dev, "Section headers are out of bounds\n"); + return -EINVAL; + } + } + + /* find_table() reads the header at shstrndx even with no sections */ + shend = size_add(size_mul(elf_shdr_get_size, (size_t)shstrndx + 1), shoff); + if (shend > fw->size) { dev_err(dev, "Image is too small\n"); return -EINVAL; } -- 2.53.0