From: Christian Franke <Christian.Franke@t-online.de>
To: The development of GRUB 2 <grub-devel@gnu.org>
Subject: Re: [PATCH] Fix eisa_mmap evaluation, add memory existence check
Date: Mon, 19 Nov 2007 22:40:42 +0100 [thread overview]
Message-ID: <474202DA.4010001@t-online.de> (raw)
In-Reply-To: <20071118112737.GB16674@thorin>
[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]
Robert Millan wrote:
> On Tue, Oct 23, 2007 at 09:06:16PM +0200, Christian Franke wrote:
>
>> +/* Check memory address */
>> +static int
>> +addr_is_valid (grub_addr_t addr)
>> +{
>> + volatile unsigned char * p = (volatile unsigned char *)addr;
>> + unsigned char x, y;
>> + x = *p;
>> + *p = x ^ 0xcf;
>> + y = *p;
>> + *p = x;
>> + return y == (x ^ 0xcf);
>> +}
>>
>
> 0xff would be better IMO.
>
>
Done.
>> + if (!(addr + size > addr && addr_is_valid (addr) && addr_is_valid (addr+size-1)))
>> + grub_fatal ("invalid memory region %p - %p", (char*)addr, (char*)addr+size-1);
>>
>
> Should `addr + size > addr' be optimized out as `size > 0' ? (or if we need it
> this way to check for overflows, should we prevent gcc from optimizing it?)
>
>
Good point.
It worked (I usually test all corner cases before patch release). And a
review of .S file shows that gcc (3.4.4) does not optimize here. I'm not
sure whether that would be allowed.
But you are right - such check should not depend on specific overflow
behaviour. I've changed this.
New patch attached, old changelog still valid.
Christian
[-- Attachment #2: grub2-init-eisa_mmap-2.patch --]
[-- Type: text/x-patch, Size: 1489 bytes --]
--- grub2.orig/kern/i386/pc/init.c 2007-10-22 22:22:51.359375000 +0200
+++ grub2/kern/i386/pc/init.c 2007-11-19 22:11:19.796875000 +0100
@@ -83,6 +83,19 @@ make_install_device (void)
return grub_prefix;
}
+/* Check memory address. */
+static int
+addr_is_valid (grub_addr_t addr)
+{
+ volatile unsigned char * p = (volatile unsigned char *)addr;
+ unsigned char x = *p;
+ unsigned char y = ~x;
+ *p = y;
+ unsigned char t = *p;
+ *p = x;
+ return y == t;
+}
+
/* Add a memory region. */
static void
add_mem_region (grub_addr_t addr, grub_size_t size)
@@ -91,6 +104,10 @@ add_mem_region (grub_addr_t addr, grub_s
/* Ignore. */
return;
+ if (!(0 < size && size - 1 <= ~(grub_addr_t)0 - addr &&
+ addr_is_valid (addr) && addr_is_valid (addr + size - 1)))
+ grub_fatal ("invalid memory region %p - %p", (char*)addr, (char*)addr + size - 1);
+
mem_regions[num_regions].addr = addr;
mem_regions[num_regions].size = size;
num_regions++;
@@ -199,13 +216,8 @@ grub_machine_init (void)
if (eisa_mmap)
{
- if ((eisa_mmap & 0xFFFF) == 0x3C00)
- add_mem_region (0x100000, (eisa_mmap << 16) + 0x100000 * 15);
- else
- {
- add_mem_region (0x100000, (eisa_mmap & 0xFFFF) << 10);
- add_mem_region (0x1000000, eisa_mmap << 16);
- }
+ add_mem_region (0x100000, (eisa_mmap & 0xFFFF) << 10);
+ add_mem_region (0x1000000, eisa_mmap & ~0xFFFF);
}
else
add_mem_region (0x100000, grub_get_memsize (1) << 10);
next prev parent reply other threads:[~2007-11-19 21:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-23 19:06 [PATCH] Fix eisa_mmap evaluation, add memory existence check Christian Franke
2007-10-23 20:18 ` Robert Millan
2007-10-23 20:36 ` Christian Franke
2007-11-09 14:17 ` Marco Gerards
2007-11-09 23:12 ` Christian Franke
2007-11-10 15:59 ` Marco Gerards
2007-11-10 19:53 ` Christian Franke
2007-11-09 20:51 ` Robert Millan
2007-11-09 21:53 ` Christian Franke
2007-11-09 22:51 ` Robert Millan
2007-11-18 11:09 ` Marco Gerards
2007-11-18 11:21 ` Robert Millan
2007-11-18 11:27 ` Robert Millan
2007-11-18 12:26 ` Robert Millan
2007-11-19 21:40 ` Christian Franke [this message]
2007-12-31 15:40 ` Christian Franke
2008-01-01 11:16 ` Robert Millan
2008-01-01 17:26 ` Christian Franke
2008-01-01 17:44 ` Robert Millan
2008-01-01 18:03 ` Christian Franke
2008-01-01 18:33 ` Robert Millan
2008-01-04 11:49 ` Robert Millan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=474202DA.4010001@t-online.de \
--to=christian.franke@t-online.de \
--cc=grub-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox