From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH 1/4] semihosting: Don't return negative values on qemu_semihosting_console_write() failure
Date: Tue, 19 Jul 2022 13:11:07 +0100 [thread overview]
Message-ID: <20220719121110.225657-2-peter.maydell@linaro.org> (raw)
In-Reply-To: <20220719121110.225657-1-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>
---
console_write() doesn't need to pass the length to unlock_user()
at all, as it happens -- see the next patch.
---
semihosting/console.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/semihosting/console.c b/semihosting/console.c
index 5b1ec0a1c39..0f976fe8cb1 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.25.1
next prev parent reply other threads:[~2022-07-19 12:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-19 12:11 [PATCH 0/4] semihosting: fix various coverity issues Peter Maydell
2022-07-19 12:11 ` Peter Maydell [this message]
2022-07-24 16:28 ` [PATCH 1/4] semihosting: Don't return negative values on qemu_semihosting_console_write() failure Richard Henderson
2022-07-19 12:11 ` [PATCH 2/4] semihosting: Don't copy buffer after console_write() Peter Maydell
2022-07-24 16:30 ` Richard Henderson
2022-07-19 12:11 ` [PATCH 3/4] semihosting: Check for errors on SET_ARG() Peter Maydell
2022-07-24 16:35 ` Richard Henderson
2022-07-19 12:11 ` [PATCH 4/4] semihosting: Fix handling of buffer in TARGET_SYS_TMPNAM Peter Maydell
2022-07-24 21:55 ` Richard Henderson
2022-07-25 12:28 ` [PATCH 0/4] semihosting: fix various coverity issues Alex Bennée
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=20220719121110.225657-2-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.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).