patches and low-level development discussion
 help / color / mirror / code / Atom feed
* [PATCH ucspi-vsock] vsock_open: return fd instead of 0 on success
@ 2021-03-09 17:18 Alyssa Ross
  2021-03-10 17:46 ` Cole Helbling
  0 siblings, 1 reply; 2+ messages in thread
From: Alyssa Ross @ 2021-03-09 17:18 UTC (permalink / raw)
  To: devel

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH ucspi-vsock] vsock_open: return fd instead of 0 on success
  2021-03-09 17:18 [PATCH ucspi-vsock] vsock_open: return fd instead of 0 on success Alyssa Ross
@ 2021-03-10 17:46 ` Cole Helbling
  0 siblings, 0 replies; 2+ messages in thread
From: Cole Helbling @ 2021-03-10 17:46 UTC (permalink / raw)
  To: Alyssa Ross, devel

On Tue Mar 9, 2021 at 9:18 AM PST, Alyssa Ross wrote:
> 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

Hehe, oops indeed.

(Still haven't fixed the indentation issue with aerc... Some day I'll
get around to it...)

Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-03-10 17:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-09 17:18 [PATCH ucspi-vsock] vsock_open: return fd instead of 0 on success Alyssa Ross
2021-03-10 17:46 ` Cole Helbling

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).