Date: Wed, 3 Jan 2018 23:57:41 +0000 (UTC) From: Jeff Roberson <jeff@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r327531 - user/jeff/numa/sys/kern Message-ID: <201801032357.w03NvfrU041537@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jeff Date: Wed Jan 3 23:57:41 2018 New Revision: 327531 URL: https://svnweb.freebsd.org/changeset/base/327531 Log: Fix memguard compile. Modified: user/jeff/numa/sys/kern/kern_malloc.c Modified: user/jeff/numa/sys/kern/kern_malloc.c ============================================================================== --- user/jeff/numa/sys/kern/kern_malloc.c Wed Jan 3 20:20:43 2018 (r327530) +++ user/jeff/numa/sys/kern/kern_malloc.c Wed Jan 3 23:57:41 2018 (r327531) @@ -492,12 +492,10 @@ malloc_dbg(caddr_t *vap, unsigned long *sizep, struct ("malloc: called with spinlock or critical section held")); #ifdef DEBUG_MEMGUARD - if (memguard_cmp_mtp(mtp, size)) { - va = memguard_alloc(size, flags); - if (va != NULL) { - *vap = va; + if (memguard_cmp_mtp(mtp, *sizep)) { + *vap = memguard_alloc(*sizep, flags); + if (*vap != NULL) return (EJUSTRETURN); - } /* This is unfortunate but should not be fatal. */ } #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801032357.w03NvfrU041537>