Commit 5ad18a0d authored by Justin P. Mattock's avatar Justin P. Mattock Committed by James Morris

KEYS: Reinstate lost passing of process keyring ID in call_sbin_request_key()

In commit bb952bb9 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: default avatarJustin P. Mattock <justinmattock@gmail.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 94fd8405
...@@ -144,6 +144,7 @@ static int call_sbin_request_key(struct key_construction *cons, ...@@ -144,6 +144,7 @@ static int call_sbin_request_key(struct key_construction *cons,
prkey = 0; prkey = 0;
if (cred->tgcred->process_keyring) if (cred->tgcred->process_keyring)
prkey = cred->tgcred->process_keyring->serial; prkey = cred->tgcred->process_keyring->serial;
sprintf(keyring_str[1], "%d", prkey);
rcu_read_lock(); rcu_read_lock();
session = rcu_dereference(cred->tgcred->session_keyring); session = rcu_dereference(cred->tgcred->session_keyring);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment