---

yaml --- r: 64205 b: refs/heads/master c: d92a7db h: refs/heads/master i: 64203: 70611d5 v: v3
git-mirror · Aug 22, 2007 · 716c85b · 716c85b
1 parent 9442bd2
commit 716c85b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39dad26c37fdb1382e4173172a2704fa278f7fd6
+refs/heads/master: d92a7db710c32db826a00ba9bc7a22e741d5041e
diff --git a/trunk/net/802/psnap.c b/trunk/net/802/psnap.c
@@ -55,21 +55,28 @@ static int snap_rcv(struct sk_buff *skb, struct net_device *dev,
 		.type = __constant_htons(ETH_P_SNAP),
 	};
 
+	if (unlikely(!pskb_may_pull(skb, 5)))
+		goto drop;
+
 	rcu_read_lock();
 	proto = find_snap_client(skb_transport_header(skb));
 	if (proto) {
 		/* Pass the frame on. */
 		skb->transport_header += 5;
 		skb_pull_rcsum(skb, 5);
 		rc = proto->rcvfunc(skb, dev, &snap_packet_type, orig_dev);
-	} else {
-		skb->sk = NULL;
-		kfree_skb(skb);
-		rc = 1;
 	}
-
 	rcu_read_unlock();
+
+	if (unlikely(!proto))
+		goto drop;
+
+out:
 	return rc;
+
+drop:
+	kfree_skb(skb);
+	goto out;
 }
 
 /*