diff options
author | Alexei Starovoitov <ast@plumgrid.com> | 2014-07-30 23:34:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-02 18:02:38 -0400 |
commit | 8fb575ca396bc31d9fa99c26336e2432b41d1bfc (patch) | |
tree | c2d8bc40cd5313e1e7aa710c9f73d7a56edd9b8c /kernel | |
parent | 4df95ff488eb796aab9566652c250330179def17 (diff) |
net: filter: rename sk_convert_filter() -> bpf_convert_filter()
to indicate that this function is converting classic BPF into eBPF
and not related to sockets
Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/bpf/core.c | 2 | ||||
-rw-r--r-- | kernel/seccomp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index b479807ec383..188ac5ba3900 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c | |||
@@ -446,7 +446,7 @@ load_word: | |||
446 | /* BPF_LD + BPD_ABS and BPF_LD + BPF_IND insns are | 446 | /* BPF_LD + BPD_ABS and BPF_LD + BPF_IND insns are |
447 | * only appearing in the programs where ctx == | 447 | * only appearing in the programs where ctx == |
448 | * skb. All programs keep 'ctx' in regs[BPF_REG_CTX] | 448 | * skb. All programs keep 'ctx' in regs[BPF_REG_CTX] |
449 | * == BPF_R6, sk_convert_filter() saves it in BPF_R6, | 449 | * == BPF_R6, bpf_convert_filter() saves it in BPF_R6, |
450 | * internal BPF verifier will check that BPF_R6 == | 450 | * internal BPF verifier will check that BPF_R6 == |
451 | * ctx. | 451 | * ctx. |
452 | * | 452 | * |
diff --git a/kernel/seccomp.c b/kernel/seccomp.c index f4a77d23f209..33a3a97e2b58 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c | |||
@@ -249,7 +249,7 @@ static long seccomp_attach_filter(struct sock_fprog *fprog) | |||
249 | goto free_prog; | 249 | goto free_prog; |
250 | 250 | ||
251 | /* Convert 'sock_filter' insns to 'bpf_insn' insns */ | 251 | /* Convert 'sock_filter' insns to 'bpf_insn' insns */ |
252 | ret = sk_convert_filter(fp, fprog->len, NULL, &new_len); | 252 | ret = bpf_convert_filter(fp, fprog->len, NULL, &new_len); |
253 | if (ret) | 253 | if (ret) |
254 | goto free_prog; | 254 | goto free_prog; |
255 | 255 | ||
@@ -265,7 +265,7 @@ static long seccomp_attach_filter(struct sock_fprog *fprog) | |||
265 | if (!filter->prog) | 265 | if (!filter->prog) |
266 | goto free_filter; | 266 | goto free_filter; |
267 | 267 | ||
268 | ret = sk_convert_filter(fp, fprog->len, filter->prog->insnsi, &new_len); | 268 | ret = bpf_convert_filter(fp, fprog->len, filter->prog->insnsi, &new_len); |
269 | if (ret) | 269 | if (ret) |
270 | goto free_filter_prog; | 270 | goto free_filter_prog; |
271 | kfree(fp); | 271 | kfree(fp); |