lkml.org 
[lkml]   [2020]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 095/312] irda: Free skb on irda_accept error path.
    Date
    From: phil.turnbull@oracle.com <phil.turnbull@oracle.com>

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/irda/af_irda.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    --- a/net/irda/af_irda.c
    +++ b/net/irda/af_irda.c
    @@ -839,7 +839,7 @@ static int irda_accept(struct socket *so
    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);
    @@ -907,7 +907,6 @@ static int irda_accept(struct socket *so
    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;
    }

    @@ -926,7 +925,6 @@ static int irda_accept(struct socket *so
    /* 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;
    @@ -934,6 +932,7 @@ static int irda_accept(struct socket *so
    irda_connect_response(new);
    err = 0;
    out:
    + kfree_skb(skb);
    release_sock(sk);
    return err;
    }

    \
     
     \ /
      Last update: 2020-05-08 15:22    [W:2.914 / U:0.424 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site