From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:50700 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752520AbdE0KNb (ORCPT ); Sat, 27 May 2017 06:13:31 -0400 Subject: Patch "Revert "stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms"" has been added to the 3.18-stable tree To: gregkh@linuxfoundation.org, arjan@linux.intel.com, danielmicay@gmail.com, keescook@chromium.org, mingo@kernel.org, peterz@infradead.org, philm@manjaro.org, riel@redhat.com, tglx@linutronix.de, torvalds@linux-foundation.org Cc: , From: Date: Sat, 27 May 2017 12:13:21 +0200 Message-ID: <14958800017160@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled Revert "stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms" to the 3.18-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-stackprotector-increase-the-per-task-stack-canary-s-random-range-from-32-bits-to-64-bits-on-64-bit-platforms.patch and it can be found in the queue-3.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From bc67a9f0ba89051916f192895317a0b5a431ad7e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 27 May 2017 12:09:37 +0200 Subject: Revert "stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms" From: Greg Kroah-Hartman This reverts commit 609a3e81550b0b4ea87197b0f59455a7bcff975a which is commit 5ea30e4e58040cfd6434c2f33dc3ea76e2c15b05 upstream. It shouldn't have been backported to 3.18, as we do not have get_random_long() in that kernel tree. Reported-by: Philip Müller Cc: Daniel Micay Cc: Arjan van de Ven Cc: Rik van Riel Cc: Kees Cook Cc: Arjan van Ven Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: kernel-hardening@lists.openwall.com Cc: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- kernel/fork.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/fork.c +++ b/kernel/fork.c @@ -338,7 +338,7 @@ static struct task_struct *dup_task_stru set_task_stack_end_magic(tsk); #ifdef CONFIG_CC_STACKPROTECTOR - tsk->stack_canary = get_random_long(); + tsk->stack_canary = get_random_int(); #endif /* Patches currently in stable-queue which might be from gregkh@linuxfoundation.org are queue-3.18/revert-stackprotector-increase-the-per-task-stack-canary-s-random-range-from-32-bits-to-64-bits-on-64-bit-platforms.patch