summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorotto <>2016-10-21 15:39:31 +0000
committerotto <>2016-10-21 15:39:31 +0000
commitd736aadd58d013968b1248f008b87f80771504cc (patch)
tree63c3bf96c43534fbfc4e683508549e08e520ebce /src
parentac9b32db52f36f6a9277aaea683123d2692d06e9 (diff)
downloadopenbsd-d736aadd58d013968b1248f008b87f80771504cc.tar.gz
openbsd-d736aadd58d013968b1248f008b87f80771504cc.tar.bz2
openbsd-d736aadd58d013968b1248f008b87f80771504cc.zip
fix some void * arithmetic by casting
Diffstat (limited to 'src')
-rw-r--r--src/lib/libc/stdlib/malloc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 2b51f61f38..09baaf962d 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: malloc.c,v 1.205 2016/10/21 06:55:09 otto Exp $ */ 1/* $OpenBSD: malloc.c,v 1.206 2016/10/21 15:39:31 otto Exp $ */
2/* 2/*
3 * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> 3 * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net>
4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> 4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -664,10 +664,10 @@ omalloc_poolinit(struct dir_info **dp)
664 if ((p = MMAP(DIR_INFO_RSZ + (MALLOC_PAGESIZE * 2))) == MAP_FAILED) 664 if ((p = MMAP(DIR_INFO_RSZ + (MALLOC_PAGESIZE * 2))) == MAP_FAILED)
665 wrterror(NULL, "malloc init mmap failed"); 665 wrterror(NULL, "malloc init mmap failed");
666 mprotect(p, MALLOC_PAGESIZE, PROT_NONE); 666 mprotect(p, MALLOC_PAGESIZE, PROT_NONE);
667 mprotect(p + MALLOC_PAGESIZE + DIR_INFO_RSZ, 667 mprotect((char *)p + MALLOC_PAGESIZE + DIR_INFO_RSZ,
668 MALLOC_PAGESIZE, PROT_NONE); 668 MALLOC_PAGESIZE, PROT_NONE);
669 d_avail = (DIR_INFO_RSZ - sizeof(*d)) >> MALLOC_MINSHIFT; 669 d_avail = (DIR_INFO_RSZ - sizeof(*d)) >> MALLOC_MINSHIFT;
670 d = (struct dir_info *)(p + MALLOC_PAGESIZE + 670 d = (struct dir_info *)((char *)p + MALLOC_PAGESIZE +
671 (arc4random_uniform(d_avail) << MALLOC_MINSHIFT)); 671 (arc4random_uniform(d_avail) << MALLOC_MINSHIFT));
672 672
673 rbytes_init(d); 673 rbytes_init(d);
@@ -727,7 +727,7 @@ omalloc_grow(struct dir_info *d)
727 } 727 }
728 /* avoid pages containing meta info to end up in cache */ 728 /* avoid pages containing meta info to end up in cache */
729 if (munmap(d->r, d->regions_total * sizeof(struct region_info))) 729 if (munmap(d->r, d->regions_total * sizeof(struct region_info)))
730 wrterror(d, "munmap %p", d->r); 730 wrterror(d, "munmap %p", (void *)d->r);
731 else 731 else
732 STATS_SUB(d->malloc_used, 732 STATS_SUB(d->malloc_used,
733 d->regions_total * sizeof(struct region_info)); 733 d->regions_total * sizeof(struct region_info));