On Mon, Jun 5, 2017 at 9:16 AM, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > 3.18-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > 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. It should be possible to trivially backport ec9ee4acd97c0039a61c0ae4f12705767ae62153 to gain get_random_long(). -Kees > > Reported-by: Philip Müller <philm@xxxxxxxxxxx> > Cc: Daniel Micay <danielmicay@xxxxxxxxx> > Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx> > Cc: Rik van Riel <riel@xxxxxxxxxx> > Cc: Kees Cook <keescook@xxxxxxxxxxxx> > Cc: Arjan van Ven <arjan@xxxxxxxxxxxxxxx> > Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> > Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Cc: kernel-hardening@xxxxxxxxxxxxxxxxxx > Cc: Ingo Molnar <mingo@xxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > --- > 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 > > /* > > -- Kees Cook Pixel Security