summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2015-12-09 17:37:15 -0500
committerDavid Howells <dhowells@redhat.com>2016-02-18 10:15:59 -0500
commita1f2bdf338f15dbad10ee6362891ebf79244858b (patch)
tree89d83d75616e80a6b5cf36c3476f280e9df6a509 /security
parentd846e78e491ff4dd0747026c02414844d504fcb6 (diff)
security/keys: make big_key.c explicitly non-modular
The Kconfig currently controlling compilation of this code is: config BIG_KEYS bool "Large payload keys" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We also delete the MODULE_LICENSE tag since all that information is already contained at the top of the file in the comments. Cc: James Morris <james.l.morris@oracle.com> Cc: "Serge E. Hallyn" <serge@hallyn.com> Cc: keyrings@vger.kernel.org Cc: linux-security-module@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security')
-rw-r--r--security/keys/big_key.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/security/keys/big_key.c b/security/keys/big_key.c
index 907c1522ee46..c721e398893a 100644
--- a/security/keys/big_key.c
+++ b/security/keys/big_key.c
@@ -9,7 +9,6 @@
9 * 2 of the Licence, or (at your option) any later version. 9 * 2 of the Licence, or (at your option) any later version.
10 */ 10 */
11 11
12#include <linux/module.h>
13#include <linux/init.h> 12#include <linux/init.h>
14#include <linux/seq_file.h> 13#include <linux/seq_file.h>
15#include <linux/file.h> 14#include <linux/file.h>
@@ -18,8 +17,6 @@
18#include <keys/user-type.h> 17#include <keys/user-type.h>
19#include <keys/big_key-type.h> 18#include <keys/big_key-type.h>
20 19
21MODULE_LICENSE("GPL");
22
23/* 20/*
24 * Layout of key payload words. 21 * Layout of key payload words.
25 */ 22 */
@@ -212,18 +209,8 @@ long big_key_read(const struct key *key, char __user *buffer, size_t buflen)
212 return ret; 209 return ret;
213} 210}
214 211
215/*
216 * Module stuff
217 */
218static int __init big_key_init(void) 212static int __init big_key_init(void)
219{ 213{
220 return register_key_type(&key_type_big_key); 214 return register_key_type(&key_type_big_key);
221} 215}
222 216device_initcall(big_key_init);
223static void __exit big_key_cleanup(void)
224{
225 unregister_key_type(&key_type_big_key);
226}
227
228module_init(big_key_init);
229module_exit(big_key_cleanup);