diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2008-06-02 15:42:22 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2008-06-02 15:42:22 +0000 |
| commit | 515a82b7166b924e809b94458934945f348669c8 (patch) | |
| tree | eb016b031912a379750917ad895f9db3550ef479 | |
| parent | 654b5146c9147b056d9d4d3f93a4b5b309ef9a63 (diff) | |
Round up the numbers of keys to allocate, so that the last 128 page area
gets correctly encrypted if the swap isn't a multiple of 128 pages.
ok deraadt@
| -rw-r--r-- | sys/uvm/uvm_swap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c index 06d5473f2b4..93af822be07 100644 --- a/sys/uvm/uvm_swap.c +++ b/sys/uvm/uvm_swap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_swap.c,v 1.78 2008/04/12 20:37:36 miod Exp $ */ +/* $OpenBSD: uvm_swap.c,v 1.79 2008/06/02 15:42:21 miod Exp $ */ /* $NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $ */ /* @@ -142,6 +142,7 @@ struct swapdev { #ifdef UVM_SWAP_ENCRYPT #define SWD_KEY_SHIFT 7 /* One key per 0.5 MByte */ #define SWD_KEY(x,y) &((x)->swd_keys[((y) - (x)->swd_drumoffset) >> SWD_KEY_SHIFT]) +#define SWD_KEY_SIZE(x) (((x) + (1 << SWD_KEY_SHIFT) - 1) >> SWD_KEY_SHIFT) #define SWD_DCRYPT_SHIFT 5 #define SWD_DCRYPT_BITS 32 @@ -349,7 +350,7 @@ uvm_swap_initcrypt(struct swapdev *sdp, int npages) */ sdp->swd_decrypt = malloc(SWD_DCRYPT_SIZE(npages), M_VMSWAP, M_WAITOK|M_ZERO); - sdp->swd_keys = malloc((npages >> SWD_KEY_SHIFT) * sizeof(struct swap_key), + sdp->swd_keys = malloc(SWD_KEY_SIZE(npages) * sizeof(struct swap_key), M_VMSWAP, M_WAITOK|M_ZERO); } @@ -457,7 +458,7 @@ uvm_swap_finicrypt_all(void) continue; nkeys = dbtob((uint64_t)sdp->swd_nblks) >> PAGE_SHIFT; - key = sdp->swd_keys + ((nkeys >> SWD_KEY_SHIFT) - 1); + key = sdp->swd_keys + (SWD_KEY_SIZE(nkeys) - 1); do { if (key->refcount != 0) swap_key_delete(key); |