Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MIVuw-0004FW-Ap for mharc-grub-devel@gnu.org; Sun, 21 Jun 2009 18:53:42 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MIVuu-0004FC-4V for grub-devel@gnu.org; Sun, 21 Jun 2009 18:53:40 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MIVup-0004Ez-Jx for grub-devel@gnu.org; Sun, 21 Jun 2009 18:53:39 -0400 Received: from [199.232.76.173] (port=60755 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MIVup-0004Ew-GN for grub-devel@gnu.org; Sun, 21 Jun 2009 18:53:35 -0400 Received: from aybabtu.com ([69.60.117.155]:59684) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MIVup-0005F6-0H for grub-devel@gnu.org; Sun, 21 Jun 2009 18:53:35 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1MIUrt-00056E-97 for grub-devel@gnu.org; Sun, 21 Jun 2009 23:46:29 +0200 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1MIVum-0000dw-9I for grub-devel@gnu.org; Mon, 22 Jun 2009 00:53:32 +0200 Date: Mon, 22 Jun 2009 00:53:32 +0200 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20090621225332.GB2360@thorin> References: <20090621181748.GA21152@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="PEIAKu/WMn1b1Hv9" Content-Disposition: inline In-Reply-To: <20090621181748.GA21152@thorin> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1) Subject: [PATCH] access gdtdesc on segment 0 unconditionally (Re: [PATCH] i386-qemu port) X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2009 22:53:40 -0000 --PEIAKu/WMn1b1Hv9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In this line of code in real_to_prot(): DATA32 ADDR32 lgdt %cs:gdtdesc GAS generates an absolute address for `gdtdesc' (not relative to segment), and so for the code to work %cs must be zero. In current usage of real_to_prot(), %cs is always zero because we jump to 0x0:0x82xx early on. However, in other situations this is not possible. On i386-qemu, before moving to i386 mode the code we're running is in the 0xf0000-0x100000 range, which is inaccessible from segment 0. This patch changes this to access gdtdesc from segment 0 unconditionally. -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all." --PEIAKu/WMn1b1Hv9 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="cs_in_real_to_prot.diff" 2009-06-22 Robert Millan * kern/i386/pc/startup.S (real_to_prot): Access `gdtdesc' using segment 0x0 unconditionally, because the reference generated by GAS is an absolute address. Index: kern/i386/pc/startup.S =================================================================== --- kern/i386/pc/startup.S (revision 2353) +++ kern/i386/pc/startup.S (working copy) @@ -1,6 +1,6 @@ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 1999,2000,2001,2002,2003,2005,2006,2007,2008 Free Software Foundation, Inc. + * Copyright (C) 1999,2000,2001,2002,2003,2005,2006,2007,2008,2009 Free Software Foundation, Inc. * * GRUB is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -313,13 +313,9 @@ cli /* load the GDT register */ -#ifdef APPLE_CC - mov %cs, %ax - mov %ax, %ds - DATA32 ADDR32 lgdt gdtdesc -#else - DATA32 ADDR32 lgdt %cs:gdtdesc -#endif + xorw %ax, %ax + movw %ax, %ds + DATA32 ADDR32 lgdt %ds:gdtdesc /* turn on protected mode */ movl %cr0, %eax --PEIAKu/WMn1b1Hv9--