|
@@ -832,7 +832,7 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags)
|
|
struct sock *sk = sock->sk;
|
|
struct sock *sk = sock->sk;
|
|
struct irda_sock *new, *self = irda_sk(sk);
|
|
struct irda_sock *new, *self = irda_sk(sk);
|
|
struct sock *newsk;
|
|
struct sock *newsk;
|
|
- struct sk_buff *skb;
|
|
|
|
|
|
+ struct sk_buff *skb = NULL;
|
|
int err;
|
|
int err;
|
|
|
|
|
|
err = irda_create(sock_net(sk), newsock, sk->sk_protocol, 0);
|
|
err = irda_create(sock_net(sk), newsock, sk->sk_protocol, 0);
|
|
@@ -900,7 +900,6 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags)
|
|
err = -EPERM; /* value does not seem to make sense. -arnd */
|
|
err = -EPERM; /* value does not seem to make sense. -arnd */
|
|
if (!new->tsap) {
|
|
if (!new->tsap) {
|
|
pr_debug("%s(), dup failed!\n", __func__);
|
|
pr_debug("%s(), dup failed!\n", __func__);
|
|
- kfree_skb(skb);
|
|
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -919,7 +918,6 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags)
|
|
/* Clean up the original one to keep it in listen state */
|
|
/* Clean up the original one to keep it in listen state */
|
|
irttp_listen(self->tsap);
|
|
irttp_listen(self->tsap);
|
|
|
|
|
|
- kfree_skb(skb);
|
|
|
|
sk->sk_ack_backlog--;
|
|
sk->sk_ack_backlog--;
|
|
|
|
|
|
newsock->state = SS_CONNECTED;
|
|
newsock->state = SS_CONNECTED;
|
|
@@ -927,6 +925,7 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags)
|
|
irda_connect_response(new);
|
|
irda_connect_response(new);
|
|
err = 0;
|
|
err = 0;
|
|
out:
|
|
out:
|
|
|
|
+ kfree_skb(skb);
|
|
release_sock(sk);
|
|
release_sock(sk);
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|