From patchwork Wed Jul 11 07:42:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 141679 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4800955ljj; Wed, 11 Jul 2018 00:43:18 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeg9eYyGurNknopeAMD/8P5S6GtU8qaEQ46QNHX/Ro4OtgvpiOFLjQVq/h/4vwmwDGi7TRE X-Received: by 2002:a62:9652:: with SMTP id c79-v6mr29152362pfe.114.1531294997942; Wed, 11 Jul 2018 00:43:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531294997; cv=none; d=google.com; s=arc-20160816; b=iRHsgW96iTJCz8XN8Q+5N0KZEG8KDeHZkce0/jQ6+6jxBxS6JS3Mz03V0gJVXzCFov 4jrlU8vi2WuGIMBP23szcGyfWnAFKGNz+g6+DUqA81GeZMLjxwUoaY8lrrNkUaU3B9/m kE0V5NC8VqijeEwXLCfDBGS5YnwkvJNRkFHfM2AlWisOo3HaIQCGn5gmsB05NyniCWKc 7ooEsjQT1y8dW+A62d6xMOGNRp4MA5KkEuFM7w4M3wtt7Ufw29QsJmYZGGE7uXoo/tDs 7T2UvpFcG+eJqIqGWTaqSzDoSk1F6BB3PpNg+XzS/XTPAQvseQwHv5KVtWU+tCRTms2K n8nw== 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=udBD3FA/hkAWhAoznOJdhSIXwaGNnm+w3oMPbyzv9VI=; b=boKX7xyyjPvvrJm9CuN7wSYM3JkAadTdJaSQ+SChmzlPQLsq91T8dK+gq0S011VcDK p2eXmJFBR3Ok+sn81FrJ3JzWjUhbFkO2SrymH0JCwFFJ5HPnQif0DK9y72Vnal0tYlSd LZ4/+jE93yWJ10NnRTv1Y46fut+Ex0dIKZfLZ2a8K33QIRNuAw4B2cvCaejeq9vRJHPB 4Wcuwvlt65idTVqTP+xgK8UZ3bfC5XUKcf/vHXiqyG+6Rz6Xc8r5vJwd8ZGoFmXaQE2Y yTL9Gkg89NqDq4NHbNN2ISBvow6NmdjsJrQKi4+O01yQY0B8YLNaHSZGtnw9zptMqpSp I+Rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DDS3bvvN; 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 i13-v6si5439190pgh.642.2018.07.11.00.43.17; Wed, 11 Jul 2018 00:43:17 -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=DDS3bvvN; 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 S1732404AbeGKHqL (ORCPT + 22 others); Wed, 11 Jul 2018 03:46:11 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:42384 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726335AbeGKHqK (ORCPT ); Wed, 11 Jul 2018 03:46:10 -0400 Received: by mail-pl0-f68.google.com with SMTP id f4-v6so4607119plb.9 for ; Wed, 11 Jul 2018 00:43:14 -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=udBD3FA/hkAWhAoznOJdhSIXwaGNnm+w3oMPbyzv9VI=; b=DDS3bvvNhkJvcyqdwc1EFKAG41UgqJWBEUWNzUomCGlSVBYybxbPWOYB6U/HJkrtI+ JO922kw8K9fFwwQ7Xx4GUuIiEBLkFOp97E/qUZUTrMLS2ZvIya6FSNsz3wkun19dQeD2 7ktTYhWtLCQlRYy6zi3kfQtakAzPYqwr24TQA= 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=udBD3FA/hkAWhAoznOJdhSIXwaGNnm+w3oMPbyzv9VI=; b=ZEHhVLSQLph3xV3uuRjbBA8tEowSZ/+Hcxx790Ly224q6+cVMKthvKURY/8u6CDXdB dnFbBOjjSrUhHwcZpGTAZJSonaYhWuQrucD0Oj4J+4lcO+w2zeGJizr4phkhhxgiXR0B IRHOvDKJstkpYCyXK4IO16+RuNDg/0a43WpsasEzFlIHOXlfGstsaDehU3B1D1zbWOgp 8DF4YCrhBLNg2dVpSMrYkzgGOZo4yDPpn2HtfUWhEPC0bV6ZBV1wAAMbnIxI8iK2TNeF NmMOFaUZPKfsNSnNnIQ0MnHNKvQ5CBgUtCOok7BvZXC3rMUq2g7kJw1DMEmt3XVfdqy6 j+dg== X-Gm-Message-State: APt69E2E2tZMtxhT/Xz5EVGoLxsQO1YS/jOebCXAQ0UcNVAUKw1CwWBl EEEaFXdzIWs5XE7ypZ7R9bX8Gg== X-Received: by 2002:a17:902:8ecb:: with SMTP id x11-v6mr28387294plo.308.1531294994256; Wed, 11 Jul 2018 00:43:14 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id m86-v6sm40464859pfi.47.2018.07.11.00.43.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jul 2018 00:43:13 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de Cc: ard.biesheuvel@linaro.org, james.morse@arm.com, bhsharma@redhat.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v11 13/15] include: pe.h: remove message[] from mz header definition Date: Wed, 11 Jul 2018 16:42:01 +0900 Message-Id: <20180711074203.3019-14-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180711074203.3019-1-takahiro.akashi@linaro.org> References: <20180711074203.3019-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 Reviewed-by: Ard Biesheuvel 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.17.0 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 {