diff options
| author | rwatson <rwatson@FreeBSD.org> | 2000-09-06 12:18:24 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2000-09-06 12:18:24 +0000 |
| commit | 6eea0a716572d0e01bb4fa4cb014143767b98de1 (patch) | |
| tree | 0817ea9698d3dda6e1c623f59e854e4d853a203e /sys/kern/vfs_subr.c | |
| parent | c9cb5c289d5aaaea9a1cb017bd8b2f24c3483f8e (diff) | |
| download | FreeBSD-src-6eea0a716572d0e01bb4fa4cb014143767b98de1.zip FreeBSD-src-6eea0a716572d0e01bb4fa4cb014143767b98de1.tar.gz | |
o Synchronize vaccess() capability access control checks with TrustedBSD
tree.
Obtained from: TrustedBSD Project
Diffstat (limited to 'sys/kern/vfs_subr.c')
| -rw-r--r-- | sys/kern/vfs_subr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 16a4785..3e4b17f 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -3070,18 +3070,18 @@ privcheck: */ 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; |
