Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

kernel/capability.c

+10 −19
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 * 30 May 2002:	Cleanup, Robert M. Love <rml@tech9.net>

 */



#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",

	pr_info_once("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) 


static void warn_deprecated_v2(void)

{

	static int warned;



	if (!warned) {

	char name[sizeof(current->comm)];



		printk(KERN_INFO "warning: `%s' uses deprecated v2"

		       " capabilities in a way that may be insecure.\n",

	pr_info_once("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) 
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();

	}