From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Jun 2014 21:00:13 +0000 (-0700)
Subject: Merge git://git.kvack.org/~bcrl/aio-fixes
X-Git-Tag: MMI-PSA29.97-13-9~12012
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10b5b5361a3c2a7fff9dbfa0f127adc2531e7732;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

10b5b5361a3c2a7fff9dbfa0f127adc2531e7732