drop_monitor: dont sleep in atomic context

[firefly-linux-kernel-4.4.55.git] / kernel / cred.c

diff --git a/kernel/cred.c b/kernel/cred.c
index e12c8af793f8083c5fcda23a65ec33086b2ca8fb..3a55ea4fa983ebf7259e55ae659dc583b247343a 100644 (file)
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -1,4 +1,4 @@
-/* Task credentials management - see Documentation/credentials.txt
+/* Task credentials management - see Documentation/security/credentials.txt
  *
  * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells@redhat.com)
@@ -385,6 +385,8 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags)
        struct cred *new;
        int ret;
 
+       p->replacement_session_keyring = NULL;
+
        if (
 #ifdef CONFIG_KEYS
                !p->cred->thread_keyring &&