From 70e52faf368f905cc50d9fbf0bd66aadcd315354 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sat, 25 Aug 2018 03:36:30 +0900 Subject: [PATCH] flatten_strings: do not return unused trailing bits Trailing bits were displayed in proc->saved_cmdline, displaying uninitialized data to the user in /proc//cmdline Change-Id: I74831c8c68dd2f2197b35e9b49aaaae29c4c1dd5 --- executer/user/mcexec.c | 2 +- lib/string.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/executer/user/mcexec.c b/executer/user/mcexec.c index 0069a8e0..49765ff3 100644 --- a/executer/user/mcexec.c +++ b/executer/user/mcexec.c @@ -1073,7 +1073,7 @@ int flatten_strings(char *pre_strings, char **strings, char **flat) _flat[nr_strings + pre_strings_count + 1] = p - (char *)_flat; *flat = (char *)_flat; - return full_len; + return p - (char *)_flat; } //#define NUM_HANDLER_THREADS 248 diff --git a/lib/string.c b/lib/string.c index 83e19330..eb1559f5 100644 --- a/lib/string.c +++ b/lib/string.c @@ -333,5 +333,5 @@ int flatten_strings_from_user(char *pre_strings, char **strings, char **flat) _flat[nr_strings + pre_strings_count + 1] = p - (char *)_flat; *flat = (char *)_flat; - return full_len; + return p - (char *)_flat; }