1 files changed, 5 insertions, 2 deletions

diff --git a/fs/aio.c b/fs/aio.c
index 986ff305a856..5d7dad365f5f 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1159,7 +1159,7 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
                 }
         }
 
-        ret = put_user(req->ki_key, &user_iocb->aio_key);
+        ret = put_user(KIOCB_KEY, &user_iocb->aio_key);
         if (unlikely(ret)) {
                 pr_debug("EFAULT: aio_key\n");
                 goto out_put_req;
@@ -1281,10 +1281,13 @@ static struct kiocb *lookup_kiocb(struct kioctx *ctx, struct iocb __user *iocb,
 
         assert_spin_locked(&ctx->ctx_lock);
 
+        if (key != KIOCB_KEY)
+                return NULL;
+
         /* TODO: use a hash or array, this sucks. */
         list_for_each(pos, &ctx->active_reqs) {
                 struct kiocb *kiocb = list_kiocb(pos);
-                if (kiocb->ki_obj.user == iocb && kiocb->ki_key == key)
+                if (kiocb->ki_obj.user == iocb)
                         return kiocb;
         }
         return NULL;