Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ab86c00 authored by phil.turnbull@oracle.com's avatar phil.turnbull@oracle.com Committed by David S. Miller
Browse files

irda: Free skb on irda_accept error path. 



skb is not freed if newsk is NULL. Rework the error path so free_skb is
unconditionally called on function exit.

Fixes: c3ea9fa2 ("[IrDA] af_irda: IRDA_ASSERT cleanups")
Signed-off-by: default avatarPhil Turnbull <phil.turnbull@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 20c64d5c

net/irda/af_irda.c

+2 −3
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags) 
	struct sock *sk = sock->sk;

	struct irda_sock *new, *self = irda_sk(sk);

	struct sock *newsk;

	struct sk_buff *skb;

	struct sk_buff *skb = NULL;

	int err;



	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 */

	if (!new->tsap) {

		pr_debug("%s(), dup failed!\n", __func__);

		kfree_skb(skb);

		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 */

	irttp_listen(self->tsap);



	kfree_skb(skb);

	sk->sk_ack_backlog--;



	newsock->state = SS_CONNECTED;
@@ -927,6 +925,7 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags) 
	irda_connect_response(new);

	err = 0;

out:

	kfree_skb(skb);

	release_sock(sk);

	return err;

}