aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/cred.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/cred.c')
-rw-r--r--kernel/cred.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/cred.c b/kernel/cred.c
index 60bc8b1e32e6..6a1aa004e376 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -22,10 +22,6 @@
22#define kdebug(FMT, ...) \ 22#define kdebug(FMT, ...) \
23 printk("[%-5.5s%5u] "FMT"\n", current->comm, current->pid ,##__VA_ARGS__) 23 printk("[%-5.5s%5u] "FMT"\n", current->comm, current->pid ,##__VA_ARGS__)
24#else 24#else
25static inline __attribute__((format(printf, 1, 2)))
26void no_printk(const char *fmt, ...)
27{
28}
29#define kdebug(FMT, ...) \ 25#define kdebug(FMT, ...) \
30 no_printk("[%-5.5s%5u] "FMT"\n", current->comm, current->pid ,##__VA_ARGS__) 26 no_printk("[%-5.5s%5u] "FMT"\n", current->comm, current->pid ,##__VA_ARGS__)
31#endif 27#endif
@@ -329,7 +325,7 @@ EXPORT_SYMBOL(prepare_creds);
329 325
330/* 326/*
331 * Prepare credentials for current to perform an execve() 327 * Prepare credentials for current to perform an execve()
332 * - The caller must hold current->cred_guard_mutex 328 * - The caller must hold ->cred_guard_mutex
333 */ 329 */
334struct cred *prepare_exec_creds(void) 330struct cred *prepare_exec_creds(void)
335{ 331{
@@ -388,8 +384,6 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags)
388 struct cred *new; 384 struct cred *new;
389 int ret; 385 int ret;
390 386
391 mutex_init(&p->cred_guard_mutex);
392
393 if ( 387 if (
394#ifdef CONFIG_KEYS 388#ifdef CONFIG_KEYS
395 !p->cred->thread_keyring && 389 !p->cred->thread_keyring &&