---

yaml --- r: 206175 b: refs/heads/master c: 3b770a2 h: refs/heads/master i: 206173: 682e60a 206171: d990532 206167: 91a9b60 206159: 7084c96 206143: 765b1db v: v3
git-mirror · Jul 13, 2010 · 7b20ee9 · 7b20ee9
1 parent fca5f7e
commit 7b20ee9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df378ccfc4dd04e263426ad805516915874774aa
+refs/heads/master: 3b770a2128423a687e6e9c57184a584fb4ba4c77
diff --git a/trunk/arch/x86/kernel/alternative.c b/trunk/arch/x86/kernel/alternative.c
@@ -214,6 +214,7 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
 		u8 *instr = a->instr;
 		BUG_ON(a->replacementlen > a->instrlen);
 		BUG_ON(a->instrlen > sizeof(insnbuf));
+		BUG_ON(a->cpuid >= NCAPINTS*32);
 		if (!boot_cpu_has(a->cpuid))
 			continue;
 #ifdef CONFIG_X86_64