summaryrefslogtreecommitdiffstats
path: root/arch/mips/net
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2016-08-03 12:55:49 +0200
committerRalf Baechle <ralf@linux-mips.org>2016-08-03 12:55:49 +0200
commit4a89cf810130fde41e3fc729e770cb1a5a87d245 (patch)
tree84da40f8d26e51c21e61fc4fc5b7242c0050ae7d /arch/mips/net
parent4f53989b0652ffe2605221c81ca8ffcfc90aed2a (diff)
parente9cbf6299e306d6f2ff7b8fe7ac66059191b182f (diff)
downloadlinux-4a89cf810130fde41e3fc729e770cb1a5a87d245.tar.gz
linux-4a89cf810130fde41e3fc729e770cb1a5a87d245.tar.bz2
linux-4a89cf810130fde41e3fc729e770cb1a5a87d245.zip
Merge branch '4.7-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/net')
-rw-r--r--arch/mips/net/bpf_jit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c
index 1a8c96035716..a04c393a751a 100644
--- a/arch/mips/net/bpf_jit.c
+++ b/arch/mips/net/bpf_jit.c
@@ -1199,7 +1199,7 @@ void bpf_jit_compile(struct bpf_prog *fp)
memset(&ctx, 0, sizeof(ctx));
- ctx.offsets = kcalloc(fp->len, sizeof(*ctx.offsets), GFP_KERNEL);
+ ctx.offsets = kcalloc(fp->len + 1, sizeof(*ctx.offsets), GFP_KERNEL);
if (ctx.offsets == NULL)
return;