[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/13] semihosting: Don't return negative values on qemu_semihosti
From: |
Alex Bennée |
Subject: |
[PULL 06/13] semihosting: Don't return negative values on qemu_semihosting_console_write() failure |
Date: |
Fri, 29 Jul 2022 10:19:36 +0100 |
From: Peter Maydell <peter.maydell@linaro.org>
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>
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);
}
--
2.30.2
- [PULL 00/13] testing, semihosting and doc fixes, Alex Bennée, 2022/07/29
- [PULL 04/13] .cirrus.yml: Change winsymlinks to 'native', Alex Bennée, 2022/07/29
- [PULL 05/13] .gitlab-ci.d/windows.yml: Enable native Windows symlink, Alex Bennée, 2022/07/29
- [PULL 06/13] semihosting: Don't return negative values on qemu_semihosting_console_write() failure,
Alex Bennée <=
- [PULL 02/13] gitlab: show testlog.txt contents when cirrus/custom-runner jobs fail, Alex Bennée, 2022/07/29
- [PULL 03/13] gitlab: drop 'containers-layer2' stage, Alex Bennée, 2022/07/29
- [PULL 01/13] tests: refresh to latest libvirt-ci module, Alex Bennée, 2022/07/29
- [PULL 08/13] semihosting: Check for errors on SET_ARG(), Alex Bennée, 2022/07/29
- [PULL 07/13] semihosting: Don't copy buffer after console_write(), Alex Bennée, 2022/07/29
- [PULL 12/13] docs/devel: fix description of OBJECT_DECLARE_SIMPLE_TYPE, Alex Bennée, 2022/07/29
- [PULL 10/13] qapi: Add exit-failure PanicAction, Alex Bennée, 2022/07/29
- [PULL 13/13] qemu-options: bring the kernel and image options together, Alex Bennée, 2022/07/29
- [PULL 11/13] tests/tcg/s390x: Test unaligned accesses to lowcore, Alex Bennée, 2022/07/29
- [PULL 09/13] semihosting: Fix handling of buffer in TARGET_SYS_TMPNAM, Alex Bennée, 2022/07/29