Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[pandora-kernel.git] / net / sched / cls_u32.c

diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 4f52214..b0c2a82 100644 (file)
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -134,10 +134,12 @@ next_knode:
 #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 > INT_MAX)
+                               goto out;
+
                        data = skb_header_pointer(skb, toff, 4, &_data);
                        if (!data)
                                goto out;