From patchwork Thu Jun 29 08:18:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 9816245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 20E98603D7 for ; Thu, 29 Jun 2017 08:24:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14F0A2865A for ; Thu, 29 Jun 2017 08:24:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0664F2867D; Thu, 29 Jun 2017 08:24:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 89F9E2865A for ; Thu, 29 Jun 2017 08:24:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=+3Vw/bpG92HMqjLmkiCpE8CZ+ZfidtmRk54Ldka9o8c=; b=FmYMROCOJbyJafdycC3GpfFwrc joilMNiecLwMyuPZ3PkKAnoh7x7BEl83PJCulsyG+JYoggL1IXdMVshKWRheKU2HKxh6jSiE/EJS3 KBV+bYNE0kHF48f3NQTGDrApzNbBwB9mM8e5c/DfE5jPxxGq7Dqfb2ec8MiJ+HWr7N+RplWaZLKwg KXxy71lNwgGHRI/aw3WaOiPzrZZsDnw05LVMx5Ypy1ydK0GjIa2Da5A8o99/XVe5tMCy6RO8Zmvmq gbEStwx7VjoQXANttqIakK9LSyIlKqhJrbLkmEG088+t/Hl9z13b9+7WoC4srpD3vYa76wqTQqZlf kwHBDipQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dQUks-0000Jz-Db; Thu, 29 Jun 2017 08:24:50 +0000 Received: from mail-wr0-x235.google.com ([2a00:1450:400c:c0c::235]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dQUfc-0004Ge-Rb for linux-arm-kernel@lists.infradead.org; Thu, 29 Jun 2017 08:19:26 +0000 Received: by mail-wr0-x235.google.com with SMTP id 77so185498343wrb.1 for ; Thu, 29 Jun 2017 01:19:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5OnNEz2k7EsWVolQ/o4L6fUwBHNmgjzV69WSGfO1v8A=; b=Fny/KpIiTkfocbfB+mrwSIxYq7oscV/ebxNoQDanlaOkRmzMClnIsbRLmA6ow8KNH2 wnZAND/xSY6ytWhoUQ/k54f5TFmFnKVC5CgMeQaDTXGtQLaeCIi8F+/EJtPeR2XVvav4 lFp98qDdS38WfqmKnKWcnIMzQ4SCKesR8zOD8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5OnNEz2k7EsWVolQ/o4L6fUwBHNmgjzV69WSGfO1v8A=; b=rrw80F8CI2u8rz+bHdQNmXrn1sdrvjZ1t+LIz7fdtVFkNW5II0UPvp4mAqwOEbFo9w 6QbR+uO87Tk1cQGS0Y4sYeAOET8GkND7AaT3cLOuDUwAuqBG4BZxLhH22QP0a0+de05M dS+VQC/7rMwqWf942+xD4Y0FYgCP7fRASAzm2e5F9ZMRVkkEkxyxcAP07QNsdWgTvbba nDp+rNDMU4RKyIIaGMn3B0rZANPZNqB3+TMTiIa/ma2nWKi0jajx2qBrJAax55XiUkwP EXw5FyRwn63FwHZv6uQvCPV/7BTEaPgBJnA7NabWs05P8hMCAYqi0BhFw+NUXrTJnudM L5Rg== X-Gm-Message-State: AKS2vOwu9z85qP3eUCH37hxVmnps1ly+qY3LK9UE1oJkOYxRGDpAsBfR Wvzd1XsRvGy9Sqrt X-Received: by 10.223.141.138 with SMTP id o10mr24753449wrb.69.1498724342970; Thu, 29 Jun 2017 01:19:02 -0700 (PDT) Received: from localhost.localdomain ([196.90.227.203]) by smtp.gmail.com with ESMTPSA id p34sm5268190wrc.66.2017.06.29.01.19.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jun 2017 01:19:02 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk Subject: [PATCH v2 1/7] arm: efi: remove forbidden values from the PE/COFF header Date: Thu, 29 Jun 2017 08:18:43 +0000 Message-Id: <20170629081849.15081-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170629081849.15081-1-ard.biesheuvel@linaro.org> References: <20170629081849.15081-1-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170629_011925_062096_FEFDF0E7 X-CRM114-Status: UNSURE ( 8.29 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matt@codeblueprint.co.uk, leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Bring the PE/COFF header in line with the PE/COFF spec, by setting NumberOfSymbols to 0, and removing the section alignment flags. Signed-off-by: Ard Biesheuvel --- arch/arm/boot/compressed/efi-header.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/compressed/efi-header.S b/arch/arm/boot/compressed/efi-header.S index a17ca8d78656..4169b900d9d4 100644 --- a/arch/arm/boot/compressed/efi-header.S +++ b/arch/arm/boot/compressed/efi-header.S @@ -44,7 +44,7 @@ coff_header: .short 2 @ nr_sections .long 0 @ TimeDateStamp .long 0 @ PointerToSymbolTable - .long 1 @ NumberOfSymbols + .long 0 @ NumberOfSymbols .short section_table - optional_header @ SizeOfOptionalHeader .short 0x306 @ Characteristics. @@ -110,7 +110,7 @@ section_table: .long 0 @ PointerToLineNumbers .short 0 @ NumberOfRelocations .short 0 @ NumberOfLineNumbers - .long 0x42100040 @ Characteristics + .long 0x42000040 @ Characteristics .ascii ".text\0\0\0" .long _end - __efi_start @ VirtualSize @@ -121,7 +121,7 @@ section_table: .long 0 @ PointerToLineNumbers .short 0 @ NumberOfRelocations .short 0 @ NumberOfLineNumbers - .long 0xe0500020 @ Characteristics + .long 0xe0000020 @ Characteristics .align 9 __efi_start: