X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=net%2F802%2Fpsnap.c;h=31128cb92a23fc9b3eba377b52705671a3c984c7;hb=f2ce89f30ede4cb32fa8f9aaec884087069c81ba;hp=6e7c2120b83ff6a678ca0e3e33f377b713a711cf;hpb=958b7f37ee0fb2846c8d44310a68ae9605614ff9;p=linux-2.6-omap-h63xx.git

diff --git a/net/802/psnap.c b/net/802/psnap.c
index 6e7c2120b83..31128cb92a2 100644
--- a/net/802/psnap.c
+++ b/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->h.raw);
+	proto = find_snap_client(skb_transport_header(skb));
 	if (proto) {
 		/* Pass the frame on. */
-		skb->h.raw  += 5;
+		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;
 }
 
 /*