1 files changed, 7 insertions, 1 deletions

diff --git a/include/linux/cred.h b/include/linux/cred.h
index 7eb43a038330..f7a30e0099be 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -145,7 +145,11 @@ struct cred {
         struct user_struct *user;       /* real user ID subscription */
         struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
         struct group_info *group_info;  /* supplementary groups for euid/fsgid */
-        struct rcu_head rcu;            /* RCU deletion hook */
+        /* RCU deletion */
+        union {
+                int non_rcu;                    /* Can we skip RCU deletion? */
+                struct rcu_head rcu;            /* RCU deletion hook */
+        };
 } __randomize_layout;
 
 extern void __put_cred(struct cred *);
@@ -246,6 +250,7 @@ static inline const struct cred *get_cred(const struct cred *cred)
         if (!cred)
                 return cred;
         validate_creds(cred);
+        nonconst_cred->non_rcu = 0;
         return get_new_cred(nonconst_cred);
 }
 
@@ -257,6 +262,7 @@ static inline const struct cred *get_cred_rcu(const struct cred *cred)
         if (!atomic_inc_not_zero(&nonconst_cred->usage))
                 return NULL;
         validate_creds(cred);
+        nonconst_cred->non_rcu = 0;
         return cred;
 }