diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 15:12:24 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 15:12:24 -0400 |
| commit | f779b7dd3259ec138c7aba793f0602b20262af83 (patch) | |
| tree | 7ed94961b196c81fcd413e2b04d1e6945d6d227a /net/sched | |
| parent | 3c00079b31f910309b30ed5c2fd2b7a2d86bba60 (diff) | |
| parent | fe0cdec8bad919fd91cd344123906a55f3857209 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mach-at91/include/mach/system.h
arch/arm/mach-imx/mach-cpuimx27.c
AT91 conflict resolution:
Acked-by: Anders Larsen <al@alarsen.net>
IMX conflict resolution confirmed by Uwe Kleine-König.
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/cls_u32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index 7416a5c73b2a..b0c2a82178af 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c | |||
| @@ -137,7 +137,7 @@ next_knode: | |||
| 137 | int toff = off + key->off + (off2 & key->offmask); | 137 | int toff = off + key->off + (off2 & key->offmask); |
| 138 | __be32 *data, _data; | 138 | __be32 *data, _data; |
| 139 | 139 | ||
| 140 | if (skb_headroom(skb) + toff < 0) | 140 | if (skb_headroom(skb) + toff > INT_MAX) |
| 141 | goto out; | 141 | goto out; |
| 142 | 142 | ||
| 143 | data = skb_header_pointer(skb, toff, 4, &_data); | 143 | data = skb_header_pointer(skb, toff, 4, &_data); |