stuartl/linux-stable
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git synced 2025-09-13 11:07:46 +10:00
Code Issues Releases Wiki Activity

cred: convert printks to pr_<level>

Browse Source 
Use current logging style.

Link: https://lkml.kernel.org/r/20230625033452.GA22858@didi-ThinkCentre-M930t-N000
Signed-off-by: tiozhang <tiozhang@didiglobal.com>
Reviewed-by: Sergey 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: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
tiozhang 2023-06-25 11:34:52 +08:00 committed by Andrew Morton
parent 5d0c230f1d
commit 4099451ac2
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/cred.c
View File

@ -4,6 +4,9 @@
* Copyright (C) 2008 Red Hat, Inc. All Rights Reserved. * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
* Written by David Howells (dhowells@redhat.com) * Written by David Howells (dhowells@redhat.com)
*/ */
#define pr_fmt(fmt) "CRED: " fmt
#include <linux/export.h> #include <linux/export.h>
#include <linux/cred.h> #include <linux/cred.h>
#include <linux/slab.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, static void dump_invalid_creds(const struct cred *cred, const char *label,
const struct task_struct *tsk) 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, label, cred,
cred == &init_cred ? "[init]" : "", cred == &init_cred ? "[init]" : "",
cred == tsk->real_cred ? "[real]" : "", cred == tsk->real_cred ? "[real]" : "",
cred == tsk->cred ? "[eff]" : ""); 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); 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), atomic_read(&cred->usage),
read_cred_subscribers(cred)); 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->uid),
from_kuid_munged(&init_user_ns, cred->euid), from_kuid_munged(&init_user_ns, cred->euid),
from_kuid_munged(&init_user_ns, cred->suid), from_kuid_munged(&init_user_ns, cred->suid),
from_kuid_munged(&init_user_ns, cred->fsuid)); 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->gid),
from_kgid_munged(&init_user_ns, cred->egid), from_kgid_munged(&init_user_ns, cred->egid),
from_kgid_munged(&init_user_ns, cred->sgid), from_kgid_munged(&init_user_ns, cred->sgid),
from_kgid_munged(&init_user_ns, cred->fsgid)); from_kgid_munged(&init_user_ns, cred->fsgid));
#ifdef CONFIG_SECURITY #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 && if ((unsigned long) cred->security >= PAGE_SIZE &&
(((unsigned long) cred->security & 0xffffff00) != (((unsigned long) cred->security & 0xffffff00) !=
(POISON_FREE << 24 | POISON_FREE << 16 | POISON_FREE << 8))) (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)[0],
((u32*)cred->security)[1]); ((u32*)cred->security)[1]);
#endif #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) void __noreturn __invalid_creds(const struct cred *cred, const char *file, unsigned line)
{ {
printk(KERN_ERR "CRED: Invalid credentials\n"); pr_err("Invalid credentials\n");
printk(KERN_ERR "CRED: At %s:%u\n", file, line); pr_err("At %s:%u\n", file, line);
dump_invalid_creds(cred, "Specified", current); dump_invalid_creds(cred, "Specified", current);
BUG(); BUG();
} }
@ -898,14 +901,14 @@ void __validate_process_creds(struct task_struct *tsk,
return; return;
invalid_creds: invalid_creds:
printk(KERN_ERR "CRED: Invalid process credentials\n"); pr_err("Invalid process credentials\n");
printk(KERN_ERR "CRED: At %s:%u\n", file, line); pr_err("At %s:%u\n", file, line);
dump_invalid_creds(tsk->real_cred, "Real", tsk); dump_invalid_creds(tsk->real_cred, "Real", tsk);
if (tsk->cred != tsk->real_cred) if (tsk->cred != tsk->real_cred)
dump_invalid_creds(tsk->cred, "Effective", tsk); dump_invalid_creds(tsk->cred, "Effective", tsk);
else else
printk(KERN_ERR "CRED: Effective creds == Real creds\n"); pr_err("Effective creds == Real creds\n");
BUG(); BUG();
} }
EXPORT_SYMBOL(__validate_process_creds); EXPORT_SYMBOL(__validate_process_creds);