Commit 4099451a authored by tiozhang's avatar tiozhang Committed by Andrew Morton
Browse files

cred: convert printks to pr_<level> 

Use current logging style.

Link: https://lkml.kernel.org/r/20230625033452.GA22858@didi-ThinkCentre-M930t-N000


Signed-off-by: default avatartiozhang <tiozhang@didiglobal.com>
Reviewed-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Joe Perches <joe@perches.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Paulo Alcantara <pc@cjr.nz>
Cc: Weiping Zhang <zwp10758@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5d0c230f

kernel/cred.c

+15 −12
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 
 * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 */



#define pr_fmt(fmt) "CRED: " fmt



#include <linux/export.h>

#include <linux/cred.h>

#include <linux/slab.h>
@@ -835,32 +838,32 @@ EXPORT_SYMBOL(creds_are_invalid); 
static void dump_invalid_creds(const struct cred *cred, const char *label,

			       const struct task_struct *tsk)

{

	printk(KERN_ERR "CRED: %s credentials: %p %s%s%s\n",

	pr_err("%s credentials: %p %s%s%s\n",

	       label, cred,

	       cred == &init_cred ? "[init]" : "",

	       cred == tsk->real_cred ? "[real]" : "",

	       cred == tsk->cred ? "[eff]" : "");

	printk(KERN_ERR "CRED: ->magic=%x, put_addr=%p\n",

	pr_err("->magic=%x, put_addr=%p\n",

	       cred->magic, cred->put_addr);

	printk(KERN_ERR "CRED: ->usage=%d, subscr=%d\n",

	pr_err("->usage=%d, subscr=%d\n",

	       atomic_read(&cred->usage),

	       read_cred_subscribers(cred));

	printk(KERN_ERR "CRED: ->*uid = { %d,%d,%d,%d }\n",

	pr_err("->*uid = { %d,%d,%d,%d }\n",

		from_kuid_munged(&init_user_ns, cred->uid),

		from_kuid_munged(&init_user_ns, cred->euid),

		from_kuid_munged(&init_user_ns, cred->suid),

		from_kuid_munged(&init_user_ns, cred->fsuid));

	printk(KERN_ERR "CRED: ->*gid = { %d,%d,%d,%d }\n",

	pr_err("->*gid = { %d,%d,%d,%d }\n",

		from_kgid_munged(&init_user_ns, cred->gid),

		from_kgid_munged(&init_user_ns, cred->egid),

		from_kgid_munged(&init_user_ns, cred->sgid),

		from_kgid_munged(&init_user_ns, cred->fsgid));

#ifdef CONFIG_SECURITY

	printk(KERN_ERR "CRED: ->security is %p\n", cred->security);

	pr_err("->security is %p\n", cred->security);

	if ((unsigned long) cred->security >= PAGE_SIZE &&

	    (((unsigned long) cred->security & 0xffffff00) !=

	     (POISON_FREE << 24 | POISON_FREE << 16 | POISON_FREE << 8)))

		printk(KERN_ERR "CRED: ->security {%x, %x}\n",

		pr_err("->security {%x, %x}\n",

		       ((u32*)cred->security)[0],

		       ((u32*)cred->security)[1]);

#endif
@@ -871,8 +874,8 @@ static void dump_invalid_creds(const struct cred *cred, const char *label, 
 */

void __noreturn __invalid_creds(const struct cred *cred, const char *file, unsigned line)

{

	printk(KERN_ERR "CRED: Invalid credentials\n");

	printk(KERN_ERR "CRED: At %s:%u\n", file, line);

	pr_err("Invalid credentials\n");

	pr_err("At %s:%u\n", file, line);

	dump_invalid_creds(cred, "Specified", current);

	BUG();

}
@@ -898,14 +901,14 @@ void __validate_process_creds(struct task_struct *tsk, 
	return;



invalid_creds:

	printk(KERN_ERR "CRED: Invalid process credentials\n");

	printk(KERN_ERR "CRED: At %s:%u\n", file, line);

	pr_err("Invalid process credentials\n");

	pr_err("At %s:%u\n", file, line);



	dump_invalid_creds(tsk->real_cred, "Real", tsk);

	if (tsk->cred != tsk->real_cred)

		dump_invalid_creds(tsk->cred, "Effective", tsk);

	else

		printk(KERN_ERR "CRED: Effective creds == Real creds\n");

		pr_err("Effective creds == Real creds\n");

	BUG();

}

EXPORT_SYMBOL(__validate_process_creds);