From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D76B2C2BA2B for ; Mon, 13 Apr 2020 16:21:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ADF522072C for ; Mon, 13 Apr 2020 16:21:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586794914; bh=6oNWheLakWrFr/1PDp8ZzyS/LoXFLuI0dbimeVrZQLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xE/wBZPl0vOiWqfd+/4g+WgeToH9tIsYAOYcPYi/6svcojbkKcY2To7og12utSj+H elqwJQXtcawyLbAhKtc6sMaxflfbsSEXMt9bcxIQNi3ZGsg+dvFRQGtsKNjAeEgBHU ecnn1ap4FGgYek828GMryefQlWWYbLvwKDWvYQig= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731470AbgDMQVy (ORCPT ); Mon, 13 Apr 2020 12:21:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:48938 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731410AbgDMQVy (ORCPT ); Mon, 13 Apr 2020 12:21:54 -0400 Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr [109.210.65.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 56D0220739; Mon, 13 Apr 2020 16:21:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586794913; bh=6oNWheLakWrFr/1PDp8ZzyS/LoXFLuI0dbimeVrZQLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TgTrlGm6q1akoOOM4FfCNyOUPJRQNywYcNrSGu0R1Zdi5JG2IwP4bSAJjoE7jROtb pVM55Lsncb9/UA24KTL29pA/xcsuHSHO17U8xH5Q1zKq22teS0EKOMtYBEzNgeSE/p DjxBFN5nWvJMlqicsfK09DFVRcFQEKI1hjemlGqU= From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Geert Uytterhoeven , Nicolas Pitre , Linus Walleij , Russell King Subject: [PATCH v2 4/5] ARM: decompressor: move GOT into .data for EFI enabled builds Date: Mon, 13 Apr 2020 18:21:34 +0200 Message-Id: <20200413162135.14955-5-ardb@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200413162135.14955-1-ardb@kernel.org> References: <20200413162135.14955-1-ardb@kernel.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org We will be running the decompressor in place after a future patch, instead of copying it around first. This means we no longer have to disable and re-enable the MMU and caches either. However, this means we will be loaded with the restricted permissions set by the UEFI firmware, which means that we have to move the GOT table into the data section in order for the contents to be writable by the code itself. Signed-off-by: Ard Biesheuvel --- arch/arm/boot/compressed/vmlinux.lds.S | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/compressed/vmlinux.lds.S b/arch/arm/boot/compressed/vmlinux.lds.S index b247f399de71..d0619ec05705 100644 --- a/arch/arm/boot/compressed/vmlinux.lds.S +++ b/arch/arm/boot/compressed/vmlinux.lds.S @@ -63,9 +63,11 @@ SECTIONS _etext = .; .got.plt : { *(.got.plt) } +#ifndef CONFIG_EFI_STUB _got_start = .; .got : { *(.got) } _got_end = .; +#endif /* ensure the zImage file size is always a multiple of 64 bits */ /* (without a dummy byte, ld just ignores the empty section) */ @@ -74,6 +76,9 @@ SECTIONS #ifdef CONFIG_EFI_STUB .data : ALIGN(4096) { __pecoff_data_start = .; + _got_start = .; + *(.got) + _got_end = .; /* * The EFI stub always executes from RAM, and runs strictly before the * decompressor, so we can make an exception for its r/w data, and keep it -- 2.17.1