summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-05-23 14:44:37 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-05-23 22:09:20 -0400
commita42c6ded827dbd396d2efde7530620be029a72d1 (patch)
treeea3129404f32515a04497990a050b2cf73aa1d5d /include/linux
parent1227dd773d8d4e3983b4b751f9ffa0f41402fb7c (diff)
downloadlinux-stable-a42c6ded827dbd396d2efde7530620be029a72d1.tar.gz
linux-stable-a42c6ded827dbd396d2efde7530620be029a72d1.tar.bz2
linux-stable-a42c6ded827dbd396d2efde7530620be029a72d1.zip
move key_repace_session_keyring() into tracehook_notify_resume()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/tracehook.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
index 8a2a3fc9bd05..b9ca903bb553 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -183,6 +183,8 @@ static inline void set_notify_resume(struct task_struct *task)
*/
static inline void tracehook_notify_resume(struct pt_regs *regs)
{
+ if (current->replacement_session_keyring)
+ key_replace_session_keyring();
}
#endif /* <linux/tracehook.h> */