diff options
author | rwatson <rwatson@FreeBSD.org> | 2002-11-12 04:20:36 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2002-11-12 04:20:36 +0000 |
commit | 1e2f84951192b417cc73573a47605913d9b671f2 (patch) | |
tree | f77b4842f5fc009d2a4ec4c987fb24eb6b02fba1 /sys | |
parent | afd12f968b077aa6c86bd0026507f84ade294f1f (diff) | |
download | FreeBSD-src-1e2f84951192b417cc73573a47605913d9b671f2.zip FreeBSD-src-1e2f84951192b417cc73573a47605913d9b671f2.tar.gz |
Garbage collect mac_create_devfs_vnode() -- it hasn't been used since
we brought in the new cache and locking model for vnode labels. We
now rely on mac_associate_devfs_vnode().
Obtained from: TrustedBSD Project
Sponsored by: DARPA, Network Associates Laboratories
Diffstat (limited to 'sys')
-rw-r--r-- | sys/kern/kern_mac.c | 7 | ||||
-rw-r--r-- | sys/security/mac/mac_framework.c | 7 | ||||
-rw-r--r-- | sys/security/mac/mac_framework.h | 1 | ||||
-rw-r--r-- | sys/security/mac/mac_internal.h | 7 | ||||
-rw-r--r-- | sys/security/mac/mac_net.c | 7 | ||||
-rw-r--r-- | sys/security/mac/mac_pipe.c | 7 | ||||
-rw-r--r-- | sys/security/mac/mac_policy.h | 3 | ||||
-rw-r--r-- | sys/security/mac/mac_process.c | 7 | ||||
-rw-r--r-- | sys/security/mac/mac_syscalls.c | 7 | ||||
-rw-r--r-- | sys/security/mac/mac_system.c | 7 | ||||
-rw-r--r-- | sys/security/mac/mac_vfs.c | 7 | ||||
-rw-r--r-- | sys/security/mac_biba/mac_biba.c | 12 | ||||
-rw-r--r-- | sys/security/mac_mls/mac_mls.c | 12 | ||||
-rw-r--r-- | sys/security/mac_none/mac_none.c | 8 | ||||
-rw-r--r-- | sys/security/mac_stub/mac_stub.c | 8 | ||||
-rw-r--r-- | sys/security/mac_test/mac_test.c | 8 | ||||
-rw-r--r-- | sys/sys/mac.h | 1 | ||||
-rw-r--r-- | sys/sys/mac_policy.h | 3 |
18 files changed, 0 insertions, 119 deletions
diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c index e5fb6ef..e9a00cfa 100644 --- a/sys/kern/kern_mac.c +++ b/sys/kern/kern_mac.c @@ -2708,13 +2708,6 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, } void -mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp) -{ - - MAC_PERFORM(create_devfs_vnode, de, &de->de_label, vp, &vp->v_label); -} - -void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de) { diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index e5fb6ef..e9a00cfa 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -2708,13 +2708,6 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, } void -mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp) -{ - - MAC_PERFORM(create_devfs_vnode, de, &de->de_label, vp, &vp->v_label); -} - -void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de) { diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h index 3d56a17..17cf52e 100644 --- a/sys/security/mac/mac_framework.h +++ b/sys/security/mac/mac_framework.h @@ -174,7 +174,6 @@ void mac_create_devfs_directory(char *dirname, int dirnamelen, struct devfs_dirent *de); void mac_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, struct devfs_dirent *de); -void mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp); int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); void mac_create_mount(struct ucred *cred, struct mount *mp); diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index e5fb6ef..e9a00cfa 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -2708,13 +2708,6 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, } void -mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp) -{ - - MAC_PERFORM(create_devfs_vnode, de, &de->de_label, vp, &vp->v_label); -} - -void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de) { diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c index e5fb6ef..e9a00cfa 100644 --- a/sys/security/mac/mac_net.c +++ b/sys/security/mac/mac_net.c @@ -2708,13 +2708,6 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, } void -mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp) -{ - - MAC_PERFORM(create_devfs_vnode, de, &de->de_label, vp, &vp->v_label); -} - -void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de) { diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c index e5fb6ef..e9a00cfa 100644 --- a/sys/security/mac/mac_pipe.c +++ b/sys/security/mac/mac_pipe.c @@ -2708,13 +2708,6 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, } void -mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp) -{ - - MAC_PERFORM(create_devfs_vnode, de, &de->de_label, vp, &vp->v_label); -} - -void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de) { diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h index 23ea56b..20988fa 100644 --- a/sys/security/mac/mac_policy.h +++ b/sys/security/mac/mac_policy.h @@ -147,9 +147,6 @@ struct mac_policy_ops { void (*mpo_create_devfs_symlink)(struct ucred *cred, struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel); - void (*mpo_create_devfs_vnode)(struct devfs_dirent *de, - struct label *direntlabel, struct vnode *vp, - struct label *vnodelabel); int (*mpo_create_vnode_extattr)(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *dvp, struct label *dlabel, diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c index e5fb6ef..e9a00cfa 100644 --- a/sys/security/mac/mac_process.c +++ b/sys/security/mac/mac_process.c @@ -2708,13 +2708,6 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, } void -mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp) -{ - - MAC_PERFORM(create_devfs_vnode, de, &de->de_label, vp, &vp->v_label); -} - -void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de) { diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index e5fb6ef..e9a00cfa 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -2708,13 +2708,6 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, } void -mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp) -{ - - MAC_PERFORM(create_devfs_vnode, de, &de->de_label, vp, &vp->v_label); -} - -void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de) { diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c index e5fb6ef..e9a00cfa 100644 --- a/sys/security/mac/mac_system.c +++ b/sys/security/mac/mac_system.c @@ -2708,13 +2708,6 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, } void -mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp) -{ - - MAC_PERFORM(create_devfs_vnode, de, &de->de_label, vp, &vp->v_label); -} - -void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de) { diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index e5fb6ef..e9a00cfa 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -2708,13 +2708,6 @@ mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, } void -mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp) -{ - - MAC_PERFORM(create_devfs_vnode, de, &de->de_label, vp, &vp->v_label); -} - -void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de) { diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index 3268dd7..d342d5f 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -844,17 +844,6 @@ mac_biba_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, } static void -mac_biba_create_devfs_vnode(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) -{ - struct mac_biba *source, *dest; - - source = SLOT(direntlabel); - dest = SLOT(vnodelabel); - mac_biba_copy_single(source, dest); -} - -static void mac_biba_create_mount(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel) { @@ -2587,7 +2576,6 @@ static struct mac_policy_ops mac_biba_ops = .mpo_create_devfs_device = mac_biba_create_devfs_device, .mpo_create_devfs_directory = mac_biba_create_devfs_directory, .mpo_create_devfs_symlink = mac_biba_create_devfs_symlink, - .mpo_create_devfs_vnode = mac_biba_create_devfs_vnode, .mpo_create_mount = mac_biba_create_mount, .mpo_create_root_mount = mac_biba_create_root_mount, .mpo_relabel_vnode = mac_biba_relabel_vnode, diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c index 898630e..b42c1e4 100644 --- a/sys/security/mac_mls/mac_mls.c +++ b/sys/security/mac_mls/mac_mls.c @@ -813,17 +813,6 @@ mac_mls_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, } static void -mac_mls_create_devfs_vnode(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) -{ - struct mac_mls *source, *dest; - - source = SLOT(direntlabel); - dest = SLOT(vnodelabel); - mac_mls_copy_single(source, dest); -} - -static void mac_mls_create_mount(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel) { @@ -2405,7 +2394,6 @@ static struct mac_policy_ops mac_mls_ops = .mpo_create_devfs_device = mac_mls_create_devfs_device, .mpo_create_devfs_directory = mac_mls_create_devfs_directory, .mpo_create_devfs_symlink = mac_mls_create_devfs_symlink, - .mpo_create_devfs_vnode = mac_mls_create_devfs_vnode, .mpo_create_mount = mac_mls_create_mount, .mpo_create_root_mount = mac_mls_create_root_mount, .mpo_relabel_vnode = mac_mls_relabel_vnode, diff --git a/sys/security/mac_none/mac_none.c b/sys/security/mac_none/mac_none.c index 7039420..0550793 100644 --- a/sys/security/mac_none/mac_none.c +++ b/sys/security/mac_none/mac_none.c @@ -189,13 +189,6 @@ mac_none_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, } -static void -mac_none_create_devfs_vnode(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) -{ - -} - static int mac_none_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *dvp, struct label *dlabel, @@ -930,7 +923,6 @@ static struct mac_policy_ops mac_none_ops = .mpo_create_devfs_device = mac_none_create_devfs_device, .mpo_create_devfs_directory = mac_none_create_devfs_directory, .mpo_create_devfs_symlink = mac_none_create_devfs_symlink, - .mpo_create_devfs_vnode = mac_none_create_devfs_vnode, .mpo_create_vnode_extattr = mac_none_create_vnode_extattr, .mpo_create_mount = mac_none_create_mount, .mpo_create_root_mount = mac_none_create_root_mount, diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c index 7039420..0550793 100644 --- a/sys/security/mac_stub/mac_stub.c +++ b/sys/security/mac_stub/mac_stub.c @@ -189,13 +189,6 @@ mac_none_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, } -static void -mac_none_create_devfs_vnode(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) -{ - -} - static int mac_none_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *dvp, struct label *dlabel, @@ -930,7 +923,6 @@ static struct mac_policy_ops mac_none_ops = .mpo_create_devfs_device = mac_none_create_devfs_device, .mpo_create_devfs_directory = mac_none_create_devfs_directory, .mpo_create_devfs_symlink = mac_none_create_devfs_symlink, - .mpo_create_devfs_vnode = mac_none_create_devfs_vnode, .mpo_create_vnode_extattr = mac_none_create_vnode_extattr, .mpo_create_mount = mac_none_create_mount, .mpo_create_root_mount = mac_none_create_root_mount, diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c index 7ab30d0..0dc09a9 100644 --- a/sys/security/mac_test/mac_test.c +++ b/sys/security/mac_test/mac_test.c @@ -538,13 +538,6 @@ mac_test_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, } -static void -mac_test_create_devfs_vnode(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) -{ - -} - static int mac_test_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *dvp, struct label *dlabel, @@ -1257,7 +1250,6 @@ static struct mac_policy_ops mac_test_ops = .mpo_create_devfs_device = mac_test_create_devfs_device, .mpo_create_devfs_directory = mac_test_create_devfs_directory, .mpo_create_devfs_symlink = mac_test_create_devfs_symlink, - .mpo_create_devfs_vnode = mac_test_create_devfs_vnode, .mpo_create_vnode_extattr = mac_test_create_vnode_extattr, .mpo_create_mount = mac_test_create_mount, .mpo_create_root_mount = mac_test_create_root_mount, diff --git a/sys/sys/mac.h b/sys/sys/mac.h index 3d56a17..17cf52e 100644 --- a/sys/sys/mac.h +++ b/sys/sys/mac.h @@ -174,7 +174,6 @@ void mac_create_devfs_directory(char *dirname, int dirnamelen, struct devfs_dirent *de); void mac_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, struct devfs_dirent *de); -void mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp); int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); void mac_create_mount(struct ucred *cred, struct mount *mp); diff --git a/sys/sys/mac_policy.h b/sys/sys/mac_policy.h index 23ea56b..20988fa 100644 --- a/sys/sys/mac_policy.h +++ b/sys/sys/mac_policy.h @@ -147,9 +147,6 @@ struct mac_policy_ops { void (*mpo_create_devfs_symlink)(struct ucred *cred, struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel); - void (*mpo_create_devfs_vnode)(struct devfs_dirent *de, - struct label *direntlabel, struct vnode *vp, - struct label *vnodelabel); int (*mpo_create_vnode_extattr)(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *dvp, struct label *dlabel, |