From: tip-bot for Tang Chen <tangchen@cn.fujitsu.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
wency@cn.fujitsu.com, a.p.zijlstra@chello.nl,
tangchen@cn.fujitsu.com, tglx@linutronix.de
Subject: [tip:sched/urgent] sched: Ensure 'sched_domains_numa_levels' is safe to use in other functions
Date: Fri, 5 Oct 2012 06:01:47 -0700 [thread overview]
Message-ID: <tip-5f7865f3e44db4c73fdc454fb2af40806212a7ca@git.kernel.org> (raw)
In-Reply-To: <1348578751-16904-2-git-send-email-tangchen@cn.fujitsu.com>
Commit-ID: 5f7865f3e44db4c73fdc454fb2af40806212a7ca
Gitweb: http://git.kernel.org/tip/5f7865f3e44db4c73fdc454fb2af40806212a7ca
Author: Tang Chen <tangchen@cn.fujitsu.com>
AuthorDate: Tue, 25 Sep 2012 21:12:30 +0800
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 5 Oct 2012 13:54:46 +0200
sched: Ensure 'sched_domains_numa_levels' is safe to use in other functions
We should temporarily reset 'sched_domains_numa_levels' to 0 after
it is reset to 'level' in sched_init_numa(). If it fails to allocate
memory for array sched_domains_numa_masks[][], the array will contain
less then 'level' members. This could be dangerous when we use it to
iterate array sched_domains_numa_masks[][] in other functions.
This patch set sched_domains_numa_levels to 0 before initializing
array sched_domains_numa_masks[][], and reset it to 'level' when
sched_domains_numa_masks[][] is fully initialized.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1348578751-16904-2-git-send-email-tangchen@cn.fujitsu.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/sched/core.c | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index c177472..f895fdd 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6122,6 +6122,17 @@ static void sched_init_numa(void)
* numbers.
*/
+ /*
+ * Here, we should temporarily reset sched_domains_numa_levels to 0.
+ * If it fails to allocate memory for array sched_domains_numa_masks[][],
+ * the array will contain less then 'level' members. This could be
+ * dangerous when we use it to iterate array sched_domains_numa_masks[][]
+ * in other functions.
+ *
+ * We reset it to 'level' at the end of this function.
+ */
+ sched_domains_numa_levels = 0;
+
sched_domains_numa_masks = kzalloc(sizeof(void *) * level, GFP_KERNEL);
if (!sched_domains_numa_masks)
return;
@@ -6176,6 +6187,8 @@ static void sched_init_numa(void)
}
sched_domain_topology = tl;
+
+ sched_domains_numa_levels = level;
}
#else
static inline void sched_init_numa(void)
next prev parent reply other threads:[~2012-10-05 13:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 13:12 [PATCH v2 0/2] Update sched_domains_numa_masks when new cpus are onlined Tang Chen
2012-09-25 13:12 ` [PATCH v2 1/2] Ensure sched_domains_numa_levels safe in other functions Tang Chen
2012-10-05 13:01 ` tip-bot for Tang Chen [this message]
2012-09-25 13:12 ` [PATCH v2 2/2] Update sched_domains_numa_masks when new cpus are onlined Tang Chen
2012-10-04 12:30 ` Peter Zijlstra
2012-10-05 13:02 ` [tip:sched/urgent] sched: Update sched_domains_numa_masks[][] " tip-bot for Tang Chen
2012-10-02 11:33 ` [PATCH v2 0/2] Update sched_domains_numa_masks " Peter Zijlstra
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=tip-5f7865f3e44db4c73fdc454fb2af40806212a7ca@git.kernel.org \
--to=tangchen@cn.fujitsu.com \
--cc=a.p.zijlstra@chello.nl \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=wency@cn.fujitsu.com \
/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).