From e8d6634a9dfd93717ef1ca46164b3c2414c0cec2 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 4 Oct 2010 02:28:36 +0000 Subject: [PATCH] --- yaml --- r: 211407 b: refs/heads/master c: 4e18b3edf71f5d4ad653e3c2ff6560878e965f96 h: refs/heads/master i: 211405: cecfcd3b60226d5ddd737df20853e2bba8d3ffd5 211403: e6ebe6b16139c29b05fcc75002adaef3e61d7899 211399: b7f1f1b7fe3e7deee90f98ccee77d5ab7cf3b77d 211391: 6111985a60f84621d2e00cfdda840e3d75b80ba3 v: v3 --- [refs] | 2 +- trunk/net/sched/cls_u32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 26e72b3b085f..b423ffac49d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51e97a12bef19b7e43199fc153cf9bd5f2140362 +refs/heads/master: 4e18b3edf71f5d4ad653e3c2ff6560878e965f96 diff --git a/trunk/net/sched/cls_u32.c b/trunk/net/sched/cls_u32.c index 7416a5c73b2a..b0c2a82178af 100644 --- a/trunk/net/sched/cls_u32.c +++ b/trunk/net/sched/cls_u32.c @@ -137,7 +137,7 @@ static int u32_classify(struct sk_buff *skb, struct tcf_proto *tp, struct tcf_re int toff = off + key->off + (off2 & key->offmask); __be32 *data, _data; - if (skb_headroom(skb) + toff < 0) + if (skb_headroom(skb) + toff > INT_MAX) goto out; data = skb_header_pointer(skb, toff, 4, &_data);