Page MenuHomeFreeBSD
Files F175786350

D60629.id189536.diff
No OneTemporary
Actions

D60629.id189536.diff
View Options

diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -666,7 +666,9 @@
va = uma_zalloc_arg(zone, zone, flags);
if (va != NULL)
size = zone->uz_size;
- malloc_type_zone_allocated(mtp, va == NULL ? 0 : size, indx);
+ if (!is_memguard_addr(va))
+ malloc_type_zone_allocated(mtp,
+ va == NULL ? 0 : size, indx);
}
KASSERT(va != NULL || (flags & M_WAITOK) == 0,
("malloc(M_WAITOK) returned NULL"));
@@ -741,7 +743,9 @@
} while (va == NULL &&
vm_domainset_iter_policy(&di, &domain) == 0);
}
- malloc_type_zone_allocated(mtp, va == NULL ? 0 : size, indx);
+ if (!is_memguard_addr(va))
+ malloc_type_zone_allocated(mtp,
+ va == NULL ? 0 : size, indx);
}
KASSERT(va != NULL || (flags & M_WAITOK) == 0,
("malloc(M_WAITOK) returned NULL"));

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 14, 8:48 AM (7 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40710121
Default Alt Text
D60629.id189536.diff (864 B)

Event Timeline