svn commit: r267443 - stable/10/sys/kern

[Jilles Tjoelker]

Author: jilles
Date: Fri Jun 13 12:39:06 2014
New Revision: 267443
URL: http://svnweb.freebsd.org/changeset/base/267443

Log:
  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

Modified:
  stable/10/sys/kern/kern_ktrace.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_ktrace.c
==============================================================================
--- stable/10/sys/kern/kern_ktrace.c	Fri Jun 13 12:01:55 2014	(r267442)
+++ stable/10/sys/kern/kern_ktrace.c	Fri Jun 13 12:39:06 2014	(r267443)
@@ -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;