aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/panic.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 6f6e03e91595..da4d6bac270e 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -19,6 +19,7 @@
19#include <linux/nmi.h> 19#include <linux/nmi.h>
20#include <linux/kexec.h> 20#include <linux/kexec.h>
21#include <linux/debug_locks.h> 21#include <linux/debug_locks.h>
22#include <linux/random.h>
22 23
23int panic_on_oops; 24int panic_on_oops;
24int tainted; 25int tainted;
@@ -266,12 +267,29 @@ void oops_enter(void)
266} 267}
267 268
268/* 269/*
270 * 64-bit random ID for oopses:
271 */
272static u64 oops_id;
273
274static int init_oops_id(void)
275{
276 if (!oops_id)
277 get_random_bytes(&oops_id, sizeof(oops_id));
278
279 return 0;
280}
281late_initcall(init_oops_id);
282
283/*
269 * Called when the architecture exits its oops handler, after printing 284 * Called when the architecture exits its oops handler, after printing
270 * everything. 285 * everything.
271 */ 286 */
272void oops_exit(void) 287void oops_exit(void)
273{ 288{
274 do_oops_enter_exit(); 289 do_oops_enter_exit();
290 init_oops_id();
291 printk(KERN_WARNING "---[ end trace %016llx ]---\n",
292 (unsigned long long)oops_id);
275} 293}
276 294
277#ifdef CONFIG_CC_STACKPROTECTOR 295#ifdef CONFIG_CC_STACKPROTECTOR