Commit da521b2c authored by David S. Miller's avatar David S. Miller

net: Fix range checks in tcf_valid_offset().

This function has three bugs:

1) The offset should be valid most of the time, this is just
   a sanity check, therefore we should use "likely" not "unlikely"

2) This is the only place where we can check for arithmetic overflow
   of the pointer plus the length.

3) The existing range checks are off by one, the valid range is
   skb->head to skb_tail_pointer(), inclusive.

Based almost entirely upon a patch by Ralph Loader.
Reported-by: default avatarRalph Loader <suckfish@ihug.co.nz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aa3e2199
...@@ -323,7 +323,9 @@ static inline unsigned char * tcf_get_base_ptr(struct sk_buff *skb, int layer) ...@@ -323,7 +323,9 @@ static inline unsigned char * tcf_get_base_ptr(struct sk_buff *skb, int layer)
static inline int tcf_valid_offset(const struct sk_buff *skb, static inline int tcf_valid_offset(const struct sk_buff *skb,
const unsigned char *ptr, const int len) const unsigned char *ptr, const int len)
{ {
return unlikely((ptr + len) < skb_tail_pointer(skb) && ptr > skb->head); return likely((ptr + len) <= skb_tail_pointer(skb) &&
ptr >= skb->head &&
(ptr <= (ptr + len)));
} }
#ifdef CONFIG_NET_CLS_IND #ifdef CONFIG_NET_CLS_IND
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment