@@ -209,7 +209,11 @@ struct aio_kiocb {
struct kioctx *ki_ctx;
kiocb_cancel_fn *ki_cancel;
- struct iocb __user *ki_user_iocb; /* user's aiocb */
+ union {
+ struct iocb __user *ki_user_iocb; /* user's aiocb */
+ unsigned long ki_index;
+ };
+
__u64 ki_user_data; /* user's data for completion */
struct list_head ki_list; /* the aio core uses this
@@ -1192,7 +1196,7 @@ static void iocb_put_many(struct kioctx *ctx, void **iocbs, int *nr)
static void aio_fill_event(struct io_event *ev, struct aio_kiocb *iocb,
long res, long res2)
{
- ev->obj = (u64)(unsigned long)iocb->ki_user_iocb;
+ ev->obj = iocb->ki_index;
ev->data = iocb->ki_user_data;
ev->res = res;
ev->res2 = res2;
@@ -2299,7 +2303,7 @@ static ssize_t aio_poll(struct aio_kiocb *aiocb, const struct iocb *iocb)
}
static int __io_submit_one(struct kioctx *ctx, const struct iocb *iocb,
- struct iocb __user *user_iocb,
+ unsigned long ki_index,
struct aio_submit_state *state, bool compat)
{
struct aio_kiocb *req;
@@ -2346,14 +2350,17 @@ static int __io_submit_one(struct kioctx *ctx, const struct iocb *iocb,
}
if (aio_ctx_supports_cancel(ctx)) {
+ struct iocb __user *user_iocb = (struct iocb __user *) ki_index;
+
ret = put_user(KIOCB_KEY, &user_iocb->aio_key);
if (unlikely(ret)) {
pr_debug("EFAULT: aio_key\n");
goto out_put_req;
}
- }
+ req->ki_user_iocb = user_iocb;
+ } else
+ req->ki_index = ki_index;
- req->ki_user_iocb = user_iocb;
req->ki_user_data = iocb->aio_data;
ret = -EINVAL;
@@ -2419,12 +2426,13 @@ static int __io_submit_one(struct kioctx *ctx, const struct iocb *iocb,
static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
struct aio_submit_state *state, bool compat)
{
+ unsigned long ki_index = (unsigned long) user_iocb;
struct iocb iocb;
if (unlikely(copy_from_user(&iocb, user_iocb, sizeof(iocb))))
return -EFAULT;
- return __io_submit_one(ctx, &iocb, user_iocb, state, compat);
+ return __io_submit_one(ctx, &iocb, ki_index, state, compat);
}
#ifdef CONFIG_BLOCK
This is used for the user iocb pointer right now, but in preparation for having iocbs not reside in userspace, unionize with a ki_index and pass that in instead. Signed-off-by: Jens Axboe <axboe@kernel.dk> --- fs/aio.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)