capability: Use current logging styles
PATCH 1/1 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 Joe Perches <[email protected]>
--- kernel/capability.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-)
kernel/capability.c +10 -19
@@ -7,6 +7,8 @@* 30 May 2002: Cleanup, Robert M. Love <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/audit.h> #include <linux/capability.h> #include <linux/mm.h>
@@ -42,15 +44,10 @@ __setup("no_file_caps", file_caps_disable);static void warn_legacy_capability_use (void ) { -static int warned; -if (!warned) { -char name[sizeof (current->comm)]; - -printk (KERN_INFO "warning: `%s' uses 32-bit capabilities" -" (legacy support in use)\n" , -get_task_comm (name, current)); - warned =1 ; - } +char name[sizeof (current->comm)]; + +pr_info_once ("warning: `%s' uses 32-bit capabilities (legacy support in use)\n" , +get_task_comm (name, current)); }/*
@@ -71,16 +68,10 @@ static void warn_legacy_capability_use(void)static void warn_deprecated_v2 (void ) { -static int warned; +char name[sizeof (current->comm)]; -if (!warned) { -char name[sizeof (current->comm)]; - -printk (KERN_INFO "warning: `%s' uses deprecated v2" -" capabilities in a way that may be insecure.\n" , -get_task_comm (name, current)); - warned =1 ; - } +pr_info_once ("warning: `%s' uses deprecated v2 capabilities in a way that may be insecure\n" , +get_task_comm (name, current)); }/*
@@ -380,7 +371,7 @@ bool has_capability_noaudit(struct task_struct *t, int cap)bool ns_capable (struct user_namespace *ns,int 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 (); }
Quoted 6 lines · Joe Perches
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 Joe Perches <[email protected]>
Thanks.
Acked-by Serge E. Hallyn <[email protected]>
Quoted 68 lines
--- kernel/capability.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-)kernel/capability.c +10
-19@@ -7,6 +7,8 @@* 30 May 2002: Cleanup, Robert M. Love <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/audit.h> #include <linux/capability.h> #include <linux/mm.h> @@ -42,15 +44,10 @@ __setup("no_file_caps", file_caps_disable);static void warn_legacy_capability_use (void ) { -static int warned; -if (!warned) { -char name[sizeof (current->comm)]; - -printk (KERN_INFO "warning: `%s' uses 32-bit capabilities" -" (legacy support in use)\n" , -get_task_comm (name, current)); - warned =1 ; - } +char name[sizeof (current->comm)]; + +pr_info_once ("warning: `%s' uses 32-bit capabilities (legacy support in use)\n" , +get_task_comm (name, current)); }/* @@ -71,16 +68,10 @@ static void warn_legacy_capability_use(void)static void warn_deprecated_v2 (void ) { -static int warned; +char name[sizeof (current->comm)]; -if (!warned) { -char name[sizeof (current->comm)]; - -printk (KERN_INFO "warning: `%s' uses deprecated v2" -" capabilities in a way that may be insecure.\n" , -get_task_comm (name, current)); - warned =1 ; - } +pr_info_once ("warning: `%s' uses deprecated v2 capabilities in a way that may be insecure\n" , +get_task_comm (name, current)); }/* @@ -380,7 +371,7 @@ bool has_capability_noaudit(struct task_struct *t, int cap)bool ns_capable (struct user_namespace *ns,int 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 (); }
Quoted 6 lines · Joe Perches
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 Joe Perches <[email protected]>
Applied togit://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next
Signature · 2 lines
James Morris <[email protected]>