Merge tag 'keys-request-20190626' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-rpi.git] / include / linux / tracehook.h

diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
index 09d6784..8446573 100644 (file)
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -184,6 +184,13 @@ static inline void tracehook_notify_resume(struct pt_regs *regs)
        if (unlikely(current->task_works))
                task_work_run();
 
+#ifdef CONFIG_KEYS_REQUEST_CACHE
+       if (unlikely(current->cached_requested_key)) {
+               key_put(current->cached_requested_key);
+               current->cached_requested_key = NULL;
+       }
+#endif
+
        mem_cgroup_handle_over_high();
        blkcg_maybe_throttle_current();
 }