qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org, richard.henderson@linaro.org
Cc: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>
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	[thread overview]
Message-ID: <20220729091943.2152410-7-alex.bennee@linaro.org> (raw)
In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org>

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



  parent reply	other threads:[~2022-07-29  9:40 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-29  9:19 [PULL 00/13] testing, semihosting and doc fixes Alex Bennée
2022-07-29  9:19 ` [PULL 01/13] tests: refresh to latest libvirt-ci module Alex Bennée
2022-07-29  9:19 ` [PULL 02/13] gitlab: show testlog.txt contents when cirrus/custom-runner jobs fail Alex Bennée
2022-07-29  9:19 ` [PULL 03/13] gitlab: drop 'containers-layer2' stage Alex Bennée
2022-07-29  9:19 ` [PULL 04/13] .cirrus.yml: Change winsymlinks to 'native' Alex Bennée
2022-07-29  9:19 ` [PULL 05/13] .gitlab-ci.d/windows.yml: Enable native Windows symlink Alex Bennée
2022-07-29  9:19 ` Alex Bennée [this message]
2022-07-29  9:19 ` [PULL 07/13] semihosting: Don't copy buffer after console_write() Alex Bennée
2022-07-29  9:19 ` [PULL 08/13] semihosting: Check for errors on SET_ARG() Alex Bennée
2022-07-29  9:19 ` [PULL 09/13] semihosting: Fix handling of buffer in TARGET_SYS_TMPNAM Alex Bennée
2022-07-29  9:19 ` [PULL 10/13] qapi: Add exit-failure PanicAction Alex Bennée
2022-07-29  9:19 ` [PULL 11/13] tests/tcg/s390x: Test unaligned accesses to lowcore Alex Bennée
2022-07-29  9:19 ` [PULL 12/13] docs/devel: fix description of OBJECT_DECLARE_SIMPLE_TYPE Alex Bennée
2022-07-29  9:19 ` [PULL 13/13] qemu-options: bring the kernel and image options together Alex Bennée
2022-07-29 15:36 ` [PULL 00/13] testing, semihosting and doc fixes Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220729091943.2152410-7-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=f4bug@amsat.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).