diff options
| author | Markus Armbruster | 2018-10-17 10:26:38 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2018-10-19 14:51:34 +0200 |
| commit | 8c42dbe3956ac3eb8b1db18b941867936ce54b08 (patch) | |
| tree | cad661971d009531e685ca9e8ab7a92331bd0368 /net | |
| parent | l2tpv3: Improve -netdev/netdev_add/-net/... error reporting (diff) | |
| download | qemu-8c42dbe3956ac3eb8b1db18b941867936ce54b08.tar.gz qemu-8c42dbe3956ac3eb8b1db18b941867936ce54b08.tar.xz qemu-8c42dbe3956ac3eb8b1db18b941867936ce54b08.zip | |
net/socket: Fix invalid socket type error handling
Calling error_report() in a function that takes an Error ** argument
is suspicious. net_socket_fd_init() does that, and then fails without
setting an error. Wrong. I didn't analyze how exactly this can
break. A caller that reports the error on failure would crash.
Broken when commit c37f0bb1d0d (v2.11.0) converted the function to
Error. Fix by calling error_setg() instead of error_report().
Fixes: c37f0bb1d0d24e3a6b5f4659bb305913dcb798a6
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20181017082702.5581-15-armbru@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index 6917fbcbf5..90ef3517be 100644 --- a/net/socket.c +++ b/net/socket.c @@ -453,8 +453,8 @@ static NetSocketState *net_socket_fd_init(NetClientState *peer, case SOCK_STREAM: return net_socket_fd_init_stream(peer, model, name, fd, is_connected); default: - error_report("socket type=%d for fd=%d must be either" - " SOCK_DGRAM or SOCK_STREAM", so_type, fd); + error_setg(errp, "socket type=%d for fd=%d must be either" + " SOCK_DGRAM or SOCK_STREAM", so_type, fd); closesocket(fd); } return NULL; |