diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-11-25 12:50:56 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-11-25 12:50:56 +0800 |
| commit | 5497d2d7d543b4b8854700d47a175e157fecbfd1 (patch) | |
| tree | b8453c3e27a46e4322cc7749d4b0a209e8476a92 /include/linux | |
| parent | 063181a4658b16e6bc0efe24671d5db3097342a4 (diff) | |
| parent | 4eb9a81002485a7abfa53a334dde5bc10328079f (diff) | |
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
Conflicts:
keep check_object_size in copy_from_user
in arch/sparc/include/asm/uaccess_64.h
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/filter.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index 5110d4211866..ccb98b459c59 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -421,7 +421,11 @@ static inline void bpf_prog_unlock_ro(struct bpf_prog *fp) } #endif /* CONFIG_DEBUG_SET_MODULE_RONX */ -int sk_filter(struct sock *sk, struct sk_buff *skb); +int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap); +static inline int sk_filter(struct sock *sk, struct sk_buff *skb) +{ + return sk_filter_trim_cap(sk, skb, 1); +} int bpf_prog_select_runtime(struct bpf_prog *fp); void bpf_prog_free(struct bpf_prog *fp); |