diff options
author | H. Peter Anvin <hpa@zytor.com> | 2007-12-29 19:20:25 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-01-24 19:29:50 -0500 |
commit | bced95283e9434611cbad8f2ff903cd396eaea72 (patch) | |
tree | 5d56afc7a5f239ebc53a1800a508f16b8d8701b0 /security | |
parent | 42d7896ebc5f7268b1fe6bbd20f2282e20ae7895 (diff) |
security: remove security_sb_post_mountroot hook
The security_sb_post_mountroot() hook is long-since obsolete, and is
fundamentally broken: it is never invoked if someone uses initramfs.
This is particularly damaging, because the existence of this hook has
been used as motivation for not using initramfs.
Stephen Smalley confirmed on 2007-07-19 that this hook was originally
used by SELinux but can now be safely removed:
http://marc.info/?l=linux-kernel&m=118485683612916&w=2
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: James Morris <jmorris@namei.org>
Cc: Eric Paris <eparis@parisplace.org>
Cc: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r-- | security/dummy.c | 6 | ||||
-rw-r--r-- | security/security.c | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/security/dummy.c b/security/dummy.c index a3b29d0d00e5..8e34e03415f8 100644 --- a/security/dummy.c +++ b/security/dummy.c | |||
@@ -225,11 +225,6 @@ static void dummy_sb_post_remount (struct vfsmount *mnt, unsigned long flags, | |||
225 | } | 225 | } |
226 | 226 | ||
227 | 227 | ||
228 | static void dummy_sb_post_mountroot (void) | ||
229 | { | ||
230 | return; | ||
231 | } | ||
232 | |||
233 | static void dummy_sb_post_addmount (struct vfsmount *mnt, struct nameidata *nd) | 228 | static void dummy_sb_post_addmount (struct vfsmount *mnt, struct nameidata *nd) |
234 | { | 229 | { |
235 | return; | 230 | return; |
@@ -1017,7 +1012,6 @@ void security_fixup_ops (struct security_operations *ops) | |||
1017 | set_to_dummy_if_null(ops, sb_umount_close); | 1012 | set_to_dummy_if_null(ops, sb_umount_close); |
1018 | set_to_dummy_if_null(ops, sb_umount_busy); | 1013 | set_to_dummy_if_null(ops, sb_umount_busy); |
1019 | set_to_dummy_if_null(ops, sb_post_remount); | 1014 | set_to_dummy_if_null(ops, sb_post_remount); |
1020 | set_to_dummy_if_null(ops, sb_post_mountroot); | ||
1021 | set_to_dummy_if_null(ops, sb_post_addmount); | 1015 | set_to_dummy_if_null(ops, sb_post_addmount); |
1022 | set_to_dummy_if_null(ops, sb_pivotroot); | 1016 | set_to_dummy_if_null(ops, sb_pivotroot); |
1023 | set_to_dummy_if_null(ops, sb_post_pivotroot); | 1017 | set_to_dummy_if_null(ops, sb_post_pivotroot); |
diff --git a/security/security.c b/security/security.c index b13b54f0af85..5068808343d0 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -288,11 +288,6 @@ void security_sb_post_remount(struct vfsmount *mnt, unsigned long flags, void *d | |||
288 | security_ops->sb_post_remount(mnt, flags, data); | 288 | security_ops->sb_post_remount(mnt, flags, data); |
289 | } | 289 | } |
290 | 290 | ||
291 | void security_sb_post_mountroot(void) | ||
292 | { | ||
293 | security_ops->sb_post_mountroot(); | ||
294 | } | ||
295 | |||
296 | void security_sb_post_addmount(struct vfsmount *mnt, struct nameidata *mountpoint_nd) | 291 | void security_sb_post_addmount(struct vfsmount *mnt, struct nameidata *mountpoint_nd) |
297 | { | 292 | { |
298 | security_ops->sb_post_addmount(mnt, mountpoint_nd); | 293 | security_ops->sb_post_addmount(mnt, mountpoint_nd); |