leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vsock: avoid to assign transport if its initialization fails

Browse Source 
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: c0cfa2d8a7 ("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>
This commit is contained in:
Stefano Garzarella 2019-11-21 10:06:09 +01:00 committed by David S. Miller
parent f3c9a666b2
commit 039fcccaed
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/vmw_vsock/af_vsock.c
View File

@ -412,6 +412,7 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk)
const struct vsock_transport *new_transport; const struct vsock_transport *new_transport;
struct sock *sk = sk_vsock(vsk); struct sock *sk = sk_vsock(vsk);
unsigned int remote_cid = vsk->remote_addr.svm_cid; unsigned int remote_cid = vsk->remote_addr.svm_cid;
int ret;
switch (sk->sk_type) { switch (sk->sk_type) {
case SOCK_DGRAM: 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)) if (!new_transport || !try_module_get(new_transport->module))
return -ENODEV; return -ENODEV;
ret = new_transport->init(vsk, psk);
if (ret) {
module_put(new_transport->module);
return ret;
}
vsk->transport = new_transport; vsk->transport = new_transport;
return vsk->transport->init(vsk, psk); return 0;
} }
EXPORT_SYMBOL_GPL(vsock_assign_transport); EXPORT_SYMBOL_GPL(vsock_assign_transport);