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 /net/core | |
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 'net/core')
-rw-r--r-- | net/core/filter.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index d6cb287e4f59..5740ea08a3ad 100644 --- a/net/core/filter.c +++ b/net/core/filter.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 | 23 | ||
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
@@ -721,7 +721,7 @@ static bool chk_code_allowed(u16 code_to_probe) | |||
721 | } | 721 | } |
722 | 722 | ||
723 | /** | 723 | /** |
724 | * sk_chk_filter - verify socket filter code | 724 | * bpf_check_classic - verify socket filter code |
725 | * @filter: filter to verify | 725 | * @filter: filter to verify |
726 | * @flen: length of filter | 726 | * @flen: length of filter |
727 | * | 727 | * |
@@ -734,7 +734,7 @@ static bool chk_code_allowed(u16 code_to_probe) | |||
734 | * | 734 | * |
735 | * Returns 0 if the rule set is legal or -EINVAL if not. | 735 | * Returns 0 if the rule set is legal or -EINVAL if not. |
736 | */ | 736 | */ |
737 | int sk_chk_filter(const struct sock_filter *filter, unsigned int flen) | 737 | int bpf_check_classic(const struct sock_filter *filter, unsigned int flen) |
738 | { | 738 | { |
739 | bool anc_found; | 739 | bool anc_found; |
740 | int pc; | 740 | int pc; |
@@ -808,7 +808,7 @@ int sk_chk_filter(const struct sock_filter *filter, unsigned int flen) | |||
808 | 808 | ||
809 | return -EINVAL; | 809 | return -EINVAL; |
810 | } | 810 | } |
811 | EXPORT_SYMBOL(sk_chk_filter); | 811 | EXPORT_SYMBOL(bpf_check_classic); |
812 | 812 | ||
813 | static int sk_store_orig_filter(struct sk_filter *fp, | 813 | static int sk_store_orig_filter(struct sk_filter *fp, |
814 | const struct sock_fprog *fprog) | 814 | const struct sock_fprog *fprog) |
@@ -968,7 +968,7 @@ static struct sk_filter *__sk_prepare_filter(struct sk_filter *fp) | |||
968 | fp->bpf_func = NULL; | 968 | fp->bpf_func = NULL; |
969 | fp->jited = 0; | 969 | fp->jited = 0; |
970 | 970 | ||
971 | err = sk_chk_filter(fp->insns, fp->len); | 971 | err = bpf_check_classic(fp->insns, fp->len); |
972 | if (err) { | 972 | if (err) { |
973 | __sk_filter_release(fp); | 973 | __sk_filter_release(fp); |
974 | return ERR_PTR(err); | 974 | return ERR_PTR(err); |