From 49c6f33d1739f96c16a0ab54cde3dc4ef64b90e9 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 14 Apr 2014 11:36:01 -0600 Subject: [PATCH] backend: better NULL termination fix for IO scheduler switching Signed-off-by: Jens Axboe --- backend.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend.c b/backend.c index c1c8f967..62bca291 100644 --- a/backend.c +++ b/backend.c @@ -1114,13 +1114,14 @@ static int switch_ioscheduler(struct thread_data *td) /* * Read back and check that the selected scheduler is now the default. */ - memset(tmp, 0, sizeof(tmp)); - ret = fread(tmp, 1, sizeof(tmp) - 1, f); + ret = fread(tmp, sizeof(tmp), 1, f); if (ferror(f) || ret < 0) { td_verror(td, errno, "fread"); fclose(f); return 1; } + tmp[sizeof(tmp) - 1] = '\0'; + sprintf(tmp2, "[%s]", td->o.ioscheduler); if (!strstr(tmp, tmp2)) { -- 2.25.1