diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 10:06:46 +0000 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 10:06:46 +0000 |
commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /kernel/kmod.c | |
parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) | |
download | kernel_samsung_smdk4412-1f04c0a24b2f3cfe89c802a24396263623e3512d.zip kernel_samsung_smdk4412-1f04c0a24b2f3cfe89c802a24396263623e3512d.tar.gz kernel_samsung_smdk4412-1f04c0a24b2f3cfe89c802a24396263623e3512d.tar.bz2 |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'kernel/kmod.c')
-rw-r--r-- | kernel/kmod.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index 44166e3..51a8920 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -131,14 +131,14 @@ struct subprocess_info { static int ____call_usermodehelper(void *data) { struct subprocess_info *sub_info = data; - struct key *old_session; + struct key *new_session, *old_session; int retval; /* Unblock all signals and set the session keyring. */ - key_get(sub_info->ring); + new_session = key_get(sub_info->ring); flush_signals(current); spin_lock_irq(¤t->sighand->siglock); - old_session = __install_session_keyring(current, sub_info->ring); + old_session = __install_session_keyring(current, new_session); flush_signal_handlers(current, 1); sigemptyset(¤t->blocked); recalc_sigpending(); |