KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

o Synchronize vaccess() capability access control checks with TrustedBSD

Browse Source 
tree.

Obtained from:	TrustedBSD Project
This commit is contained in:
Robert Watson
2000-09-06 12:18:24 +00:00
parent 93bcdfe270
commit 728783c27a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/kern/vfs_export.c
+4 -4
View File
@@ -3070,18 +3070,18 @@ vaccess(type, file_mode, file_uid, file_gid, acc_mode, cred, privused)
*/
cap_granted = 0;
if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) &&
!cap_check_xxx(cred, p, CAP_DAC_EXECUTE, PRISON_ROOT))
!cap_check_xxx(cred, NULL, CAP_DAC_EXECUTE, PRISON_ROOT))
cap_granted |= VEXEC;
if ((acc_mode & VREAD) && ((dac_granted & VREAD) == 0) &&
!cap_check_xxx(cred, p, CAP_DAC_READ_SEARCH, PRISON_ROOT))
!cap_check_xxx(cred, NULL, CAP_DAC_READ_SEARCH, PRISON_ROOT))
cap_granted |= VREAD;
if ((acc_mode & VWRITE) && ((dac_granted & VWRITE) == 0) &&
!cap_check_xxx(cred, p, CAP_DAC_WRITE, PRISON_ROOT))
!cap_check_xxx(cred, NULL, CAP_DAC_WRITE, PRISON_ROOT))
cap_granted |= VWRITE;
if ((acc_mode & (cap_granted | dac_granted)) == mode) {
if ((acc_mode & (cap_granted | dac_granted)) == acc_mode) {
/* XXX audit: privilege used */
if (privused != NULL)
*privused = 1;
sys/kern/vfs_subr.c
+4 -4
View File
@@ -3070,18 +3070,18 @@ vaccess(type, file_mode, file_uid, file_gid, acc_mode, cred, privused)
*/
cap_granted = 0;
if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) &&
!cap_check_xxx(cred, p, CAP_DAC_EXECUTE, PRISON_ROOT))
!cap_check_xxx(cred, NULL, CAP_DAC_EXECUTE, PRISON_ROOT))
cap_granted |= VEXEC;
if ((acc_mode & VREAD) && ((dac_granted & VREAD) == 0) &&
!cap_check_xxx(cred, p, CAP_DAC_READ_SEARCH, PRISON_ROOT))
!cap_check_xxx(cred, NULL, CAP_DAC_READ_SEARCH, PRISON_ROOT))
cap_granted |= VREAD;
if ((acc_mode & VWRITE) && ((dac_granted & VWRITE) == 0) &&
!cap_check_xxx(cred, p, CAP_DAC_WRITE, PRISON_ROOT))
!cap_check_xxx(cred, NULL, CAP_DAC_WRITE, PRISON_ROOT))
cap_granted |= VWRITE;
if ((acc_mode & (cap_granted | dac_granted)) == mode) {
if ((acc_mode & (cap_granted | dac_granted)) == acc_mode) {
/* XXX audit: privilege used */
if (privused != NULL)
*privused = 1;