From patchwork Wed Nov 14 19:29:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 151116 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6087089ljp; Wed, 14 Nov 2018 11:30:56 -0800 (PST) X-Google-Smtp-Source: AJdET5d+py3KPt314+y6bTgBDW7cdn9Fy/xNiFk75Z12KFWaHeKea9tiqrFId/qK0K9W48ena0Xj X-Received: by 2002:a37:a9cf:: with SMTP id s198mr2898229qke.274.1542223856161; Wed, 14 Nov 2018 11:30:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542223856; cv=none; d=google.com; s=arc-20160816; b=XvV2kvkmPr0KmvJHqyKi8EffSlZISlBbGcWu3bwC9CN0CzqugjfvTe1DxwU9L00L4C nAkKFeNPW3tGvaM2FAOHH3LWqEZoyk26fpoxpIapxZL+idNWgf5ei68lS5rYmMsErEfT Jyo5jSuX5a3ZYf+5lYYpojRUCZw7ZTwcldp9AKTuBWkDiKsBVwYoUvzPbgyBFO7B29AP zogdEYOMsTEO/MqbfLmHtTSPYuFQ6t1fb4q4504ghudSoGSZTe8xJrOvOXk0b6G03dWv aya/ac/v5wSO1S/zS79Ube5TBNLlrci4wbtwEyHS/CFAAgrj2W/94On+EGGaHaj4pAE+ 9cew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature; bh=fFM+IeXusYVii1Gs6t8w1OQMIk7qMQOgXyWWiTYlxeA=; b=UcelxwDGDCUq+ztt/ZnTnz4yG+bG6u+JeJGcRHAcbpxf1E8r1vf/GOvZWOljribXI5 KlcwdUskD1Bo7JIgX5w25YJxdOw3k+8381VgerH69sI+GOMaGaGVdEUTJ37tiHOR6diK I2+q9UgqzOktoBkVrf6wwJhQPJhLKWsQnhGYAaYjgbNF9hB3frUmUaUrY198QUMNMhOT 3Zag1oP4yRk2tB6qiPNbewAd6+5cXoHZ0V/YcK8+4crsw9gNZAVB3CejTxHr7Q4EL2o+ CzS89nycez8Mk5hnIYJWa7FTUgZO/9OVF8Z9O5/MyA70JTQQWLQalu2us+7idPYcAyh8 fDgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ejT082T+; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="grub-devel-bounces+patch=linaro.org@gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x189-v6si1818881qkc.167.2018.11.14.11.30.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 14 Nov 2018 11:30:56 -0800 (PST) Received-SPF: pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ejT082T+; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="grub-devel-bounces+patch=linaro.org@gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0sJ-0001fQ-Ld for patch@linaro.org; Wed, 14 Nov 2018 14:30:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41212) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0qx-0000jm-Jd for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN0qw-0004tZ-Ii for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:31 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:43895) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN0qw-0004rw-0m for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:30 -0500 Received: by mail-wr1-x444.google.com with SMTP id r10so1053120wrs.10 for ; Wed, 14 Nov 2018 11:29:28 -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=a/mEJg9wqh1E6lQ7qxfFDyyCI5laFJUVbEtQyYHaFWA=; b=ejT082T+IZxyhJ8nV+p6uNghKgnc0wZMDy7k21XuN8v2oD2NDP88MN2Pjryh/6XxcX pKJhP9yU66ehDmkzUXsFMTa0dI8cA6X8NTKHTbxDqRmegVAfP9FwpqERC8RGTrl6LU9v vxqZtE5rSiR0op3I6ulNcxgMBkZqF1/Ug8XAY= 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=a/mEJg9wqh1E6lQ7qxfFDyyCI5laFJUVbEtQyYHaFWA=; b=nWwlkCmAe9LxXN+7PJ1j+JXJuz3AJOTGqjUHay+NSUhCk8IB5o7rJlav2mY/DjlLua /FGtweaUAN8L04K9oGu9V6y+m151mqj6YT3oFKWMoKhb5pccFpyh5NT3RtaVFTOM6xLa ZGt4Vol9uTb71aP7ZF201oalw3CfQbsF2jkSXQRFrPpMDoAOfvPjwAwXS5A2MpqYJSDb unz+Wgh465WWc0F828Qj0ECLsjn/uzr0EqD4mSVtpxHdoB5oAl/Ez1YFGrm5yL92R1if gAYkB+r7fiXH04XIekTbcKk8x1NV/Azit99QxEespRrb8ycHU5Q0wiOZTTBAUY8wL1Xz sFow== X-Gm-Message-State: AGRZ1gJC/nlVvT/pxmmOqRz9lZZyYOrMi8tqOQ0vpDQVLcd84+L3C/le 36Eg+k2BOhegV4dftT77GBJMgdxPExSGUQ== X-Received: by 2002:a5d:6a8d:: with SMTP id s13-v6mr3212227wru.179.1542223767132; Wed, 14 Nov 2018 11:29:27 -0800 (PST) Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id 127sm6260278wmb.4.2018.11.14.11.29.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 11:29:25 -0800 (PST) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH 4/5] arm64/efi: fix breakage caused by verifiers Date: Wed, 14 Nov 2018 19:29:18 +0000 Message-Id: <20181114192919.24655-5-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181114192919.24655-1-leif.lindholm@linaro.org> References: <20181114192919.24655-1-leif.lindholm@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The development of GNU GRUB Cc: dkiper@net-space.pl MIME-Version: 1.0 Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: "Grub-devel" - add variable "err" (used but not defined) - add GRUB_FILE_TYPE_LINUX_KERNEL to grub_file_open call Signed-off-by: Leif Lindholm --- grub-core/loader/arm64/linux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.11.0 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index b8315b53f..c37295c0b 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -288,6 +288,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), { grub_file_t file = 0; struct linux_armxx_kernel_header lh; + grub_err_t err; grub_dl_ref (my_mod); @@ -297,7 +298,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), goto fail; } - file = grub_file_open (argv[0]); + file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL); if (!file) goto fail;