---

yaml --- r: 11850 b: refs/heads/master c: 20e1129 h: refs/heads/master v: v3
git-mirror · Oct 31, 2005 · 8894f6d · 8894f6d
1 parent f4dcb7b
commit 8894f6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29db9190634067c5a328ee5fcc2890251b836b4b
+refs/heads/master: 20e1129ab831486c811d50d3905343ad48c4275f
diff --git a/trunk/kernel/kmod.c b/trunk/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(&current->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(&current->blocked);
 	recalc_sigpending();