diff options
| author | Alexei Starovoitov <ast@plumgrid.com> | 2014-07-30 23:34:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-02 18:02:38 -0400 |
| commit | 4df95ff488eb796aab9566652c250330179def17 (patch) | |
| tree | 23edb6ce7c751c2c932876ad005f0cf44fbc9cdf /kernel | |
| parent | 009937e78a45553a86d26654f192b2fd9ebe289d (diff) | |
net: filter: rename sk_chk_filter() -> bpf_check_classic()
trivial rename to indicate that this functions performs classic BPF checking
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 265a02cc822d..b479807ec383 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | * 2 of the License, or (at your option) any later version. | 18 | * 2 of the License, or (at your option) any later version. |
| 19 | * | 19 | * |
| 20 | * Andi Kleen - Fix a few bad bugs and races. | 20 | * Andi Kleen - Fix a few bad bugs and races. |
| 21 | * Kris Katterjohn - Added many additional checks in sk_chk_filter() | 21 | * Kris Katterjohn - Added many additional checks in bpf_check_classic() |
| 22 | */ | 22 | */ |
| 23 | #include <linux/filter.h> | 23 | #include <linux/filter.h> |
| 24 | #include <linux/skbuff.h> | 24 | #include <linux/skbuff.h> |
diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 565743db5384..f4a77d23f209 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c | |||
| @@ -87,7 +87,7 @@ static void populate_seccomp_data(struct seccomp_data *sd) | |||
| 87 | * @filter: filter to verify | 87 | * @filter: filter to verify |
| 88 | * @flen: length of filter | 88 | * @flen: length of filter |
| 89 | * | 89 | * |
| 90 | * Takes a previously checked filter (by sk_chk_filter) and | 90 | * Takes a previously checked filter (by bpf_check_classic) and |
| 91 | * redirects all filter code that loads struct sk_buff data | 91 | * redirects all filter code that loads struct sk_buff data |
| 92 | * and related data through seccomp_bpf_load. It also | 92 | * and related data through seccomp_bpf_load. It also |
| 93 | * enforces length and alignment checking of those loads. | 93 | * enforces length and alignment checking of those loads. |
| @@ -239,7 +239,7 @@ static long seccomp_attach_filter(struct sock_fprog *fprog) | |||
| 239 | goto free_prog; | 239 | goto free_prog; |
| 240 | 240 | ||
| 241 | /* Check and rewrite the fprog via the skb checker */ | 241 | /* Check and rewrite the fprog via the skb checker */ |
| 242 | ret = sk_chk_filter(fp, fprog->len); | 242 | ret = bpf_check_classic(fp, fprog->len); |
| 243 | if (ret) | 243 | if (ret) |
| 244 | goto free_prog; | 244 | goto free_prog; |
| 245 | 245 | ||
