summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_ktrace.c
diff options
context:
space:
mode:
authorjilles <jilles@FreeBSD.org>2014-06-13 12:39:06 +0000
committerjilles <jilles@FreeBSD.org>2014-06-13 12:39:06 +0000
commite18f36ddebf53a264169b3a6f51974f41f7aa3ac (patch)
tree92f66ce920e467be80b6ef1669f1ba16ecca2408 /sys/kern/kern_ktrace.c
parent05d5b8b9d87a8dedef99dbd54443c65b796f59ec (diff)
downloadFreeBSD-src-e18f36ddebf53a264169b3a6f51974f41f7aa3ac.zip
FreeBSD-src-e18f36ddebf53a264169b3a6f51974f41f7aa3ac.tar.gz
MFC r267162: ktrace: Use designated initializers for the data_lengths array.
In the .o file, this only changes some line numbers (stable/10 amd64) because element 0 is no longer explicitly initialized. This should make bugs like FreeBSD-SA-14:12.ktrace less likely. Discussed with: des
Diffstat (limited to 'sys/kern/kern_ktrace.c')
-rw-r--r--sys/kern/kern_ktrace.c29
1 files changed, 14 insertions, 15 deletions
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index d4b722a..fac0ec2 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -109,21 +109,20 @@ struct ktr_request {
};
static int data_lengths[] = {
- 0, /* none */
- offsetof(struct ktr_syscall, ktr_args), /* KTR_SYSCALL */
- sizeof(struct ktr_sysret), /* KTR_SYSRET */
- 0, /* KTR_NAMEI */
- sizeof(struct ktr_genio), /* KTR_GENIO */
- sizeof(struct ktr_psig), /* KTR_PSIG */
- sizeof(struct ktr_csw), /* KTR_CSW */
- 0, /* KTR_USER */
- 0, /* KTR_STRUCT */
- 0, /* KTR_SYSCTL */
- sizeof(struct ktr_proc_ctor), /* KTR_PROCCTOR */
- 0, /* KTR_PROCDTOR */
- sizeof(struct ktr_cap_fail), /* KTR_CAPFAIL */
- sizeof(struct ktr_fault), /* KTR_FAULT */
- sizeof(struct ktr_faultend), /* KTR_FAULTEND */
+ [KTR_SYSCALL] = offsetof(struct ktr_syscall, ktr_args),
+ [KTR_SYSRET] = sizeof(struct ktr_sysret),
+ [KTR_NAMEI] = 0,
+ [KTR_GENIO] = sizeof(struct ktr_genio),
+ [KTR_PSIG] = sizeof(struct ktr_psig),
+ [KTR_CSW] = sizeof(struct ktr_csw),
+ [KTR_USER] = 0,
+ [KTR_STRUCT] = 0,
+ [KTR_SYSCTL] = 0,
+ [KTR_PROCCTOR] = sizeof(struct ktr_proc_ctor),
+ [KTR_PROCDTOR] = 0,
+ [KTR_CAPFAIL] = sizeof(struct ktr_cap_fail),
+ [KTR_FAULT] = sizeof(struct ktr_fault),
+ [KTR_FAULTEND] = sizeof(struct ktr_faultend),
};
static STAILQ_HEAD(, ktr_request) ktr_free;
OpenPOWER on IntegriCloud