Skip to contentSkip to conversation

seccomp: Fix documentation

PATCH In review Mickaël Salaün 2 participants 3 messages Sep 20, 2016 – Oct 18, 2016 Secure computing

lore
Share & tools
lore

Mickaël Salaün

author
#0 lore raw

PATCH 1/1 seccomp: Fix documentation

Fix struct seccomp_filter and seccomp_run_filters() signatures.

Signed-off-by Mickaël Salaün <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc James Morris <[email protected]>
Cc Kees Cook <[email protected]>
Cc Will Drewry <[email protected]>
---
 kernel/seccomp.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/seccomp.c +3 -4
index 0db7c8a2afe2..494cba230ca0 100644
@@ -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.
  */
Signature · 1 line
2.9.3
author
#1 lore raw

Could someone push this please?

Quoted 37 lines · Mickaël Salaün

Fix struct seccomp_filter and seccomp_run_filters() signatures.

Signed-off-by Mickaël Salaün <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc James Morris <[email protected]>
Cc Kees Cook <[email protected]>
Cc Will Drewry <[email protected]>
---
 kernel/seccomp.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/seccomp.c +3 -4
index 0db7c8a2afe2..494cba230ca0 100644
@@ -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.
  */
Acked-by
#2 lore raw
Quoted 10 lines · Mickaël Salaün

Could someone push this please?

Quoted 7 lines · Mickaël Salaün

Fix struct seccomp_filter and seccomp_run_filters() signatures.

Signed-off-by Mickaël Salaün <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc James Morris <[email protected]>
Cc Kees Cook <[email protected]>
Cc Will Drewry <[email protected]>

Ah, sorry, this got lost in my inbox. :)

Acked-by Kees Cook <[email protected]>

-Kees

Quoted 31 lines
Quoted 30 lines
---
 kernel/seccomp.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/seccomp.c +3 -4
index 0db7c8a2afe2..494cba230ca0 100644
@@ -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.
  */
Signature · 2 lines
Kees Cook
Nexus Security