Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932910AbdFLPnE (ORCPT ); Mon, 12 Jun 2017 11:43:04 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:45592 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932879AbdFLPnB (ORCPT ); Mon, 12 Jun 2017 11:43:01 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Micay , Arjan van de Ven , Rik van Riel , Kees Cook , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , kernel-hardening@lists.openwall.com, Ingo Molnar Subject: [PATCH 3.18 26/45] stackprotector: Increase the per-task stack canarys random range from 32 bits to 64 bits on 64-bit platforms Date: Mon, 12 Jun 2017 17:26:36 +0200 Message-Id: <20170612152554.780977170@linuxfoundation.org> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170612152553.118037974@linuxfoundation.org> References: <20170612152553.118037974@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1288 Lines: 41 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Micay commit 5ea30e4e58040cfd6434c2f33dc3ea76e2c15b05 upstream. The stack canary is an 'unsigned long' and should be fully initialized to random data rather than only 32 bits of random data. Signed-off-by: Daniel Micay Acked-by: Arjan van de Ven Acked-by: Rik van Riel Acked-by: Kees Cook Cc: Arjan van Ven Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: kernel-hardening@lists.openwall.com Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20170504133209.3053-1-danielmicay@gmail.com Signed-off-by: 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_int(); + tsk->stack_canary = get_random_long(); #endif /*