From 6c1910be4aa75cb4ac0cf9c17c8d07844c8d125d Mon Sep 17 00:00:00 2001 From: Daniel Walker Date: Mon, 14 Apr 2008 10:03:50 -0700 Subject: [PATCH] --- yaml --- r: 136357 b: refs/heads/master c: b719ac56c0032bc1602914c6ea70b0f1581b08c7 h: refs/heads/master i: 136355: f4e8a00a95df8bd65a5134338853f5c74eccd918 v: v3 --- [refs] | 2 +- trunk/kernel/panic.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 687bdecd559e..ec24e9cb2c49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54371a43a66f4477889769b4fa00df936855dc8f +refs/heads/master: b719ac56c0032bc1602914c6ea70b0f1581b08c7 diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c index 50cf9257b234..866be9b72e4f 100644 --- a/trunk/kernel/panic.c +++ b/trunk/kernel/panic.c @@ -341,14 +341,14 @@ static noinline void __stack_chk_test_func(void) * Besides, if we would, the test is already failed anyway so * time to pull the emergency brake on it. */ - if ((unsigned long)__builtin_return_address(0) == + if ((unsigned long)__builtin_return_address(0) == *(((unsigned long *)&foo)+1)) { printk(KERN_ERR "No -fstack-protector-stack-frame!\n"); return; } #ifdef CONFIG_FRAME_POINTER /* We also don't want to clobber the frame pointer */ - if ((unsigned long)__builtin_return_address(0) == + if ((unsigned long)__builtin_return_address(0) == *(((unsigned long *)&foo)+2)) { printk(KERN_ERR "No -fstack-protector-stack-frame!\n"); return;