From 15919cbbfa4a177e307cf4fdc2d4cd95aa15782f Mon Sep 17 00:00:00 2001 From: Alexander Viro Date: Wed, 25 Aug 2004 02:10:10 -0700 Subject: [PATCH] [PATCH] annotation of ki_buf ->ki_buf is always a userland pointer. --- fs/aio.c | 2 +- include/linux/aio.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index 333e72d6220e7..0cd2c6a10e734 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1523,7 +1523,7 @@ int fastcall io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, req->ki_user_data = iocb->aio_data; req->ki_pos = iocb->aio_offset; - req->ki_buf = (char *)(unsigned long)iocb->aio_buf; + req->ki_buf = (char __user *)(unsigned long)iocb->aio_buf; req->ki_left = req->ki_nbytes = iocb->aio_nbytes; req->ki_opcode = iocb->aio_lio_opcode; init_waitqueue_func_entry(&req->ki_wait, aio_wake_function); diff --git a/include/linux/aio.h b/include/linux/aio.h index 15d1eab3e0de3..a4d5af907f900 100644 --- a/include/linux/aio.h +++ b/include/linux/aio.h @@ -67,7 +67,7 @@ struct kiocb { /* State that we remember to be able to restart/retry */ unsigned short ki_opcode; size_t ki_nbytes; /* copy of iocb->aio_nbytes */ - char *ki_buf; /* remaining iocb->aio_buf */ + char __user *ki_buf; /* remaining iocb->aio_buf */ size_t ki_left; /* remaining bytes */ wait_queue_t ki_wait; long ki_retried; /* just for testing */ -- 2.53.0