Commit 4cb8c359 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

irda: stop calling sk_prot->disconnect() on connection failure

The sk_prot is irda's own set of protocol handlers, so irda should
statically know what that function is anyway, without using an indirect
pointer.  And as it happens, we know *exactly* what that pointer is
statically: it's NULL, because irda doesn't define a disconnect

So calling that function is doubly wrong, and will just cause an oops.
Reported-by: default avatarMartin Lang <>
Cc: Samuel Ortiz <>
Cc: David Miller <>
Signed-off-by: default avatarLinus Torvalds <>
parent 12d7aaca
......@@ -1064,8 +1064,6 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr,
if (sk->sk_state != TCP_ESTABLISHED) {
sock->state = SS_UNCONNECTED;
if (sk->sk_prot->disconnect(sk, flags))
sock->state = SS_DISCONNECTING;
err = sock_error(sk);
if (!err)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment