---

yaml
---
r: 91
b: refs/heads/master
c: f0de53b
h: refs/heads/master
i:
  89: 584d8b9
  87: 10c727d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94ad84740fb3fe6c2112e60bc71a256c2815479d
+refs/heads/master: f0de53bbc2118c754ee923516122d91add288582

trunk/arch/x86_64/kernel/mce.c

@@ -379,18 +379,23 @@ static void collect_tscs(void *data)
 
 static ssize_t mce_read(struct file *filp, char __user *ubuf, size_t usize, loff_t *off)
 {
-	unsigned long cpu_tsc[NR_CPUS];
+	unsigned long *cpu_tsc;
 	static DECLARE_MUTEX(mce_read_sem);
 	unsigned next;
 	char __user *buf = ubuf;
 	int i, err;
 
+	cpu_tsc = kmalloc(NR_CPUS * sizeof(long), GFP_KERNEL);
+	if (!cpu_tsc)
+		return -ENOMEM;
+
 	down(&mce_read_sem); 
 	next = rcu_dereference(mcelog.next);
 
 	/* Only supports full reads right now */
 	if (*off != 0 || usize < MCE_LOG_LEN*sizeof(struct mce)) { 
 		up(&mce_read_sem);
+		kfree(cpu_tsc);
 		return -EINVAL;
 	}
 
@@ -421,6 +426,7 @@ static ssize_t mce_read(struct file *filp, char __user *ubuf, size_t usize, loff
 		}
 	} 	
 	up(&mce_read_sem);
+	kfree(cpu_tsc);
 	return err ? -EFAULT : buf - ubuf; 
 }