Skip to content

Commit 039fccc

Browse files
stefano-garzarelladavem330
authored andcommitted
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: c0cfa2d ("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>
1 parent f3c9a66 commit 039fccc

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

net/vmw_vsock/af_vsock.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk)
412412
const struct vsock_transport *new_transport;
413413
struct sock *sk = sk_vsock(vsk);
414414
unsigned int remote_cid = vsk->remote_addr.svm_cid;
415+
int ret;
415416

416417
switch (sk->sk_type) {
417418
case SOCK_DGRAM:
@@ -443,9 +444,15 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk)
443444
if (!new_transport || !try_module_get(new_transport->module))
444445
return -ENODEV;
445446

447+
ret = new_transport->init(vsk, psk);
448+
if (ret) {
449+
module_put(new_transport->module);
450+
return ret;
451+
}
452+
446453
vsk->transport = new_transport;
447454

448-
return vsk->transport->init(vsk, psk);
455+
return 0;
449456
}
450457
EXPORT_SYMBOL_GPL(vsock_assign_transport);
451458

0 commit comments

Comments
 (0)