irda: Free skb on irda_accept error path.

commit 8ab86c00e349cef9fb14719093a7f198bcc72629 upstream.

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

Fixes: c3ea9fa27413 ("[IrDA] af_irda: IRDA_ASSERT cleanups")
Signed-off-by: Phil Turnbull <phil.turnbull@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index e8f51aa..078967f 100644 (file)
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -846,7 +846,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 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;
 
        IRDA_DEBUG(2, "%s()\n", __func__);
        int err;
 
        IRDA_DEBUG(2, "%s()\n", __func__);


@@ -916,7 +916,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) {
                IRDA_DEBUG(0, "%s(), dup failed!\n", __func__);
        err = -EPERM; /* value does not seem to make sense. -arnd */
        if (!new->tsap) {
                IRDA_DEBUG(0, "%s(), dup failed!\n", __func__);

-               kfree_skb(skb);

                goto out;
        }
 
                goto out;
        }
 


@@ -935,7 +934,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);
 
        /* 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;
        sk->sk_ack_backlog--;
 
        newsock->state = SS_CONNECTED;


@@ -943,6 +941,7 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags)
        irda_connect_response(new);
        err = 0;
 out:
        irda_connect_response(new);
        err = 0;
 out:

+       kfree_skb(skb);

        release_sock(sk);
        return err;
 }
        release_sock(sk);
        return err;
 }