51c51
< __FBSDID("$FreeBSD: head/sys/vm/uma_core.c 222184 2011-05-22 17:46:16Z alc $");
---
> __FBSDID("$FreeBSD: head/sys/vm/uma_core.c 226313 2011-10-12 18:08:28Z glebius $");
61a62
> #include "opt_vm.h"
90a92,95
> #ifdef DEBUG_MEMGUARD
> #include <vm/memguard.h>
> #endif
>
1981c1986,2008
<
---
> #ifdef DEBUG_MEMGUARD
> if (memguard_cmp_zone(zone)) {
> item = memguard_alloc(zone->uz_size, flags);
> if (item != NULL) {
> /*
> * Avoid conflict with the use-after-free
> * protecting infrastructure from INVARIANTS.
> */
> if (zone->uz_init != NULL &&
> zone->uz_init != mtrash_init &&
> zone->uz_init(item, zone->uz_size, flags) != 0)
> return (NULL);
> if (zone->uz_ctor != NULL &&
> zone->uz_ctor != mtrash_ctor &&
> zone->uz_ctor(item, zone->uz_size, udata, flags) != 0) {
> zone->uz_fini(item, zone->uz_size);
> return (NULL);
> }
> return (item);
> }
> /* This is unfortunate but should not be fatal. */
> }
> #endif
2547c2574,2583
<
---
> #ifdef DEBUG_MEMGUARD
> if (is_memguard_addr(item)) {
> if (zone->uz_dtor != NULL && zone->uz_dtor != mtrash_dtor)
> zone->uz_dtor(item, zone->uz_size, udata);
> if (zone->uz_fini != NULL && zone->uz_fini != mtrash_fini)
> zone->uz_fini(item, zone->uz_size);
> memguard_free(item);
> return;
> }
> #endif