Skip to content

Commit

Permalink
seccomp: rename "usage" to "refs" and document
Browse files Browse the repository at this point in the history
Naming the lifetime counter of a seccomp filter "usage" suggests a
little too strongly that its about tasks that are using this filter
while it also tracks other references such as the user notifier or
ptrace. This also updates the documentation to note this fact.

We'll be introducing an actual usage counter in a follow-up patch.

Cc: Tycho Andersen <[email protected]>
Cc: Kees Cook <[email protected]>
Cc: Matt Denton <[email protected]>
Cc: Sargun Dhillon <[email protected]>
Cc: Jann Horn <[email protected]>
Cc: Chris Palmer <[email protected]>
Cc: Aleksa Sarai <[email protected]>
Cc: Robert Sesek <[email protected]>
Cc: Jeffrey Vander Stoep <[email protected]>
Cc: Linux Containers <[email protected]>
Signed-off-by: Christian Brauner <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Kees Cook <[email protected]>
  • Loading branch information
Christian Brauner authored and kees committed Jul 10, 2020
1 parent 9f87dcf commit b707dde
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions kernel/seccomp.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,11 @@ struct notification {
/**
* struct seccomp_filter - container for seccomp BPF programs
*
* @usage: reference count to manage the object lifetime.
* get/put helpers should be used when accessing an instance
* outside of a lifetime-guarded section. In general, this
* is only needed for handling filters shared across tasks.
* @refs: Reference count to manage the object lifetime.
* A filter's reference count is incremented for each directly
* attached task, once for the dependent filter, and if
* requested for the user notifier. When @refs reaches zero,
* the filter can be freed.
* @log: true if all actions except for SECCOMP_RET_ALLOW should be logged
* @prev: points to a previously installed, or inherited, filter
* @prog: the BPF program to evaluate
Expand All @@ -125,10 +126,10 @@ struct notification {
* how namespaces work.
*
* seccomp_filter objects should never be modified after being attached
* to a task_struct (other than @usage).
* to a task_struct (other than @refs).
*/
struct seccomp_filter {
refcount_t usage;
refcount_t refs;
bool log;
struct seccomp_filter *prev;
struct bpf_prog *prog;
Expand Down Expand Up @@ -464,7 +465,7 @@ static struct seccomp_filter *seccomp_prepare_filter(struct sock_fprog *fprog)
return ERR_PTR(ret);
}

refcount_set(&sfilter->usage, 1);
refcount_set(&sfilter->refs, 1);

return sfilter;
}
Expand Down Expand Up @@ -558,7 +559,7 @@ static long seccomp_attach_filter(unsigned int flags,

static void __get_seccomp_filter(struct seccomp_filter *filter)
{
refcount_inc(&filter->usage);
refcount_inc(&filter->refs);
}

/* get_seccomp_filter - increments the reference count of the filter on @tsk */
Expand All @@ -581,7 +582,7 @@ static inline void seccomp_filter_free(struct seccomp_filter *filter)
static void __put_seccomp_filter(struct seccomp_filter *orig)
{
/* Clean up single-reference branches iteratively. */
while (orig && refcount_dec_and_test(&orig->usage)) {
while (orig && refcount_dec_and_test(&orig->refs)) {
struct seccomp_filter *freeme = orig;
orig = orig->prev;
seccomp_filter_free(freeme);
Expand Down

0 comments on commit b707dde

Please sign in to comment.