PERFORCE change 20983 for review
Robert Watson
rwatson at freebsd.org
Tue Nov 12 03:43:59 GMT 2002
http://perforce.freebsd.org/chv.cgi?CH=20983
Change 20983 by rwatson at rwatson_tislabs on 2002/11/11 19:43:58
GC mac_create_devfs_vnode and mpo_create_devfs_vnode, they're
no longer used. Migrate the comment in SEBSD to the new
associate call, since that's where it applies.
Affected files ...
.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#357 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#184 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#37 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#147 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#106 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#82 edit
.. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#59 edit
.. //depot/projects/trustedbsd/mac/sys/sys/mac.h#215 edit
.. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#169 edit
Differences ...
==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#357 (text+ko) ====
@@ -2740,13 +2740,6 @@
}
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)
{
==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#184 (text+ko) ====
@@ -844,17 +844,6 @@
}
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 @@
.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,
==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#37 (text+ko) ====
@@ -980,17 +980,6 @@
}
static void
-mac_lomac_create_devfs_vnode(struct devfs_dirent *devfs_dirent,
- struct label *direntlabel, struct vnode *vp, struct label *vnodelabel)
-{
- struct mac_lomac *source, *dest;
-
- source = SLOT(direntlabel);
- dest = SLOT(vnodelabel);
- mac_lomac_copy_single(source, dest);
-}
-
-static void
mac_lomac_create_mount(struct ucred *cred, struct mount *mp,
struct label *mntlabel, struct label *fslabel)
{
@@ -2615,7 +2604,6 @@
.mpo_create_devfs_device = mac_lomac_create_devfs_device,
.mpo_create_devfs_directory = mac_lomac_create_devfs_directory,
.mpo_create_devfs_symlink = mac_lomac_create_devfs_symlink,
- .mpo_create_devfs_vnode = mac_lomac_create_devfs_vnode,
.mpo_create_mount = mac_lomac_create_mount,
.mpo_create_root_mount = mac_lomac_create_root_mount,
.mpo_relabel_vnode = mac_lomac_relabel_vnode,
==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#147 (text+ko) ====
@@ -813,17 +813,6 @@
}
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)
{
@@ -2424,7 +2413,6 @@
.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,
==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#106 (text+ko) ====
@@ -189,13 +189,6 @@
}
-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,
@@ -979,7 +972,6 @@
.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,
==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#82 (text+ko) ====
@@ -567,13 +567,6 @@
}
-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,
@@ -1377,7 +1370,6 @@
.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,
==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#59 (text+ko) ====
@@ -448,10 +448,12 @@
}
static void
-sebsd_create_devfs_vnode(struct devfs_dirent *devfs_dirent,
- struct label *direntlabel, struct vnode *vp,
- struct label *vnodelabel)
+sebsd_associate_vnode_devfs(struct mount *mp, struct label *fslabel,
+ struct devfs_dirent *de, struct label *delabel,
+ struct vnode *vp, struct label *vlabel)
{
+
+ /* TBD, default to SECINITSID_UNLABELED. */
/*
* This is a no-op for now, but when devfs_dirents do contain
* labels, they should be copied to the vp here as per how
@@ -461,16 +463,6 @@
*/
}
-
-static void
-sebsd_associate_vnode_devfs(struct mount *mp, struct label *fslabel,
- struct devfs_dirent *de, struct label *delabel,
- struct vnode *vp, struct label *vlabel)
-{
-
- /* TBD, default to SECINITSID_UNLABELED. */
-}
-
static int
sebsd_associate_vnode_extattr(struct mount *mp, struct label *fslabel,
struct vnode *vp, struct label *vlabel)
@@ -1266,7 +1258,6 @@
.mpo_execve_will_transition = sebsd_execve_will_transition,
.mpo_relabel_cred = sebsd_relabel_cred,
.mpo_relabel_vnode = sebsd_relabel_vnode,
- .mpo_create_devfs_vnode = sebsd_create_devfs_vnode,
.mpo_setlabel_vnode_extattr = sebsd_setlabel_vnode_extattr,
.mpo_syscall = sebsd_syscall,
==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#215 (text+ko) ====
@@ -176,7 +176,6 @@
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);
==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#169 (text+ko) ====
@@ -149,9 +149,6 @@
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,
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list