diff options
| author |   James Morris <james.l.morris@oracle.com> | 2016-11-04 10:31:23 -0600 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-11-04 10:31:23 -0600 |
| commit | eafb7b9d01a7001ff8e9624e7dcb706844f981b3 (patch) | |
| tree | 59831f33afc57b1979b4869f93944abb6febc446 /kernel | |
| parent | Linux 4.9-rc2 (diff) | |
| parent | samples/seccomp: Support programs with >256 instructions (diff) | |
Merge tag 'seccomp-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into ra-next
- fix function prototype documentation
- fix samples to include NNP setting
- fix samples to avoid rule truncation
- fix samples hostprogs variable in Makefile
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/seccomp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 0db7c8a2afe2..494cba230ca0 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -41,8 +41,7 @@ * outside of a lifetime-guarded section. In general, this * is only needed for handling filters shared across tasks. * @prev: points to a previously installed, or inherited, filter - * @len: the number of instructions in the program - * @insnsi: the BPF program instructions to evaluate + * @prog: the BPF program to evaluate * * seccomp_filter objects are organized in a tree linked via the @prev * pointer. For any task, it appears to be a singly-linked list starting @@ -168,8 +167,8 @@ static int seccomp_check_filter(struct sock_filter *filter, unsigned int flen) } /** - * seccomp_run_filters - evaluates all seccomp filters against @syscall - * @syscall: number of the current system call + * seccomp_run_filters - evaluates all seccomp filters against @sd + * @sd: optional seccomp data to be passed to filters * * Returns valid seccomp BPF response codes. */ |