netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH][ATM]: don't leak skb on as_indicate failure; don't wakeup twice on as_close
@ 2004-10-27 14:32 chas williams (contractor)
  2004-10-27 21:49 ` David S. Miller
  0 siblings, 1 reply; 2+ messages in thread
From: chas williams (contractor) @ 2004-10-27 14:32 UTC (permalink / raw)
  To: netdev; +Cc: davem

please apply to 2.6.

thanks!

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/10/27 09:58:17-04:00 chas@relax.cmf.nrl.navy.mil 
#   [ATM]: don't leak skb on as_indicate failure; don't wakeup twice on as_close
# 
# net/atm/signaling.c
#   2004/10/27 09:58:00-04:00 chas@relax.cmf.nrl.navy.mil +3 -1
#   [ATM]: don't leak skb on as_indicate failure; don't wakeup twice on as_close
# 
diff -Nru a/net/atm/signaling.c b/net/atm/signaling.c
--- a/net/atm/signaling.c	2004-10-27 10:30:12 -04:00
+++ b/net/atm/signaling.c	2004-10-27 10:30:12 -04:00
@@ -136,6 +136,7 @@
 			if (vcc->sk->sk_ack_backlog ==
 			    vcc->sk->sk_max_ack_backlog) {
 				sigd_enq(NULL,as_reject,vcc,NULL,NULL);
+				dev_kfree_skb(skb);
 				goto as_indicate_complete;
 			}
 			vcc->sk->sk_ack_backlog++;
@@ -148,7 +149,7 @@
 		case as_close:
 			set_bit(ATM_VF_RELEASED,&vcc->flags);
 			vcc_release_async(vcc, msg->reply);
-			break;
+			goto out;
 		case as_modify:
 			modify_qos(vcc,msg);
 			break;
@@ -163,6 +164,7 @@
 			return -EINVAL;
 	}
 	vcc->sk->sk_state_change(vcc->sk);
+out:
 	dev_kfree_skb(skb);
 	return 0;
 }

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH][ATM]: don't leak skb on as_indicate failure; don't wakeup twice on as_close
  2004-10-27 14:32 [PATCH][ATM]: don't leak skb on as_indicate failure; don't wakeup twice on as_close chas williams (contractor)
@ 2004-10-27 21:49 ` David S. Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2004-10-27 21:49 UTC (permalink / raw)
  To: chas williams (contractor); +Cc: netdev, davem

On Wed, 27 Oct 2004 10:32:54 -0400
"chas williams (contractor)" <chas@cmf.nrl.navy.mil> wrote:

> please apply to 2.6.
 ...
> # ChangeSet
> #   2004/10/27 09:58:17-04:00 chas@relax.cmf.nrl.navy.mil 
> #   [ATM]: don't leak skb on as_indicate failure; don't wakeup twice on as_close

Applied, thanks Chas.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2004-10-27 21:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-27 14:32 [PATCH][ATM]: don't leak skb on as_indicate failure; don't wakeup twice on as_close chas williams (contractor)
2004-10-27 21:49 ` David S. Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).