From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: AlexChen <alex.chen@huawei.com>,
Peter Maydell <peter.maydell@linaro.org>,
Raphael Norwitz <raphael.norwitz@nutanix.com>,
Euler Robot <euler.robot@huawei.com>
Subject: [PULL 17/17] vhost-user-blk/scsi: Fix broken error handling for socket call
Date: Sun, 15 Nov 2020 17:27:56 -0500 [thread overview]
Message-ID: <20201115220740.488850-18-mst@redhat.com> (raw)
In-Reply-To: <20201115220740.488850-1-mst@redhat.com>
From: AlexChen <alex.chen@huawei.com>
When socket() fails, it returns -1, 0 is the normal return value and should not return error.
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: AlexChen <alex.chen@huawei.com>
Message-Id: <5F9A5B48.9030509@huawei.com>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
contrib/vhost-user-blk/vhost-user-blk.c | 2 +-
contrib/vhost-user-scsi/vhost-user-scsi.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c
index caad88637e..dc981bf945 100644
--- a/contrib/vhost-user-blk/vhost-user-blk.c
+++ b/contrib/vhost-user-blk/vhost-user-blk.c
@@ -476,7 +476,7 @@ static int unix_sock_new(char *unix_fn)
assert(unix_fn);
sock = socket(AF_UNIX, SOCK_STREAM, 0);
- if (sock <= 0) {
+ if (sock < 0) {
perror("socket");
return -1;
}
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 3c912384e9..0f9ba4b2a2 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -320,7 +320,7 @@ static int unix_sock_new(char *unix_fn)
assert(unix_fn);
sock = socket(AF_UNIX, SOCK_STREAM, 0);
- if (sock <= 0) {
+ if (sock < 0) {
perror("socket");
return -1;
}
--
MST
next prev parent reply other threads:[~2020-11-15 22:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-15 22:27 [PULL 00/17] pc,vhost: fixes, new test Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 01/17] vhost-user: fix VHOST_USER_ADD/REM_MEM_REG truncation Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 02/17] meson: move vhost_user_blk_server to meson.build Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 03/17] vhost-user-blk-server: depend on CONFIG_VHOST_USER Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 04/17] configure: mark vhost-user Linux-only Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 05/17] hw/i386/acpi-build: Fix maybe-uninitialized error when ACPI hotplug off Michael S. Tsirkin
2020-11-16 17:44 ` Ani Sinha
2020-11-16 18:01 ` Philippe Mathieu-Daudé
2020-11-16 18:08 ` Ani Sinha
2020-11-15 22:27 ` [PULL 06/17] test: new qTest case to test the vhost-user-blk-server Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 07/17] tests/qtest: add multi-queue test case to vhost-user-blk-test Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 08/17] libqtest: add qtest_socket_server() Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 09/17] vhost-user-blk-test: rename destroy_drive() to destroy_file() Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 10/17] vhost-user-blk-test: close fork child file descriptors Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 11/17] vhost-user-blk-test: drop unused return value Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 12/17] vhost-user-blk-test: fix races by using fd passing Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 13/17] block/export: port virtio-blk discard/write zeroes input validation Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 14/17] vhost-user-blk-test: test discard/write zeroes invalid inputs Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 15/17] block/export: port virtio-blk read/write range check Michael S. Tsirkin
2020-11-15 22:27 ` [PULL 16/17] contrib/libvhost-user: Fix bad printf format specifiers Michael S. Tsirkin
2020-11-15 22:27 ` Michael S. Tsirkin [this message]
2020-11-16 14:19 ` [PULL 00/17] pc,vhost: fixes, new test Peter Maydell
2020-11-17 9:20 ` Michael S. Tsirkin
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=20201115220740.488850-18-mst@redhat.com \
--to=mst@redhat.com \
--cc=alex.chen@huawei.com \
--cc=euler.robot@huawei.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=raphael.norwitz@nutanix.com \
/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).