[PATCH] String copy limiting fixes

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index bb46c293e3aed69dffd681095381fc1cd4a39344..96a96360750038ea87909c8fdfd45f36a89c9d13 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -42,13 +42,13 @@ static int check_engine_ops(struct ioengine_ops *ops)
        return 0;
 }
 
-struct ioengine_ops *load_ioengine(struct thread_data *td, char *name)
+struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
 {
        char engine[16], engine_lib[256];
        struct ioengine_ops *ops, *ret;
        void *dlhandle;
 
-       strcpy(engine, name);
+       strncpy(engine, name, sizeof(engine) - 1);
 
        /*
         * linux libaio has alias names, so convert to what we want
@@ -111,46 +111,6 @@ int td_io_prep(struct thread_data *td, struct io_u *io_u)
        return 0;
 }
 
-int td_io_sync(struct thread_data *td, struct fio_file *f)
-{
-       struct io_u *io_u = __get_io_u(td);
-       struct io_completion_data icd;
-       int ret;
-
-       if (!io_u)
-               return 1;
-
-       io_u->ddir = DDIR_SYNC;
-       io_u->file = f;
-
-       if (td_io_prep(td, io_u)) {
-               put_io_u(td, io_u);
-               return 1;
-       }
-
-       ret = td_io_queue(td, io_u);
-       if (ret) {
-               put_io_u(td, io_u);
-               td_verror(td, ret);
-               return 1;
-       }
-
-       ret = td_io_getevents(td, 1, td->cur_depth, NULL);
-       if (ret < 0) {
-               td_verror(td, -ret);
-               return 1;
-       }
-
-       icd.nr = ret;
-       ios_completed(td, &icd);
-       if (icd.error) {
-               td_verror(td, icd.error);
-               return 1;
-       }
-
-       return 0;
-}
-
 int td_io_getevents(struct thread_data *td, int min, int max,
                    struct timespec *t)
 {