d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a comment on why the call to mac_vnode_relabel() might be in the wrong

Browse Source 
place -- in the VOP rather than vn_setexttr() -- and that it is for historic
reasons.  We might wish to relocate it in due course, but this way at least
we document the asymmetry.
This commit is contained in:
Robert Watson 2021-02-27 16:22:26 +00:00
parent 9d9fd8b79f
commit a92c6b24c0
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/security/mac/mac_vfs.c
View File

@ -1021,6 +1021,10 @@ vop_stdsetlabel_ea(struct vop_setlabel_args *ap)
if (error)
return (error);
/*
* XXXRW: See the comment below in vn_setlabel() as to why this might
* be the wrong place to call mac_vnode_relabel().
*/
mac_vnode_relabel(ap->a_cred, vp, intlabel);
return (0);
@ -1045,9 +1049,6 @@ vn_setlabel(struct vnode *vp, struct label *intlabel, struct ucred *cred)
* Multi-phase commit. First check the policies to confirm the
* change is OK. Then commit via the filesystem. Finally, update
* the actual vnode label.
*
* Question: maybe the filesystem should update the vnode at the end
* as part of VOP_SETLABEL()?
*/
error = mac_vnode_check_relabel(cred, vp, intlabel);
if (error)
@ -1068,6 +1069,14 @@ vn_setlabel(struct vnode *vp, struct label *intlabel, struct ucred *cred)
if (error)
return (error);
/*
* It would be more symmetric if mac_vnode_relabel() was called here
* rather than in VOP_SETLABEL(), but we don't for historical reasons.
* We should think about moving it so that the filesystem is
* responsible only for persistence in VOP_SETLABEL(), not the vnode
* label update itself.
*/
return (0);
}