From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8F899606A31C for ; Mon, 16 Nov 2026 14:27:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=sl8zGD48; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=IDiyR4S/; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=Kdqj6JkD DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Unsubscribe-Post:List-Owner; bh=c/NQHRNe6l6YOGUDkv9ZNGcgPj475MvlcuYl9auZYJY=; b=sl8zGD48q225U1lVONoOI5Ejkj 7ohTCBELjBl9O71+STia34S4gzZzR8iCZtW9o3vTInb2SoJOXVE5nG97SI62se9SUy7KebKir4xM+ bfbD5cY2VrfV2Ylj9d+bUd0fOvCQerCksMsdw/K38Q92RO+5ds9KC69Iga2dBolqB/He9WHJwKSNK OuQRydptDDZXQtPEASI3uu/Xk75ExEgsiwKlIS/2/TMzfakC+vuJgvDHm6TvGOm3SIwNLC8FKpWs6 8UXGofUrdb9kdFKOCAoRWp4halF+Q5BaTG21d6ABflTIG/nTVa8ntj+B49hZ1kApWS7q5DJ/8z7H9 7xS00FQw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xSxg7-00000002pRq-2xkR; Mon, 16 Nov 2026 14:27:27 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xSxg4-00000002pLX-0Ptd for linux-arm-kernel@bombadil.infradead.org; Mon, 16 Nov 2026 14:27:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Cc:To:From:Subject: Message-ID:References:Mime-Version:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=c/NQHRNe6l6YOGUDkv9ZNGcgPj475MvlcuYl9auZYJY=; b=IDiyR4S/uMra9/qCwnDpXtJh4k VNhBzR60/BsgGM1pWX6sod/R7X21Ap/bo2oOyUYumG5YbG35ArIRDZdpsrPZNHnwb2A4pPn3ftxP2 i3gNSgMDnu9Zrkkc1YQRqZ3bie1hxxESwFVPcEM+sM3p9Qg9q+fqBpVogoyYu+yLC3vfCf0GxvHqL ZWwMR7SigOn2a1wlugLTWprThje53FYtbUUeE9gLq0jljBRkUs9Vr6BooZsCPQKxq1ZRp/MqPOotb Rn7CCh9RVEyu4+8kC8R+2cCZ9/N7mj57NYvv3XS5QcjK/teXXfVHA76buZ+Z7Txt94W+4W5Abslhq PknAqRag==; Received: from mail-wm1-x345.google.com ([2a00:1450:4864:20::345]) by desiato.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xSxg1-0000000DvuJ-2CH8 for linux-arm-kernel@lists.infradead.org; Mon, 16 Nov 2026 14:27:23 +0000 Received: by mail-wm1-x345.google.com with SMTP id 5b1f17b1804b1-4bb68d624baso14307395e9.2 for ; Mon, 16 Nov 2026 06:27:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794839239; x=1795444039; darn=lists.infradead.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=c/NQHRNe6l6YOGUDkv9ZNGcgPj475MvlcuYl9auZYJY=; b=Kdqj6JkDO/ZygD+/gFdfZjiFD4Oq2vKY27LFT086ioWAsytRbQbCSFKu2pgCAvKtTH KnjJWxctdO5Hq1B46+FUcvFg+v88HuDvFtAvDN0UnvkRdMFIlgTY7YXAbKrrIo8lA/Sv jSUwa8PAXzCEZ0W2jE4FZ/smA690/sNHi8vh5XN60yu1M81vTY9fUS88SS6HgY+31wH6 cEjqSSEW/QzGxezLcJVpE4pjakfJtbOH1FSWDePYjnXsEzoshIEHWbP6HjB0Hrer9l52 kYBBl5OCoCaunZs3nyN5AzSmvecK1iJOrhpp8XXcA+6JziSn8l+7Z43c0K9em8LN3xHZ on/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794839239; x=1795444039; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=c/NQHRNe6l6YOGUDkv9ZNGcgPj475MvlcuYl9auZYJY=; b=w4jMvCNd2Ypnyz4joeSM8ty9xy/0jLv1Lpgo8XNdrQkItoxhY7PhhPkytZEJKtdFoB Tr26n+Fq+CrskoqHigPcmkyVIEYQ+yoM6K0ENV2Hojl95BqPlyxrESpSzq/0IxrzRgmu Ne8z65acrk5/Oq2gftQdv3C3WSQCbimNPsb+mmXHRJtojIMTjZT30Q1viPu4WwfHJjQ0 iz38jM5i/JNmzcvZGzLxieg5h1K41hfoRumF2T8S4NlV7tVlbJDuAXFHD/tWLvh532i7 2zcu+kSEUkqCTIxSY3kr4UvTPe4fpb6AOJtEBBOIHSalrWQOpVlablgshlkaqqxwwQcC wLRQ== X-Gm-Message-State: APuU4Z/g8tRrMHVXP0QKVocr8rdu/3O/AktjufgBs6po4HrglNrt4IzG zzHuYhEUaFewbLyM/iyEn0qaUdMCkP3BuzFPwlscDaaNoMZS7kiw2Ja9LrxMyAmWZTiXbD5ljA= = X-Received: from wmbjj17.prod.google.com ([2002:a05:600c:6a11:b0:4a3:5d5b:9ad9]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:6286:b0:49f:e8bf:8f9b with SMTP id 5b1f17b1804b1-4bb55a23b4emr228382165e9.4.1794839238088; Mon, 16 Nov 2026 06:27:18 -0800 (PST) Date: Mon, 16 Nov 2026 15:26:24 +0100 In-Reply-To: <20261116142618.1687025-17-ardb+git@google.com> X-Archived-By: Mime-Version: 1.0 References: <20261116142618.1687025-17-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1222; i=ardb@kernel.org; h=from:subject; bh=gNFwqEvRPin0drZTY8vZ8X80jlSMfocbKk0VdpmbVRA=; b=owGbwMvMwCVmkMcZplerG8N4Wi2JIeu30KSg3fcv87JE2Vwx2/OUl40vW2RrsPb6oCrlHnF1u dmyb9M6SlkYxLgYZMUUWQRm/3238/REqVrnWbIwc1iZQIYwcHEKwER6PzEyrM+807hgHuvh1S8n 7DDjYHotYHn95jar+8ULlgkKbOBwnMPIcDTjw5LJIe92RiypnXv/9FrZ3E0/bCS3WkXYaqwq8vY LYwUA X-Mailer: git-send-email 2.56.0.611.g1030f0b940-goog Message-ID: <20261116142618.1687025-22-ardb+git@google.com> Subject: [PATCH v3 05/15] efi/libstub: Avoid _end section marker in library code From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Jason Gunthorpe , Paul Walmsley , Palmer Dabbelt , Albert Ou , Huacai Chen , loongarch@lists.linux.dev, linux-riscv@lists.infradead.org Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261116_142721_522127_F37F166F X-CRM114-Status: GOOD ( 15.26 ) X-Spam-Score: -7.6 (-------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-26.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 From: Ard Biesheuvel The _end marker could point to the end of the kernel image being loaded, or to the _end of the zboot decompressor image, and so it should only be used in code that is obviously only intended for the former case. So instead, use kernel_memsize and the image address to obtain the same quantity. Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/libstub/kaslr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/efi/libstub/kaslr.c b/drivers/firmware/efi/libstub/kaslr.c index 8f8dc335b3b3..b34e4599f0f6 100644 --- a/drivers/firmware/efi/libstub/kaslr.c +++ b/drivers/firmware/efi/libstub/kaslr.c @@ -125,7 +125,7 @@ efi_status_t efi_kaslr_relocate_kernel(unsigned long *image_addr, if (!check_image_region(*image_addr, kernel_memsize)) { efi_err("FIRMWARE BUG: Image BSS overlaps adjacent EFI memory region\n"); } else if (IS_ALIGNED(*image_addr, min_kimg_align) && - (unsigned long)_end < EFI_ALLOC_LIMIT) { + (*image_addr + kernel_memsize) < EFI_ALLOC_LIMIT) { /* * Just execute from wherever we were loaded by the * UEFI PE/COFF loader if the placement is suitable. -- 2.56.0.611.g1030f0b940-goog