diff options
| author | pjd <pjd@FreeBSD.org> | 2013-09-18 19:26:08 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2013-09-18 19:26:08 +0000 |
| commit | 667d7255be08a70cf5f13ef687602bb02959d087 (patch) | |
| tree | ed338077b5ccdb1b3587409afaec8ad90e20dbf6 /sys/kern/vfs_lookup.c | |
| parent | 9e8e4eba855f8c294ccd16a6001e02672ba4955b (diff) | |
| download | FreeBSD-src-667d7255be08a70cf5f13ef687602bb02959d087.zip FreeBSD-src-667d7255be08a70cf5f13ef687602bb02959d087.tar.gz | |
Fix panic in ktrcapfail() when no capability rights are passed.
While here, correct all consumers to pass NULL instead of 0 as we pass
capability rights as pointers now, not uint64_t.
Reported by: Daniel Peyrolon
Tested by: Daniel Peyrolon
Approved by: re (marius)
Diffstat (limited to 'sys/kern/vfs_lookup.c')
| -rw-r--r-- | sys/kern/vfs_lookup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index d4d0166..0be0463 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -178,7 +178,7 @@ namei(struct nameidata *ndp) if (ndp->ni_dirfd == AT_FDCWD) { #ifdef KTRACE if (KTRPOINT(td, KTR_CAPFAIL)) - ktrcapfail(CAPFAIL_LOOKUP, 0, 0); + ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL); #endif error = ECAPMODE; } @@ -284,7 +284,7 @@ namei(struct nameidata *ndp) if (ndp->ni_strictrelative != 0) { #ifdef KTRACE if (KTRPOINT(curthread, KTR_CAPFAIL)) - ktrcapfail(CAPFAIL_LOOKUP, 0, 0); + ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL); #endif return (ENOTCAPABLE); } @@ -640,7 +640,7 @@ dirloop: if (ndp->ni_strictrelative != 0) { #ifdef KTRACE if (KTRPOINT(curthread, KTR_CAPFAIL)) - ktrcapfail(CAPFAIL_LOOKUP, 0, 0); + ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL); #endif error = ENOTCAPABLE; goto bad; |
