From patchwork Thu Aug 24 08:17:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 110879 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp5315608qge; Thu, 24 Aug 2017 01:19:21 -0700 (PDT) X-Received: by 10.84.198.67 with SMTP id o61mr654676pld.289.1503562761815; Thu, 24 Aug 2017 01:19:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503562761; cv=none; d=google.com; s=arc-20160816; b=1IgMYlCyzh9IlsyDj8cyoL6NYzCBG40tAQNXUD5nrSxgtRV4+Ud2+5mOGt8t5ZkONK fY59EGdJRfirHUL5EWiEXwAuTPp9VkMP/M5XRWp7DbEbwly1uMeST0waqzK+dUPnIEVQ 8LZhwGfn21fGHREVewuGD9Pkb9fZ+MksUwZjYW+jG9p+nIJzduI3v+8Pf8Bkr9woF+ct aKUuPJSmFnhVBFafLWjkehSdvAqBWAQNefb52jPTQNc9APNJMsDWmb9FwICuCSDeFfi8 6+IIzDaF3INduMotOGE9iqpE+VynOScnz1Jwh6H7SI7AO/yKH+9j8xu1ccC5aB1IZxuJ 3dZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=Rfo2+5LeGE+0yDd6Q+gfTnhnQP/fr7cddTXkW8oK8a8=; b=wlQbKyhp+WRp+QBacp/zanTI8ICtZsM7EEkz5gTes6AP1NpMEHhzk11TiZ4riczxmZ vJikf+lfDxAyMroh5DFUP0miwFnEpe1bIk6heexlLplxKipBtOz9AsOykMauFdsh2E2S NThFToucPeM0zev2wsqJcXHff5jB0aS1pl9c9m5jV6zA0gXyuPLqlcIELGDYxlWb6imG M1Pqc9sPCHxmivVGpiuLNG7rB3tlygsgimzG8xuqmELQ92UsuaH57qVlop2kRraaasQ2 pGI9YKhf1N8aMlBawsCfj67CxfatO3qL6Fxyh0iUtT7xKUkTpHeiYG9K/l3/HG4nnw6i iSjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zgfkae0n; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n9si2385009pge.35.2017.08.24.01.19.21; Thu, 24 Aug 2017 01:19:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zgfkae0n; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752202AbdHXITS (ORCPT + 26 others); Thu, 24 Aug 2017 04:19:18 -0400 Received: from mail-pg0-f45.google.com ([74.125.83.45]:37506 "EHLO mail-pg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751349AbdHXIRp (ORCPT ); Thu, 24 Aug 2017 04:17:45 -0400 Received: by mail-pg0-f45.google.com with SMTP id y129so13384911pgy.4 for ; Thu, 24 Aug 2017 01:17:45 -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=Rfo2+5LeGE+0yDd6Q+gfTnhnQP/fr7cddTXkW8oK8a8=; b=Zgfkae0nghKxloSmXTMQr99+bCRU0PbFl+ZoKANXNPSUf4ideh8dvSOmLZ+2b5YeJp 8JrFxclGoLRKZi4qbXv4uNxXVZOKWHT3NKLlrlpnHVcedobzjNCRjUHLL5Y9RjXvZ/k5 sk/MgHG3bEkeVrHxGXE8a3KqG19NjOPlL4YTQ= 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=Rfo2+5LeGE+0yDd6Q+gfTnhnQP/fr7cddTXkW8oK8a8=; b=VC21102m0FrL9zdvnff3C8h8Fms4UoqLadgZ5RzZyug/YgL1ufqESHGZNsYqZkCH0r 8+UMYNypobGvtceumvw3qmpdNKl2JenpN7JLiPqw5CCIEsLompq5J5pWnUklNlqctK97 ECEI5hG4DCq9l6U+9W/1Ut/EIVWxkJgWufrjOHQWiGQBG9AAnpPyABcs5HpHv5PMrqh8 wB1/IF1WTHt1DsYO903/vNLVbUpgkpwM/oOFwkwNXyOZ1Ym/epQh2vH51axDjGNXhmxD tjPU4LgjOtx6CYXodUjMLiWpSN2ZEP+t9rvDSpRvaGfkeqdUdwHuF2ANrBb+XkxrJEjC TNcQ== X-Gm-Message-State: AHYfb5iJTGEa9uWMWqDgkurJjDB/UIpezb0RvRRkCLcoJ5s8NvwJx1qA wKv51lBM4WVu/cOS X-Received: by 10.84.215.210 with SMTP id g18mr6162441plj.210.1503562665279; Thu, 24 Aug 2017 01:17:45 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id y23sm7262506pge.65.2017.08.24.01.17.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Aug 2017 01:17:44 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, bauerman@linux.vnet.ibm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, akpm@linux-foundation.org, mpe@ellerman.id.au, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de, ard.biesheuvel@linaro.org Cc: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH 02/14] include: pe.h: remove message[] from mz header definition Date: Thu, 24 Aug 2017 17:17:59 +0900 Message-Id: <20170824081811.19299-3-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170824081811.19299-1-takahiro.akashi@linaro.org> References: <20170824081811.19299-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org message[] field won't be part of the definition of mz header. This change is crucial for enabling kexec_file_load on arm64 because arm64's "Image" binary, as in PE format, doesn't have any data for it and accordingly the following check in pefile_parse_binary() will fail: chkaddr(cursor, mz->peaddr, sizeof(*pe)); Signed-off-by: AKASHI Takahiro Cc: David Howells Cc: Vivek Goyal Cc: Herbert Xu Cc: David S. Miller --- include/linux/pe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.1 Reviewed-by: Ard Biesheuvel diff --git a/include/linux/pe.h b/include/linux/pe.h index 143ce75be5f0..3482b18a48b5 100644 --- a/include/linux/pe.h +++ b/include/linux/pe.h @@ -166,7 +166,7 @@ struct mz_hdr { uint16_t oem_info; /* oem specific */ uint16_t reserved1[10]; /* reserved */ uint32_t peaddr; /* address of pe header */ - char message[64]; /* message to print */ + char message[]; /* message to print */ }; struct mz_reloc {