Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jcacH-0006Ae-HG for mharc-grub-devel@gnu.org; Sat, 23 May 2020 16:19:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcacG-0006AU-Br for grub-devel@gnu.org; Sat, 23 May 2020 16:19:32 -0400 Received: from mailout02.mx.bawue.net ([193.7.176.63]:51889) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcacF-0002j9-He for grub-devel@gnu.org; Sat, 23 May 2020 16:19:32 -0400 Received: from infty.fritz.box (p5b17584c.dip0.t-ipconnect.de [91.23.88.76]) (Authenticated sender: pdim@bawue.de) by smtp.bawue.net (Postfix) with ESMTPSA id B97BF22612; Sat, 23 May 2020 22:19:27 +0200 (CEST) From: Hans Ulrich Niedermann To: grub-devel@gnu.org Cc: Hans Ulrich Niedermann Subject: [PATCH] mb2 loader: Fix header size, alignment for Multiboot 2 Date: Sat, 23 May 2020 22:19:22 +0200 Message-Id: <20200523201923.648465-2-hun@n-dimensional.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200523201923.648465-1-hun@n-dimensional.de> References: <20200523201923.648465-1-hun@n-dimensional.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Virus-Scanner: SAV Dynamic Interface 2.6.0, Engine: 3.77.1, SAV: 5.75 (F8623BC6) on relay01.mx.bawue.net using milter-sssp 0.1.0 X-Virus-Scan: Found to be clean. Received-SPF: pass client-ip=193.7.176.63; envelope-from=hun@n-dimensional.de; helo=mailout02.mx.bawue.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/23 16:19:28 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 May 2020 20:19:32 -0000 Change the old Multiboot 1 header size both in the explanatory comment and in the for loop condition actually looking for a Multiboot 2 header to the actual Multiboot 2 header size. This also fixes the old Multiboot 1 alignment copied over in the comment to reflect the Multiboot 2 specification. Signed-off-by: Hans Ulrich Niedermann diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c index a5f9a94a2..026109e69 100644 --- a/grub-core/loader/multiboot_mbi2.c +++ b/grub-core/loader/multiboot_mbi2.c @@ -90,10 +90,11 @@ static struct multiboot_header * find_header (grub_properly_aligned_t *buffer, grub_ssize_t len) { struct multiboot_header *header; - /* Look for the multiboot header in the buffer. The header should - be at least 12 bytes and aligned on a 4-byte boundary. */ + /* Look for the Multiboot 2 header magic in the buffer. The + complete MB2 header should be at least 16+8=24 bytes (header + magic plus terminator tag) and aligned on an 8-byte boundary. */ for (header = (struct multiboot_header *) buffer; - ((char *) header <= (char *) buffer + len - 12); + ((char *) header <= (char *) buffer + len - 24); header = (struct multiboot_header *) ((grub_uint32_t *) header + MULTIBOOT_HEADER_ALIGN / 4)) { if (header->magic == MULTIBOOT2_HEADER_MAGIC -- 2.26.2