From: "Yinghai Lu" <yhlu.kernel@gmail.com>
To: "Andrew Morton" <akpm@linux-foundation.org>,
"Ingo Molnar" <mingo@elte.hu>,
"Christoph Lameter" <clameter@sgi.com>
Cc: "kernel list" <linux-kernel@vger.kernel.org>
Subject: [PATCH] mm: fix boundary checking in free_bootmem_core
Date: Tue, 11 Mar 2008 18:01:35 -0700 [thread overview]
Message-ID: <86802c440803111801m20349386l58a108cec13eb5ee@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
[PATCH] mm: fix boundary checking in free_bootmem_core
so call it when numa is enabled, we don't know which node have that range.
and make it more robust.
try to trim it to get valid sidx, and eidx.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: check_boundary_free_bootmem_x.patch --]
[-- Type: text/x-patch; name=check_boundary_free_bootmem_x.patch, Size: 1618 bytes --]
Index: linux-2.6/mm/bootmem.c
===================================================================
--- linux-2.6.orig/mm/bootmem.c
+++ linux-2.6/mm/bootmem.c
@@ -125,6 +125,7 @@ static int __init reserve_bootmem_core(b
BUG_ON(!size);
BUG_ON(PFN_DOWN(addr) >= bdata->node_low_pfn);
BUG_ON(PFN_UP(addr + size) > bdata->node_low_pfn);
+ BUG_ON(addr < bdata->node_boot_start);
sidx = PFN_DOWN(addr - bdata->node_boot_start);
eidx = PFN_UP(addr + size - bdata->node_boot_start);
@@ -156,21 +157,31 @@ static void __init free_bootmem_core(boo
unsigned long sidx, eidx;
unsigned long i;
+ BUG_ON(!size);
+
+ /* out range */
+ if (addr + size < bdata->node_boot_start ||
+ PFN_DOWN(addr) > bdata->node_low_pfn)
+ return;
/*
* round down end of usable mem, partially free pages are
* considered reserved.
*/
- BUG_ON(!size);
- BUG_ON(PFN_DOWN(addr + size) > bdata->node_low_pfn);
- if (addr < bdata->last_success)
+ if (addr >= bdata->node_boot_start && addr < bdata->last_success)
bdata->last_success = addr;
/*
- * Round up the beginning of the address.
+ * Round up to index to the range.
*/
- sidx = PFN_UP(addr) - PFN_DOWN(bdata->node_boot_start);
+ if (PFN_UP(addr) > PFN_DOWN(bdata->node_boot_start))
+ sidx = PFN_UP(addr) - PFN_DOWN(bdata->node_boot_start);
+ else
+ sidx = 0;
+
eidx = PFN_DOWN(addr + size - bdata->node_boot_start);
+ if (eidx > bdata->node_low_pfn - PFN_DOWN(bdata->node_boot_start))
+ eidx = bdata->node_low_pfn - PFN_DOWN(bdata->node_boot_start);
for (i = sidx; i < eidx; i++) {
if (unlikely(!test_and_clear_bit(i, bdata->node_bootmem_map)))
next reply other threads:[~2008-03-12 1:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-12 1:01 Yinghai Lu [this message]
2008-03-12 23:21 ` Yinghai Lu
2008-03-12 23:33 ` Andrew Morton
2008-03-13 1:11 ` Yinghai Lu
2008-03-13 1:22 ` Andrew Morton
2008-03-13 21:59 ` Andi Kleen
2008-03-13 22:22 ` Yinghai Lu
2008-03-14 11:58 ` Andi Kleen
2008-03-14 16:44 ` Yinghai Lu
2008-03-14 16:53 ` Andi Kleen
2008-03-14 17:36 ` Yinghai Lu
2008-03-21 19:44 ` Andrew Morton
2008-03-21 20:00 ` Ingo Molnar
2008-03-21 21:54 ` Thomas Gleixner
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=86802c440803111801m20349386l58a108cec13eb5ee@mail.gmail.com \
--to=yhlu.kernel@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=clameter@sgi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/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
all inboxes | Powered by JetHome®