summary refs log tree commit diff stats
path: root/semihosting/console.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2022-07-25 15:05:13 +0100
committerAlex Bennée <alex.bennee@linaro.org>2022-07-29 09:48:01 +0100
commitaed04e6357fa10735c43574ea67a9551580d6e82 (patch)
tree7710fa9331194802b2d8234d91d1b044b749e34e /semihosting/console.c
parent93a02e822fc65d8f16eb98f64af88d69ba3c9fd6 (diff)
downloadfocaccia-qemu-aed04e6357fa10735c43574ea67a9551580d6e82.tar.gz
focaccia-qemu-aed04e6357fa10735c43574ea67a9551580d6e82.zip
semihosting: Don't return negative values on qemu_semihosting_console_write() failure
The documentation comment for qemu_semihosting_console_write() says
 * Returns: number of bytes written -- this should only ever be short
 * on some sort of i/o error.

and the callsites rely on this.  However, the implementation code
path which sends console output to a chardev doesn't honour this,
and will return negative values on error.  Bring it into line with
the other implementation codepaths and the documentation, so that
it returns 0 on error.

Spotted by Coverity, because console_write() passes the return value
to unlock_user(), which doesn't accept a negative length.

Resolves: Coverity CID 1490288
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220719121110.225657-2-peter.maydell@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220725140520.515340-7-alex.bennee@linaro.org>
Diffstat (limited to 'semihosting/console.c')
-rw-r--r--semihosting/console.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/semihosting/console.c b/semihosting/console.c
index 5b1ec0a1c3..0f976fe8cb 100644
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -111,7 +111,8 @@ int qemu_semihosting_console_read(CPUState *cs, void *buf, int len)
 int qemu_semihosting_console_write(void *buf, int len)
 {
     if (console.chr) {
-        return qemu_chr_write_all(console.chr, (uint8_t *)buf, len);
+        int r = qemu_chr_write_all(console.chr, (uint8_t *)buf, len);
+        return r < 0 ? 0 : r;
     } else {
         return fwrite(buf, 1, len, stderr);
     }