]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Jun 2019 01:44:45 +0000 (15:44 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Jun 2019 01:44:45 +0000 (15:44 -1000)
Pull ptrace fixes from Eric Biederman:
 "This is just two very minor fixes:

   - prevent ptrace from reading unitialized kernel memory found twice
     by syzkaller

   - restore a missing smp_rmb in ptrace_may_access and add comment tp
     it so it is not removed by accident again.

  Apologies for being a little slow about getting this to you, I am
  still figuring out how to develop with a little baby in the house"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  ptrace: restore smp_rmb() in __ptrace_may_access()
  signal/ptrace: Don't leak unitialized kernel memory with PTRACE_PEEK_SIGINFO

1  2 
kernel/cred.c
kernel/ptrace.c

diff --cc kernel/cred.c
Simple merge
diff --cc kernel/ptrace.c
Simple merge