Skip to content

Commit

Permalink
u32: negative offset fix
Browse files Browse the repository at this point in the history
It was possible to use a negative offset in a u32 match to reference
the ethernet header or other parts of the link layer header.
This fixes the regression caused by:

commit fbc2e7d
Author: Changli Gao <xiaosuo@gmail.com>
Date:   Wed Jun 2 07:32:42 2010 -0700

    cls_u32: use skb_header_pointer() to dereference data safely

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
stephen hemminger authored and David S. Miller committed Aug 3, 2010
1 parent eabd8ba commit 66d50d2
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions net/sched/cls_u32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 66d50d2

Please sign in to comment.