From: Namhyung Kim <namhyung@gmail.com>
To: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH] memblock: Fix error path in memblock_add_region()
Date: Sun, 6 Feb 2011 22:31:15 +0900 [thread overview]
Message-ID: <1296999075-8022-1-git-send-email-namhyung@gmail.com> (raw)
@type->regions should be restored if memblock_double_array() fails.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
---
mm/memblock.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/mm/memblock.c b/mm/memblock.c
index bdba245d8afd..49284f9f99a6 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -379,6 +379,10 @@ static long __init_memblock memblock_add_region(struct memblock_type *type, phys
*/
if (type->cnt == type->max && memblock_double_array(type)) {
type->cnt--;
+ for (++i; i < type->cnt; i++) {
+ type->regions[i].base = type->regions[i+1].base;
+ type->regions[i].size = type->regions[i+1].size;
+ }
return -1;
}
--
1.7.3.4.600.g982838b0
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next reply other threads:[~2011-02-06 13:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-06 13:31 Namhyung Kim [this message]
2011-02-06 17:46 ` [PATCH] memblock: Fix error path in memblock_add_region() Yinghai Lu
2011-02-07 5:00 ` Namhyung Kim
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=1296999075-8022-1-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=yinghai@kernel.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;
as well as URLs for NNTP newsgroup(s).