Commit f5645d35 authored by Joe Perches's avatar Joe Perches Committed by James Morris

capability: Use current logging styles

Prefix logging output with "capability: " via pr_fmt.
Convert printks to pr_<level>.
Use pr_<level>_once instead of guard flags.
Coalesce formats.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent e0c2de2b
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
* 30 May 2002: Cleanup, Robert M. Love <rml@tech9.net> * 30 May 2002: Cleanup, Robert M. Love <rml@tech9.net>
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/audit.h> #include <linux/audit.h>
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/mm.h> #include <linux/mm.h>
...@@ -42,15 +44,10 @@ __setup("no_file_caps", file_caps_disable); ...@@ -42,15 +44,10 @@ __setup("no_file_caps", file_caps_disable);
static void warn_legacy_capability_use(void) static void warn_legacy_capability_use(void)
{ {
static int warned; char name[sizeof(current->comm)];
if (!warned) {
char name[sizeof(current->comm)]; pr_info_once("warning: `%s' uses 32-bit capabilities (legacy support in use)\n",
get_task_comm(name, current));
printk(KERN_INFO "warning: `%s' uses 32-bit capabilities"
" (legacy support in use)\n",
get_task_comm(name, current));
warned = 1;
}
} }
/* /*
...@@ -71,16 +68,10 @@ static void warn_legacy_capability_use(void) ...@@ -71,16 +68,10 @@ static void warn_legacy_capability_use(void)
static void warn_deprecated_v2(void) static void warn_deprecated_v2(void)
{ {
static int warned; char name[sizeof(current->comm)];
if (!warned) { pr_info_once("warning: `%s' uses deprecated v2 capabilities in a way that may be insecure\n",
char name[sizeof(current->comm)]; get_task_comm(name, current));
printk(KERN_INFO "warning: `%s' uses deprecated v2"
" capabilities in a way that may be insecure.\n",
get_task_comm(name, current));
warned = 1;
}
} }
/* /*
...@@ -380,7 +371,7 @@ bool has_capability_noaudit(struct task_struct *t, int cap) ...@@ -380,7 +371,7 @@ bool has_capability_noaudit(struct task_struct *t, int cap)
bool ns_capable(struct user_namespace *ns, int cap) bool ns_capable(struct user_namespace *ns, int cap)
{ {
if (unlikely(!cap_valid(cap))) { if (unlikely(!cap_valid(cap))) {
printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap); pr_crit("capable() called with invalid cap=%u\n", cap);
BUG(); BUG();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment