Merge git://git.kvack.org/~bcrl/aio-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Jun 2014 21:00:13 +0000 (14:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Jun 2014 21:00:13 +0000 (14:00 -0700)
Pull aio fixes from Ben LaHaise:
 "These fix a kernel memory disclosure issue (arbitrary kmap() &
  copy_to_user()) revealed in CVE-2014-0206 by changes that were
  introduced in v3.10"

* git://git.kvack.org/~bcrl/aio-fixes:
  aio: fix kernel memory disclosure in io_getevents() introduced in v3.10
  aio: fix aio request leak when events are reaped by userspace


Trivial merge