Commit 622754e8 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld
Browse files

stackprotector: actually use get_random_canary() 



The RNG always mixes in the Linux version extremely early in boot. It
also always includes a cycle counter, not only during early boot, but
each and every time it is invoked prior to being fully initialized.
Together, this means that the use of additional xors inside of the
various stackprotector.h files is superfluous and over-complicated.
Instead, we can get exactly the same thing, but better, by just calling
`get_random_canary()`.

Acked-by: Guo Ren <guoren@kernel.org> # for csky
Acked-by: Catalin Marinas <catalin.marinas@arm.com> # for arm64
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
parent b3883a9a

arch/arm/include/asm/stackprotector.h

+1 −8
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
#ifndef _ASM_STACKPROTECTOR_H

#define _ASM_STACKPROTECTOR_H 1



#include <linux/random.h>

#include <linux/version.h>



#include <asm/thread_info.h>



extern unsigned long __stack_chk_guard;
@@ -30,11 +27,7 @@ extern unsigned long __stack_chk_guard; 
 */

static __always_inline void boot_init_stack_canary(void)

{

	unsigned long canary;



	/* Try to get a semi random initial value. */

	get_random_bytes(&canary, sizeof(canary));

	canary ^= LINUX_VERSION_CODE;

	unsigned long canary = get_random_canary();



	current->stack_canary = canary;

#ifndef CONFIG_STACKPROTECTOR_PER_TASK

arch/arm64/include/asm/stackprotector.h

+1 −8
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
#ifndef __ASM_STACKPROTECTOR_H

#define __ASM_STACKPROTECTOR_H



#include <linux/random.h>

#include <linux/version.h>

#include <asm/pointer_auth.h>



extern unsigned long __stack_chk_guard;
@@ -28,12 +26,7 @@ extern unsigned long __stack_chk_guard; 
static __always_inline void boot_init_stack_canary(void)

{

#if defined(CONFIG_STACKPROTECTOR)

	unsigned long canary;



	/* Try to get a semi random initial value. */

	get_random_bytes(&canary, sizeof(canary));

	canary ^= LINUX_VERSION_CODE;

	canary &= CANARY_MASK;

	unsigned long canary = get_random_canary();



	current->stack_canary = canary;

	if (!IS_ENABLED(CONFIG_STACKPROTECTOR_PER_TASK))

arch/csky/include/asm/stackprotector.h

+1 −9
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
#ifndef _ASM_STACKPROTECTOR_H

#define _ASM_STACKPROTECTOR_H 1



#include <linux/random.h>

#include <linux/version.h>



extern unsigned long __stack_chk_guard;



/*
@@ -15,12 +12,7 @@ extern unsigned long __stack_chk_guard; 
 */

static __always_inline void boot_init_stack_canary(void)

{

	unsigned long canary;



	/* Try to get a semi random initial value. */

	get_random_bytes(&canary, sizeof(canary));

	canary ^= LINUX_VERSION_CODE;

	canary &= CANARY_MASK;

	unsigned long canary = get_random_canary();



	current->stack_canary = canary;

	__stack_chk_guard = current->stack_canary;

arch/mips/include/asm/stackprotector.h

+1 −8
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
#ifndef _ASM_STACKPROTECTOR_H

#define _ASM_STACKPROTECTOR_H 1



#include <linux/random.h>

#include <linux/version.h>



extern unsigned long __stack_chk_guard;



/*
@@ -28,11 +25,7 @@ extern unsigned long __stack_chk_guard; 
 */

static __always_inline void boot_init_stack_canary(void)

{

	unsigned long canary;



	/* Try to get a semi random initial value. */

	get_random_bytes(&canary, sizeof(canary));

	canary ^= LINUX_VERSION_CODE;

	unsigned long canary = get_random_canary();



	current->stack_canary = canary;

	__stack_chk_guard = current->stack_canary;

arch/powerpc/include/asm/stackprotector.h

+1 −9
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
#ifndef _ASM_STACKPROTECTOR_H

#define _ASM_STACKPROTECTOR_H



#include <linux/random.h>

#include <linux/version.h>

#include <asm/reg.h>

#include <asm/current.h>

#include <asm/paca.h>
@@ -21,13 +19,7 @@ 
 */

static __always_inline void boot_init_stack_canary(void)

{

	unsigned long canary;



	/* Try to get a semi random initial value. */

	canary = get_random_canary();

	canary ^= mftb();

	canary ^= LINUX_VERSION_CODE;

	canary &= CANARY_MASK;

	unsigned long canary = get_random_canary();



	current->stack_canary = canary;

#ifdef CONFIG_PPC64