* [PATCH] irda: Free skb on irda_accept error path.
@ 2016-09-15 16:41 Phil Turnbull
2016-09-17 14:00 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Phil Turnbull @ 2016-09-15 16:41 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Samuel Ortiz, Phil Turnbull
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>
---
net/irda/af_irda.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index 8d2f7c9b491d..ccc244406fb9 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -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;
}
--
2.9.0.rc2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] irda: Free skb on irda_accept error path.
2016-09-15 16:41 [PATCH] irda: Free skb on irda_accept error path Phil Turnbull
@ 2016-09-17 14:00 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-09-17 14:00 UTC (permalink / raw)
To: phil.turnbull; +Cc: netdev, samuel
From: Phil Turnbull <phil.turnbull@oracle.com>
Date: Thu, 15 Sep 2016 12:41:44 -0400
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-17 14:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-15 16:41 [PATCH] irda: Free skb on irda_accept error path Phil Turnbull
2016-09-17 14:00 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.