Date: Sat, 20 Jul 2002 12:53:54 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 14543 for review Message-ID: <200207201953.g6KJrs84000798@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14543 Change 14543 by rwatson@rwatson_curry on 2002/07/20 12:53:45 Rename mac_cred_check_readlink() to mac_cred_check_readlink_vnode() for consistency with other checks (and forthcoming readdir check). Eventually, maybe we should drop the _vnode from all checks except the ones that have namespace conflicts with other objects (such as pipe/socket/.. operations). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#179 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#14 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#52 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#55 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#43 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#37 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#39 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#7 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#113 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#76 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#179 (text+ko) ==== @@ -555,7 +555,7 @@ mpe->mpe_function; break; case MAC_CRED_CHECK_READLINK: - mpc->mpc_ops->mpo_cred_check_readlink = + mpc->mpc_ops->mpo_cred_check_readlink_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_RENAME_FROM_VNODE: @@ -1683,11 +1683,11 @@ } int -mac_cred_check_readlink(struct ucred *cred, struct vnode *vp) +mac_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_readlink"); + ASSERT_VOP_LOCKED(vp, "mac_cred_check_readlink_vnode"); if (!mac_enforce_fs) return (0); @@ -1696,7 +1696,7 @@ if (error) return (error); - MAC_CHECK(cred_check_readlink, cred, vp, &vp->v_label); + MAC_CHECK(cred_check_readlink_vnode, cred, vp, &vp->v_label); return (error); } ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#14 (text+ko) ==== @@ -317,7 +317,8 @@ break; } #ifdef MAC - error = mac_cred_check_readlink(td->td_ucred, ndp->ni_vp); + error = mac_cred_check_readlink_vnode(td->td_ucred, + ndp->ni_vp); if (error) break; #endif ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#52 (text+ko) ==== @@ -2849,7 +2849,7 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vp = nd.ni_vp; #ifdef MAC - error = mac_cred_check_readlink(td->td_ucred, vp); + error = mac_cred_check_readlink_vnode(td->td_ucred, vp); if (error) { vput(vp); return (error); ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#55 (text+ko) ==== @@ -1494,7 +1494,7 @@ } static int -mac_biba_cred_check_readlink(struct ucred *cred, struct vnode *vp, +mac_biba_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *label) { struct mac_biba *subj, *obj; @@ -1955,8 +1955,8 @@ (macop_t)mac_biba_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_biba_cred_check_open_vnode }, - { MAC_CRED_CHECK_READLINK, - (macop_t)mac_biba_cred_check_readlink }, + { MAC_CRED_CHECK_READLINK_VNODE, + (macop_t)mac_biba_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_biba_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#43 (text+ko) ==== @@ -1437,7 +1437,7 @@ } static int -mac_mls_cred_check_readlink(struct ucred *cred, struct vnode *vp, +mac_mls_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { struct mac_mls *subj, *obj; @@ -1895,8 +1895,8 @@ (macop_t)mac_mls_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_mls_cred_check_open_vnode }, - { MAC_CRED_CHECK_READLINK, - (macop_t)mac_mls_cred_check_readlink }, + { MAC_CRED_CHECK_READLINK_VNODE, + (macop_t)mac_mls_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_mls_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#37 (text+ko) ==== @@ -684,7 +684,7 @@ } static int -mac_none_cred_check_readlink(struct ucred *cred, struct vnode *vp, +mac_none_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { @@ -978,8 +978,8 @@ (macop_t)mac_none_cred_check_listen_socket }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_none_cred_check_open_vnode }, - { MAC_CRED_CHECK_READLINK, - (macop_t)mac_none_cred_check_readlink }, + { MAC_CRED_CHECK_READLINK_VNODE, + (macop_t)mac_none_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_none_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#39 (text+ko) ==== @@ -1052,7 +1052,7 @@ } static int -mac_te_cred_check_readlink(struct ucred *cred, struct vnode *vp, +mac_te_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { struct mac_te *subj, *obj; @@ -1617,8 +1617,8 @@ { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_te_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_te_cred_check_open_vnode }, - { MAC_CRED_CHECK_READLINK, - (macop_t)mac_te_cred_check_readlink }, + { MAC_CRED_CHECK_READLINK_VNODE, + (macop_t)mac_te_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_te_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#7 (text+ko) ==== @@ -877,7 +877,7 @@ } static int -mac_test_cred_check_readlink(struct ucred *cred, struct vnode *vp, +mac_test_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { @@ -1169,8 +1169,8 @@ (macop_t)mac_test_cred_check_listen_socket }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_test_cred_check_open_vnode }, - { MAC_CRED_CHECK_READLINK, - (macop_t)mac_test_cred_check_readlink }, + { MAC_CRED_CHECK_READLINK_VNODE, + (macop_t)mac_test_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_test_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#113 (text+ko) ==== @@ -282,7 +282,7 @@ struct vnode *vp, int samedir); int mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode); -int mac_cred_check_readlink(struct ucred *cred, struct vnode *vp); +int mac_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp); int mac_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp); int mac_cred_check_statfs(struct ucred *cred, struct mount *mp); int mac_getsockopt_label_get(struct ucred *cred, struct socket *so, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#76 (text+ko) ==== @@ -274,7 +274,7 @@ int (*mpo_cred_check_open_vnode)(struct ucred *cred, struct vnode *vp, struct label *label, mode_t acc_mode); - int (*mpo_cred_check_readlink)(struct ucred *cred, + int (*mpo_cred_check_readlink_vnode)(struct ucred *cred, struct vnode *vp, struct label *label); int (*mpo_cred_check_rename_from_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, @@ -405,7 +405,7 @@ MAC_CRED_CHECK_GETEXTATTR_VNODE, MAC_CRED_CHECK_LISTEN_SOCKET, MAC_CRED_CHECK_OPEN_VNODE, - MAC_CRED_CHECK_READLINK, + MAC_CRED_CHECK_READLINK_VNODE, MAC_CRED_CHECK_RENAME_FROM_VNODE, MAC_CRED_CHECK_RENAME_TO_VNODE, MAC_CRED_CHECK_REVOKE_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207201953.g6KJrs84000798>