summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSchichan Nicolas <nschichan@freebox.fr>2012-12-10 14:49:39 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-12-11 00:16:59 +0000
commit89c2e00978ada02a5b84b361faee954cbc7a0386 (patch)
treea6232be1fa89adcecf99ca91bcbcde4d06744047 /arch
parent026b7c6bf0bf044aa03e2affbda73b6c6a302538 (diff)
downloadblackbird-op-linux-89c2e00978ada02a5b84b361faee954cbc7a0386.tar.gz
blackbird-op-linux-89c2e00978ada02a5b84b361faee954cbc7a0386.zip
ARM: 7597/1: net: bpf_jit_32: fix kzalloc gfp/size mismatch.
Official prototype for kzalloc is: void *kzalloc(size_t, gfp_t); The ARM bpf_jit code was having the assumption that it was: void *kzalloc(gfp_t, size); This was resulting the use of some random GFP flags depending on the size requested and some random overflows once the really needed size was more than the value of GFP_KERNEL. This bug was present since the original inclusion of bpf_jit for ARM (ddecdfce: ARM: 7259/3: net: JIT compiler for packet filters). Signed-off-by: Nicolas Schichan <nschichan@freebox.fr> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/net/bpf_jit_32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index c641fb685017..a64d34968305 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -845,7 +845,7 @@ void bpf_jit_compile(struct sk_filter *fp)
ctx.skf = fp;
ctx.ret0_fp_idx = -1;
- ctx.offsets = kzalloc(GFP_KERNEL, 4 * (ctx.skf->len + 1));
+ ctx.offsets = kzalloc(4 * (ctx.skf->len + 1), GFP_KERNEL);
if (ctx.offsets == NULL)
return;
@@ -864,7 +864,7 @@ void bpf_jit_compile(struct sk_filter *fp)
ctx.idx += ctx.imm_count;
if (ctx.imm_count) {
- ctx.imms = kzalloc(GFP_KERNEL, 4 * ctx.imm_count);
+ ctx.imms = kzalloc(4 * ctx.imm_count, GFP_KERNEL);
if (ctx.imms == NULL)
goto out;
}
OpenPOWER on IntegriCloud