Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5ad18a0d59ba9e65b3c8b2b489fd23bc6b3daf94

Authored by Justin P. Mattock
Committed by James Morris
1 parent 94fd8405ea
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 0 deletions Side-by-side Diff

security/keys/request_key.c
Diff comments   View file @ 5ad18a0
... ... @@ -144,6 +144,7 @@
144 144 prkey = 0;
145 145 if (cred->tgcred->process_keyring)
146 146 prkey = cred->tgcred->process_keyring->serial;
  147 + sprintf(keyring_str[1], "%d", prkey);
147 148  
148 149 rcu_read_lock();
149 150 session = rcu_dereference(cred->tgcred->session_keyring);