Author: andrew
Date: Tue May 28 10:55:59 2019
New Revision: 348323
URL: https://svnweb.freebsd.org/changeset/base/348323
Log:
The alignment is passed into contigmalloc_domainset in the 7th argument.
KUBSAN was complaining the pointer contigmalloc_domainset returned was
misaligned. Fix this by using the correct argument to find the alignment
in the function signature.
Reported by: KUBSAN
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Modified:
head/sys/sys/malloc.h
Modified: head/sys/sys/malloc.h
==============================================================================
--- head/sys/sys/malloc.h Tue May 28 09:12:15 2019 (r348322)
+++ head/sys/sys/malloc.h Tue May 28 10:55:59 2019 (r348323)
@@ -177,7 +177,7 @@ void *contigmalloc(unsigned long size, struct
malloc_t
void *contigmalloc_domainset(unsigned long size, struct malloc_type *type,
struct domainset *ds, int flags, vm_paddr_t low, vm_paddr_t high,
unsigned long alignment, vm_paddr_t boundary)
- __malloc_like __result_use_check __alloc_size(1) __alloc_align(6);
+ __malloc_like __result_use_check __alloc_size(1) __alloc_align(7);
void free(void *addr, struct malloc_type *type);
void free_domain(void *addr, struct malloc_type *type);
void *malloc(size_t size, struct malloc_type *type, int flags) __malloc_like
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
