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)
commit10b5b5361a3c2a7fff9dbfa0f127adc2531e7732
treef40dc0f8b3ef1a7fd3154d2231c08e0cf7e04b09
parentb4b664bef407bc80f325b2f2ab9350823c2869de
parentedfbbf388f293d70bf4b7c0bc38774d05e6f711a
Merge git://git.kvack.org/~bcrl/aio-fixes

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