mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/pcmcia/pcnet_cs.c net/caif/caif_socket.c
This commit is contained in:
commit
69259abb64
730 changed files with 7823 additions and 4301 deletions
|
|
@ -137,7 +137,7 @@ next_knode:
|
|||
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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue