diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-27 20:38:49 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-27 20:38:49 -0500 |
| commit | 53c4ce02145be8987c2b5ca43d7fada9a9d3fd13 (patch) | |
| tree | 7fae6065a59905fde41a77c01c968088e526d0c4 /kernel/seccomp.c | |
| parent | e3739099270b238630368b1d8f547c1bb31ba6ad (diff) | |
| parent | e00c7b216f34444252f3771f7d4ed48d4f032636 (diff) | |
Merge branch 'bpf-misc-next'
Daniel Borkmann says:
====================
BPF cleanups and misc updates
This patch set adds couple of cleanups in first few patches,
exposes owner_prog_type for array maps as well as mlocked mem
for maps in fdinfo, allows for mount permissions in fs and
fixes various outstanding issues in selftests and samples.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/seccomp.c')
| -rw-r--r-- | kernel/seccomp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 0db7c8a2afe2..bff9c774987a 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -195,7 +195,7 @@ static u32 seccomp_run_filters(const struct seccomp_data *sd) * value always takes priority (ignoring the DATA). */ for (; f; f = f->prev) { - u32 cur_ret = BPF_PROG_RUN(f->prog, (void *)sd); + u32 cur_ret = BPF_PROG_RUN(f->prog, sd); if ((cur_ret & SECCOMP_RET_ACTION) < (ret & SECCOMP_RET_ACTION)) ret = cur_ret; |