summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin P. Mattock <justinmattock@gmail.com>2010-06-30 10:39:11 +0100
committerJames Morris <jmorris@namei.org>2010-08-02 15:34:56 +1000
commit5ad18a0d59ba9e65b3c8b2b489fd23bc6b3daf94 (patch)
tree9de21bbe321012bd8e51d9d8ed09b81785cfcbec
parent94fd8405ea62bd2d4a40f3013e8e6935b6643235 (diff)
KEYS: Reinstate lost passing of process keyring ID in call_sbin_request_key()
In commit bb952bb98a7e479262c7eb25d5592545a3af147d there was the accidental deletion of a statement from call_sbin_request_key() to render the process keyring ID to a text string so that it can be passed to /sbin/request-key. With gcc 4.6.0 this causes the following warning: CC security/keys/request_key.o security/keys/request_key.c: In function 'call_sbin_request_key': security/keys/request_key.c:102:15: warning: variable 'prkey' set but not used This patch reinstates that statement. Without this statement, /sbin/request-key will get some random rubbish from the stack as that parameter. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--security/keys/request_key.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index f5ec9ac5d57c..0d26f689bd77 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -144,6 +144,7 @@ static int call_sbin_request_key(struct key_construction *cons,
prkey = 0;
if (cred->tgcred->process_keyring)
prkey = cred->tgcred->process_keyring->serial;
+ sprintf(keyring_str[1], "%d", prkey);
rcu_read_lock();
session = rcu_dereference(cred->tgcred->session_keyring);