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/kern_ktrace.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/kern_ktrace.c')
-rw-r--r-- | sys/kern/kern_ktrace.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 3b34fb0..d4b722a 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include "opt_ktrace.h" #include <sys/param.h> +#include <sys/capability.h> #include <sys/systm.h> #include <sys/fcntl.h> #include <sys/kernel.h> @@ -791,8 +792,14 @@ ktrcapfail(type, needed, held) return; kcf = &req->ktr_data.ktr_cap_fail; kcf->cap_type = type; - kcf->cap_needed = *needed; - kcf->cap_held = *held; + if (needed != NULL) + kcf->cap_needed = *needed; + else + cap_rights_init(&kcf->cap_needed); + if (held != NULL) + kcf->cap_held = *held; + else + cap_rights_init(&kcf->cap_held); ktr_enqueuerequest(td, req); ktrace_exit(td); } |