KEYS: Reinstate lost passing of process keyring ID in call_sbin_request_key()
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
David Howells
maintainerPATCH 1/1 KEYS: Reinstate lost passing of process keyring ID in call_sbin_request_key()
From: Justin P. Mattock <[email protected]>
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.osecurity/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.
---
security/keys/request_key.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
security/keys/request_key.c +1 -0
@@ -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);
James Morris
maintainerQuoted 12 lines · David Howells
From: Justin P. Mattock <[email protected]>
In commit
bb952bb98a7e479262c7eb25d5592545a3af147dthere was the accidental deletion of a statement fromcall_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.osecurity/keys/request_key.c: In function 'call_sbin_request_key':security/keys/request_key.c:102:15: warning: variable 'prkey' set but not used
Quoted 7 lines
This patch reinstates that statement.
Without this statement,
/sbin/request-keywill get some random rubbish from the stack as that parameter.Signed-off-by Justin P. Mattock <[email protected]>Signed-off-by David Howells <[email protected]>
Applied togit://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
Signature · 2 lines
James Morris <[email protected]>