Received: from list by lists.gnu.org with archive (Exim 4.71) id 1h6E1y-0007rl-Iy for mharc-grub-devel@gnu.org; Tue, 19 Mar 2019 08:39:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6E1v-0007p8-H9 for grub-devel@gnu.org; Tue, 19 Mar 2019 08:39:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6E1u-0007Dv-Rk for grub-devel@gnu.org; Tue, 19 Mar 2019 08:39:43 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:35890) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6E1u-0007Ca-De for grub-devel@gnu.org; Tue, 19 Mar 2019 08:39:42 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x2JCYAM0118853; Tue, 19 Mar 2019 12:39:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=Fm/tC3NUEo71KDMznRJUzTIasE7GuD4TPOQtbxLpjWM=; b=GS6EQiMCCJNgsOBI6Bat+WdwwVZcBl7I8DSKCqkAY47ESM5yrdfR6JQZLurtn5voynab 1GfHo8KHVp7duZcr8gtfVgHK+orLcxUmc8dqJ31qG+ujoVsa/wPcyWeVLjQv/mjmfncb VhiG3aTScqyVYcgYyLSTeJvhmZBDW9ijO7syDMaY4ln2BS5zaLkI0X/56CTMHhMGaau4 nFdOyB3Wypd06aLGJYYTxwBFkF3OkhnSdl5MCzz7DgxrRXjcPpm+S23e2r5Q2Ng81PYX BNNqRISMQYpud85bY6sbwMBwqmc+IQNlsB8phqqCzfQhe7YUOeVienzE5sOLVXQfaKsg /g== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2130.oracle.com with ESMTP id 2r8rjumc4p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Mar 2019 12:39:40 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x2JCdd7p021460 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Mar 2019 12:39:39 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x2JCddx6022948; Tue, 19 Mar 2019 12:39:39 GMT Received: from tomti.i.net-space.pl (/10.175.211.126) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 19 Mar 2019 05:39:39 -0700 From: Daniel Kiper To: grub-devel@gnu.org Cc: alexander.burmashev@oracle.com, eric.snowberg@oracle.com, leif.lindholm@linaro.org, phcoder@gmail.com, ross.philipson@oracle.com Subject: [PATCH 2/5] verifiers: PowerPC fallout cleanup Date: Tue, 19 Mar 2019 13:39:15 +0100 Message-Id: <20190319123918.19267-3-daniel.kiper@oracle.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190319123918.19267-1-daniel.kiper@oracle.com> References: <20190319123918.19267-1-daniel.kiper@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9199 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1903190093 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.86 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: , X-List-Received-Date: Tue, 19 Mar 2019 12:39:44 -0000 PowerPC fallout cleanup after commit 4d4a8c96e (verifiers: Add possibility to verify kernel and modules command lines) and ca0a4f689 (verifiers: File type for fine-grained signature-verification controlling). Signed-off-by: Daniel Kiper --- grub-core/loader/powerpc/ieee1275/linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c index c114e7df4..818b2a86d 100644 --- a/grub-core/loader/powerpc/ieee1275/linux.c +++ b/grub-core/loader/powerpc/ieee1275/linux.c @@ -270,7 +270,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), goto out; } - elf = grub_elf_open (argv[0]); + elf = grub_elf_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL); if (! elf) goto out; @@ -303,7 +303,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), /* Create kernel command line. */ grub_memcpy (linux_args, LINUX_IMAGE, sizeof (LINUX_IMAGE)); if (grub_create_loader_cmdline (argc, argv, linux_args + sizeof (LINUX_IMAGE) - 1, - size)) + size, GRUB_VERIFY_KERNEL_CMDLINE)) goto out; out: -- 2.11.0