diff options
author | James Morris <jmorris@namei.org> | 2008-07-10 04:02:07 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-07-14 01:04:06 -0400 |
commit | 6f0f0fd496333777d53daff21a4e3b28c4d03a6d (patch) | |
tree | 202de67376fce2547b44ae5b016d6424c3c7409c /include/linux/security.h | |
parent | 93cbace7a058bce7f99319ef6ceff4b78cf45051 (diff) |
security: remove register_security hook
The register security hook is no longer required, as the capability
module is always registered. LSMs wishing to stack capability as
a secondary module should do so explicitly.
Signed-off-by: James Morris <jmorris@namei.org>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/security.h')
-rw-r--r-- | include/linux/security.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 43c6357568a3..31c8851ec5d0 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -1239,11 +1239,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) | |||
1239 | * @pages contains the number of pages. | 1239 | * @pages contains the number of pages. |
1240 | * Return 0 if permission is granted. | 1240 | * Return 0 if permission is granted. |
1241 | * | 1241 | * |
1242 | * @register_security: | ||
1243 | * allow module stacking. | ||
1244 | * @name contains the name of the security module being stacked. | ||
1245 | * @ops contains a pointer to the struct security_operations of the module to stack. | ||
1246 | * | ||
1247 | * @secid_to_secctx: | 1242 | * @secid_to_secctx: |
1248 | * Convert secid to security context. | 1243 | * Convert secid to security context. |
1249 | * @secid contains the security ID. | 1244 | * @secid contains the security ID. |
@@ -1471,10 +1466,6 @@ struct security_operations { | |||
1471 | int (*netlink_send) (struct sock *sk, struct sk_buff *skb); | 1466 | int (*netlink_send) (struct sock *sk, struct sk_buff *skb); |
1472 | int (*netlink_recv) (struct sk_buff *skb, int cap); | 1467 | int (*netlink_recv) (struct sk_buff *skb, int cap); |
1473 | 1468 | ||
1474 | /* allow module stacking */ | ||
1475 | int (*register_security) (const char *name, | ||
1476 | struct security_operations *ops); | ||
1477 | |||
1478 | void (*d_instantiate) (struct dentry *dentry, struct inode *inode); | 1469 | void (*d_instantiate) (struct dentry *dentry, struct inode *inode); |
1479 | 1470 | ||
1480 | int (*getprocattr) (struct task_struct *p, char *name, char **value); | 1471 | int (*getprocattr) (struct task_struct *p, char *name, char **value); |
@@ -1564,7 +1555,6 @@ struct security_operations { | |||
1564 | extern int security_init(void); | 1555 | extern int security_init(void); |
1565 | extern int security_module_enable(struct security_operations *ops); | 1556 | extern int security_module_enable(struct security_operations *ops); |
1566 | extern int register_security(struct security_operations *ops); | 1557 | extern int register_security(struct security_operations *ops); |
1567 | extern int mod_reg_security(const char *name, struct security_operations *ops); | ||
1568 | extern struct dentry *securityfs_create_file(const char *name, mode_t mode, | 1558 | extern struct dentry *securityfs_create_file(const char *name, mode_t mode, |
1569 | struct dentry *parent, void *data, | 1559 | struct dentry *parent, void *data, |
1570 | const struct file_operations *fops); | 1560 | const struct file_operations *fops); |