---

yaml --- r: 341701 b: refs/heads/master c: 071d939 h: refs/heads/master i: 341699: 6ca2af3 v: v3
git-mirror · Nov 30, 2012 · 0607887 · 0607887
1 parent da3a37d
commit 0607887
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ac108006fd7f20cb8fc8ea2287f1497bcda00a1
+refs/heads/master: 071d93931a75dc1f82f0baa9959613af81c5a032
diff --git a/trunk/net/atm/pppoatm.c b/trunk/net/atm/pppoatm.c
@@ -284,6 +284,13 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
 	bh_lock_sock(sk_atm(vcc));
 	if (sock_owned_by_user(sk_atm(vcc)))
 		goto nospace;
+	if (test_bit(ATM_VF_RELEASED, &vcc->flags) ||
+	    test_bit(ATM_VF_CLOSE, &vcc->flags) ||
+	    !test_bit(ATM_VF_READY, &vcc->flags)) {
+		bh_unlock_sock(sk_atm(vcc));
+		kfree_skb(skb);
+		return DROP_PACKET;
+	}
 
 	switch (pvcc->encaps) {		/* LLC encapsulation needed */
 	case e_llc: