diff options
| author |   mlarkin <mlarkin@openbsd.org> | 2014-12-22 22:22:35 +0000 |
|---|---|---|
| committer | mlarkin <mlarkin@openbsd.org> | 2014-12-22 22:22:35 +0000 |
| commit | d06b9c1e28c55db846ed12bcaf60bb8ab00a3399 (patch) | |
| tree | 475ef4b7baf43a2cb735bbea0562187e6ede2058 /sys/kern/subr_hibernate.c | |
| parent | Link -static -pie executables with rcrt0.o instead of crt0.o such that they (diff) | |
| download | wireguard-openbsd-d06b9c1e28c55db846ed12bcaf60bb8ab00a3399.tar.xz wireguard-openbsd-d06b9c1e28c55db846ed12bcaf60bb8ab00a3399.zip | |
fix an error in piglet allocation when requesting an alignment < PAGE_SIZE
(which we never did, but it was a bug nonetheless).
ok kettenis, deraadt
Diffstat (limited to 'sys/kern/subr_hibernate.c')
| -rw-r--r-- | sys/kern/subr_hibernate.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/subr_hibernate.c b/sys/kern/subr_hibernate.c index e689acad7d8..114da7c1430 100644 --- a/sys/kern/subr_hibernate.c +++ b/sys/kern/subr_hibernate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_hibernate.c,v 1.110 2014/12/17 19:42:15 tedu Exp $ */ +/* $OpenBSD: subr_hibernate.c,v 1.111 2014/12/22 22:22:35 mlarkin Exp $ */ /* * Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl> @@ -468,7 +468,8 @@ uvm_pmr_alloc_piglet(vaddr_t *va, paddr_t *pa, vsize_t sz, paddr_t align) * pmemrange uses internally. */ if (align < PAGE_SIZE) - align = PAGE_SIZE; + kp_piglet.kp_align = PAGE_SIZE; + sz = round_page(sz); *va = (vaddr_t)km_alloc(sz, &kv_any, &kp_piglet, &kd_nowait); |