From 0fa88f513ffd8e9f555b5cea6d46aa255d2b15d6 Mon Sep 17 00:00:00 2001 From: Tomoki Shirasawa Date: Wed, 27 Dec 2017 15:28:13 +0900 Subject: [PATCH] fix broken files --- kernel/syscall.c | 1 - lib/string.c | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/kernel/syscall.c b/kernel/syscall.c index a1a95fbb..d3c0f6f4 100644 --- a/kernel/syscall.c +++ b/kernel/syscall.c @@ -9481,4 +9481,3 @@ long syscall(int num, ihk_mc_user_context_t *ctx) return l; } - \ No newline at end of file diff --git a/lib/string.c b/lib/string.c index 4548261d..ab194e27 100644 --- a/lib/string.c +++ b/lib/string.c @@ -354,4 +354,19 @@ int flatten_strings_from_user(int nr_strings, char *first, char **strings, char p = strchr(p, '\0') + 1; } - for (string_i = 0; string_i < nr_strings; ++string_ \ No newline at end of file + for (string_i = 0; string_i < nr_strings; ++string_i) { + char *userp; + _flat[n++] = p - (char *)_flat; + + ret = getlong_user((long *)&userp, (void *)(strings + string_i)); + if (ret < 0) + return ret; + + strcpy_from_user(p, userp); + p = strchr(p, '\0') + 1; + } + _flat[n] = 0; + + *flat = (char *)_flat; + return full_len; +}