From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Subject: [PATCH ucspi-vsock] vsock_open: return fd instead of 0 on success
Date: Tue, 9 Mar 2021 17:18:16 +0000 [thread overview]
Message-ID: <20210309171816.8589-1-hi@alyssa.is> (raw)
Previously, this returned the return value of connect(2), which is 0
on success. So stdin would be assigned to descriptors 6 and 7 in
vsockclient instead of the socket. Oops.
---
vsock.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/vsock.c b/vsock.c
index 3bcd8b3..d9ff3b6 100644
--- a/vsock.c
+++ b/vsock.c
@@ -55,7 +55,10 @@ int vsock_open(uint32_t cid, uint32_t port)
if (fd == -1)
return -1;
- return vsock_connect(fd, cid, port);
+ if (vsock_connect(fd, cid, port) == -1)
+ return -1;
+
+ return fd;
}
int vsock_get_port(int fd, uint32_t *port)
--
2.30.0
next reply other threads:[~2021-03-09 17:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-09 17:18 Alyssa Ross [this message]
2021-03-10 17:46 ` Cole Helbling
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=20210309171816.8589-1-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.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.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
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).