diff options
| author | Stefano Garzarella <sgarzare@redhat.com> | 2019-11-21 10:06:09 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-21 11:37:16 -0800 |
| commit | 039fcccaed338b2ff6587178c1219c1ef383a1d9 (patch) | |
| tree | 4818e35b1ac78089c6425093a69d32cb6e6b2f48 /net/vmw_vsock | |
| parent | f3c9a666b28572b1a0ae691a47d9a7de4d9cefb3 (diff) | |
| download | blackbird-op-linux-039fcccaed338b2ff6587178c1219c1ef383a1d9.tar.gz blackbird-op-linux-039fcccaed338b2ff6587178c1219c1ef383a1d9.zip | |
vsock: avoid to assign transport if its initialization fails
If transport->init() fails, we can't assign the transport to the
socket, because it's not initialized correctly, and any future
calls to the transport callbacks would have an unexpected behavior.
Fixes: c0cfa2d8a788 ("vsock: add multi-transports support")
Reported-and-tested-by: syzbot+e2e5c07bf353b2f79daa@syzkaller.appspotmail.com
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Jorgen Hansen <jhansen@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/vmw_vsock')
| -rw-r--r-- | net/vmw_vsock/af_vsock.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index cc8659838bf2..74db4cd637a7 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -412,6 +412,7 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk) const struct vsock_transport *new_transport; struct sock *sk = sk_vsock(vsk); unsigned int remote_cid = vsk->remote_addr.svm_cid; + int ret; switch (sk->sk_type) { case SOCK_DGRAM: @@ -443,9 +444,15 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk) if (!new_transport || !try_module_get(new_transport->module)) return -ENODEV; + ret = new_transport->init(vsk, psk); + if (ret) { + module_put(new_transport->module); + return ret; + } + vsk->transport = new_transport; - return vsk->transport->init(vsk, psk); + return 0; } EXPORT_SYMBOL_GPL(vsock_assign_transport); |
