lkml.org 
[lkml]   [2012]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] Trace event for capable().
Auke Kok <auke-jan.h.kok@intel.com> writes:

> Add a simple trace event for capable().
>
> There's been a lot of discussion around capable(), and there
> are plenty of tools to help reduce capabilities' usage from
> userspace. A major gap however is that it's almost impossible
> to see or verify which bits are requested from either userspace
> or in the kernel.
>
> This patch adds a minimal tracer that will print out which
> CAPs are requested and whether the request was granted.

A small comment assigned from the other issues.

current->pid for anything going to userspace is broken,
and in fact current->pid should be killed on of these days.

Which pid namespace is your tracer running in?

> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> Cc: linux-security-module@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Cc: Serge Hallyn <serge.hallyn@canonical.com>
> Cc: Eric Paris <eparis@redhat.com>
> ---
> include/trace/events/capabilities.h | 33 +++++++++++++++++++++++++++++++++
> kernel/capability.c | 5 +++++
> 2 files changed, 38 insertions(+)
> create mode 100644 include/trace/events/capabilities.h
>
> diff --git a/include/trace/events/capabilities.h b/include/trace/events/capabilities.h
> new file mode 100644
> index 0000000..97997fa
> --- /dev/null
> +++ b/include/trace/events/capabilities.h
> @@ -0,0 +1,33 @@
> +#undef TRACE_SYSTEM
> +#define TRACE_SYSTEM capabilities
> +
> +#if !defined(_TRACE_CAPABILITIES_H) || defined(TRACE_HEADER_MULTI_READ)
> +#define _TRACE_CAPABILITIES_H
> +
> +#include <linux/tracepoint.h>
> +
> +TRACE_EVENT(capable,
> +
> + TP_PROTO(pid_t pid, int cap, bool rc),
> +
> + TP_ARGS(pid, cap, rc),
> +
> + TP_STRUCT__entry(
> + __field(pid_t, pid)
> + __field(int, cap)
> + __field(bool, rc)
> + ),
> +
> + TP_fast_assign(
> + __entry->pid = pid;
> + __entry->cap = cap;
> + __entry->rc = rc;
> + ),
> +
> + TP_printk("pid=%d cap=%d rc=%d", __entry->pid, __entry->cap, __entry->rc)
> +);
> +
> +#endif /* _TRACE_CAPABILITIES_H */
> +
> +/* This part must be outside protection */
> +#include <trace/define_trace.h>
> diff --git a/kernel/capability.c b/kernel/capability.c
> index 3f1adb6..2941f37 100644
> --- a/kernel/capability.c
> +++ b/kernel/capability.c
> @@ -17,6 +17,9 @@
> #include <linux/user_namespace.h>
> #include <asm/uaccess.h>
>
> +#define CREATE_TRACE_POINTS
> +#include <trace/events/capabilities.h>
> +
> /*
> * Leveraged for setting/resetting capabilities
> */
> @@ -386,8 +389,10 @@ bool ns_capable(struct user_namespace *ns, int cap)
>
> if (security_capable(current_cred(), ns, cap) == 0) {
> current->flags |= PF_SUPERPRIV;
> + trace_capable(current->pid, cap, true);
> return true;
> }
> + trace_capable(current->pid, cap, false);
> return false;
> }
> EXPORT_SYMBOL(ns_capable);


\
 
 \ /
  Last update: 2012-05-19 09:41    [W:0.239 / U:0.688 seconds]
©2003-2014 Jasper Spaans. Advertise on this site