From 3a33f3e2826056fd6d9517d08bcd3a49d51af00f Mon Sep 17 00:00:00 2001 From: avg Date: Mon, 4 Feb 2013 21:50:55 +0000 Subject: ktr: copy content from the early static buffer if KTR_ENTRIES != KTR_BOOT_ENTRIES Reported by: glebius, jhb Pointyhat to: avg MFC after: 14 days X-MFC with: r246282 --- sys/kern/kern_ktr.c | 1 + 1 file changed, 1 insertion(+) (limited to 'sys/kern/kern_ktr.c') diff --git a/sys/kern/kern_ktr.c b/sys/kern/kern_ktr.c index 5b9d7aa..68d55fe 100644 --- a/sys/kern/kern_ktr.c +++ b/sys/kern/kern_ktr.c @@ -213,6 +213,7 @@ ktr_entries_initializer(void *dummy __unused) ktr_mask = 0; ktr_buf = malloc(sizeof(*ktr_buf) * KTR_ENTRIES, M_KTR, M_WAITOK | M_ZERO); + memcpy(ktr_buf, ktr_buf_init, sizeof(ktr_buf_init)); ktr_entries = KTR_ENTRIES; ktr_mask = mask; } -- cgit v1.1 From cfd3c02e72a8574bd02f57cd649cc2a4138d83ef Mon Sep 17 00:00:00 2001 From: avg Date: Mon, 4 Feb 2013 21:58:57 +0000 Subject: ktr: prevent possible footshooting with KTR_ENTRIES and KTR_BOOT_ENTRIES Suggested by: adrian MFC after: 14 days X-MFC with: r246282 --- sys/kern/kern_ktr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/kern/kern_ktr.c') diff --git a/sys/kern/kern_ktr.c b/sys/kern/kern_ktr.c index 68d55fe..a11c76c 100644 --- a/sys/kern/kern_ktr.c +++ b/sys/kern/kern_ktr.c @@ -198,7 +198,7 @@ SYSCTL_PROC(_debug_ktr, OID_AUTO, mask, CTLTYPE_UINT|CTLFLAG_RW, 0, 0, sysctl_debug_ktr_mask, "IU", "Bitmask of KTR event classes for which logging is enabled"); -#if KTR_ENTRIES != KTR_BOOT_ENTRIES +#if KTR_ENTRIES > KTR_BOOT_ENTRIES /* * A simplified version of sysctl_debug_ktr_entries. * No need to care about SMP, scheduling, etc. -- cgit v1.1