From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 12 Jul 2016 12:02:19 +0000 (+0100)
Subject: linux-user: Fix memchr() argument in open_self_cmdline()
X-Git-Tag: TizenStudio_2.0_p4.0~6^2~12^2~6^2~60^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba4b3f668abf1fcde204c8f3185ea6edeec6eaa3;p=sdk%2Femulator%2Fqemu.git

linux-user: Fix memchr() argument in open_self_cmdline()

In open_self_cmdline() we look for a 0 in the buffer we read
from /prc/self/cmdline. We were incorrectly passing the length
of our buf[] array to memchr() as the length to search, rather
than the number of bytes we actually read into it, which could
be shorter. This was spotted by Coverity (because it could
result in our trying to pass a negative length argument to
write()).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ca6a2b4..092ff4e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -6856,7 +6856,7 @@ static int open_self_cmdline(void *cpu_env, int fd)
         if (!word_skipped) {
             /* Skip the first string, which is the path to qemu-*-static
                instead of the actual command. */
-            cp_buf = memchr(buf, 0, sizeof(buf));
+            cp_buf = memchr(buf, 0, nb_read);
             if (cp_buf) {
                 /* Null byte found, skip one string */
                 cp_buf++;