---

yaml --- r: 204028 b: refs/heads/master c: 66d50d2 h: refs/heads/master v: v3
git-mirror · Aug 3, 2010 · 53c16d9 · 53c16d9
1 parent 8ff7db6
commit 53c16d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eabd8ba9060444cac5b89a3306e607c15ec37418
+refs/heads/master: 66d50d25502cd9b7d6e3ebbf4e241259c1283eaf
diff --git a/trunk/net/sched/cls_u32.c b/trunk/net/sched/cls_u32.c
@@ -134,10 +134,12 @@ static int u32_classify(struct sk_buff *skb, struct tcf_proto *tp, struct tcf_re
 #endif
 
 		for (i = n->sel.nkeys; i>0; i--, key++) {
-			unsigned int toff;
+			int toff = off + key->off + (off2 & key->offmask);
 			__be32 *data, _data;
 
-			toff = off + key->off + (off2 & key->offmask);
+			if (skb_headroom(skb) + toff < 0)
+				goto out;
+
 			data = skb_header_pointer(skb, toff, 4, &_data);
 			if (!data)
 				goto out;