Module Name: src
Committed By: maxv
Date: Mon Sep 10 13:11:05 UTC 2018
Modified Files:
src/sys/kern: subr_pool.c
Log Message:
Correctly align the size+redzone for KASAN, on amd64 it happens to be
always 8byte-aligned but on other architectures it may not be.
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/kern/subr_pool.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.226 src/sys/kern/subr_pool.c:1.227
--- src/sys/kern/subr_pool.c:1.226 Sat Aug 25 05:56:24 2018
+++ src/sys/kern/subr_pool.c Mon Sep 10 13:11:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.226 2018/08/25 05:56:24 maxv Exp $ */
+/* $NetBSD: subr_pool.c,v 1.227 2018/09/10 13:11:05 maxv Exp $ */
/*-
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.226 2018/08/25 05:56:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.227 2018/09/10 13:11:05 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -2749,8 +2749,17 @@ pool_pattern_generate(const void *p)
static void
pool_redzone_init(struct pool *pp, size_t requested_size)
{
+ size_t redzsz;
size_t nsz;
+#ifdef KASAN
+ redzsz = requested_size;
+ kasan_add_redzone(&redzsz);
+ redzsz -= requested_size;
+#else
+ redzsz = POOL_REDZONE_SIZE;
+#endif
+
if (pp->pr_roflags & PR_NOTOUCH) {
pp->pr_reqsize = 0;
pp->pr_redzone = false;
@@ -2761,7 +2770,7 @@ pool_redzone_init(struct pool *pp, size_
* We may have extended the requested size earlier; check if
* there's naturally space in the padding for a red zone.
*/
- if (pp->pr_size - requested_size >= POOL_REDZONE_SIZE) {
+ if (pp->pr_size - requested_size >= redzsz) {
pp->pr_reqsize = requested_size;
pp->pr_redzone = true;
return;
@@ -2771,7 +2780,7 @@ pool_redzone_init(struct pool *pp, size_
* No space in the natural padding; check if we can extend a
* bit the size of the pool.
*/
- nsz = roundup(pp->pr_size + POOL_REDZONE_SIZE, pp->pr_align);
+ nsz = roundup(pp->pr_size + redzsz, pp->pr_align);
if (nsz <= pp->pr_alloc->pa_pagesz) {
/* Ok, we can */
pp->pr_size = nsz;
@@ -2791,7 +2800,9 @@ pool_redzone_fill(struct pool *pp, void
if (!pp->pr_redzone)
return;
#ifdef KASAN
- kasan_alloc(p, pp->pr_reqsize, pp->pr_reqsize + POOL_REDZONE_SIZE);
+ size_t size_with_redzone = pp->pr_reqsize;
+ kasan_add_redzone(&size_with_redzone);
+ kasan_alloc(p, pp->pr_reqsize, size_with_redzone);
#else
uint8_t *cp, pat;
const uint8_t *ep;
@@ -2820,7 +2831,9 @@ pool_redzone_check(struct pool *pp, void
if (!pp->pr_redzone)
return;
#ifdef KASAN
- kasan_free(p, pp->pr_reqsize + POOL_REDZONE_SIZE);
+ size_t size_with_redzone = pp->pr_reqsize;
+ kasan_add_redzone(&size_with_redzone);
+ kasan_free(p, size_with_redzone);
#else
uint8_t *cp, pat, expected;
const uint8_t *ep;
