From patchwork Mon Dec 4 02:58:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 120481 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3919950qgn; Sun, 3 Dec 2017 18:55:35 -0800 (PST) X-Google-Smtp-Source: AGs4zMa4yp8E9YHzlvcXvvcEzpQGjgbUKETrC1Q3hXGFIQq++6nByfAuIx2SjRrRJTno6mAuBhDT X-Received: by 10.98.80.85 with SMTP id e82mr17546165pfb.87.1512356135018; Sun, 03 Dec 2017 18:55:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512356135; cv=none; d=google.com; s=arc-20160816; b=pJAG4dfb38zeVN/0kpELDSokoMRprHi7k/T6kXysjpPD2kSasuYfh2tAmih5fRMTK9 E7TxVAdkOZG0695xU0iIp50n2Jwmln1T6nM6nOWx0/YronsMzD4U0agLTI+JPFt1hZ8+ O04pysxeKSjBfzm17A1ROHjx1xtqppDy1pIslCyAONN5GbMxGoOO5mBidWZXqT3H8DPv DZ3HWaLWhHv16GHQGaJ/fuWiJKThIiTK5vF3C4XH5yAKDA+qRbrfVzzWz4lHqQ50mqlF VZCVwxx3BE2VhlhVkXjs3IgiWGBcqpSXdM72/qpX20YOQCJnRSUHpdyR/er1stb0nFbM 7KPA== 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=fVNkswW2F9Q2QI2ZTaY0vlW/IrEbCVf8dY1cNKokZF4=; b=zsKw++unoymYPgaiSKHEb+5wMhSzQw3M98dY3GmBrebJ5A65yy0XDbkU3OZxjDj6Xx OViWw7k7HCC6Ut8lVy925DBnqgBWJEEicHlAQNYUVMFba6ZMqnB2GRzDyZF4KIPaaA4V K1gwSl1VzUQijeQH7rGkYvsbzlaOmg1l2M8jHeLrNvL7pg0sJIEjHkyKXiDBC0zcYrxL JvfwZjK5rMcK+ib+FxnTbaBcZR4TYTmN96hYxStDATYnXq2AeoRsZ8+Uwd6J1IRXAE/p /HobY9koXYlWyt7szbphC6m/R7u0eDiuCWuZ8KHoyogdmGuS/pSCge1kUE1eF8hLkRpv IwHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=atVlg/cp; 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 i35si1460748plg.614.2017.12.03.18.55.34; Sun, 03 Dec 2017 18:55:35 -0800 (PST) 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=atVlg/cp; 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 S1753262AbdLDCzd (ORCPT + 28 others); Sun, 3 Dec 2017 21:55:33 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:45457 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753194AbdLDCz0 (ORCPT ); Sun, 3 Dec 2017 21:55:26 -0500 Received: by mail-pf0-f196.google.com with SMTP id u19so7469585pfa.12 for ; Sun, 03 Dec 2017 18:55:26 -0800 (PST) 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=fVNkswW2F9Q2QI2ZTaY0vlW/IrEbCVf8dY1cNKokZF4=; b=atVlg/cp2DWGIvEAlghtAtkegOb5g8F3QeKRVymkA1Q/cQlqUh8v+CU5zoBeP4wAfz bv0Q8SOODS44fCXH80+stzem1pLF/07Q/GRoqm8pAUTXXJFJ8SOSMbdQZwjxVnn22aqk x+BLsfiLGI0VJTWIwAJUJn7QGccUXPlM8J7CQ= 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=fVNkswW2F9Q2QI2ZTaY0vlW/IrEbCVf8dY1cNKokZF4=; b=cQEe2A8+O174zGeUsJPilVaQrQ29h8vgzf7U0j0bch0Z0Tp2JgX+saNQZtexbz7FYc FE9m4jjU0qBbGY+OfsCnQOgljxZyVVmRGoq+4lq76Ybqz/7zBc+ZYo2SXF1LbtPTxe2J v62Wqf/cueB0oyw80hQ74IcIBpVX+NuAkuL7hXd1g4iSzc8QE4KPN42M62ZsKJn1fWP1 Yn57hYKSJYRh8TMrEuBZh/aTphuUUgnjkmaIGfUgnC7LMDcT7Xv9U2z8BNdPZF8/iWGo cNOLXCDUokQleWhTxTYfKs/k9LhQJ+3MBhsPSC1rpWto5ce5NGqiHfl6g6oV/DEr5s3O yatA== X-Gm-Message-State: AJaThX5V3sLa0lwS5nH7WVgr77AoSp7VV3qD1WsM8fcnKzRs+DrgDa1u 59wx2INsSUm287jW5CJVzHadPQ== X-Received: by 10.101.98.83 with SMTP id q19mr12298942pgv.71.1512356125775; Sun, 03 Dec 2017 18:55:25 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id x15sm18645991pfh.27.2017.12.03.18.55.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Dec 2017 18:55:25 -0800 (PST) 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, julien.thierry@arm.com Cc: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v7 10/11] include: pe.h: remove message[] from mz header definition Date: Mon, 4 Dec 2017 11:58:00 +0900 Message-Id: <20171204025801.12161-11-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171204025801.12161-1-takahiro.akashi@linaro.org> References: <20171204025801.12161-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.14.1 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 {