From 9c9a7e7ccd89f3f0a2a8dc11920215db554d7c10 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Thu, 30 Jun 2016 12:17:30 +0000 Subject: Tighten behavior of _rs_allocate on Windows. For Windows, we are simply using calloc, which has two annoyances: the memory has more permissions than needed by default, and it comes from the process heap, which looks like a memory leak since this memory is rightfully never freed. This switches _rs_alloc on Windows to use VirtualAlloc, which restricts the memory to READ|WRITE and keeps the memory out of the process heap. ok deraadt@ --- lib/libcrypto/arc4random/arc4random_win.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/libcrypto/arc4random/arc4random_win.h b/lib/libcrypto/arc4random/arc4random_win.h index 48a1bda1282..deec8a1efe8 100644 --- a/lib/libcrypto/arc4random/arc4random_win.h +++ b/lib/libcrypto/arc4random/arc4random_win.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arc4random_win.h,v 1.5 2015/01/15 06:57:18 deraadt Exp $ */ +/* $OpenBSD: arc4random_win.h,v 1.6 2016/06/30 12:17:29 bcook Exp $ */ /* * Copyright (c) 1996, David Mazieres @@ -52,13 +52,16 @@ _getentropy_fail(void) static inline int _rs_allocate(struct _rs **rsp, struct _rsx **rsxp) { - *rsp = calloc(1, sizeof(**rsp)); + *rsp = VirtualAlloc(NULL, sizeof(**rsp), + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); if (*rsp == NULL) return (-1); - *rsxp = calloc(1, sizeof(**rsxp)); + *rsxp = VirtualAlloc(NULL, sizeof(**rsxp), + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); if (*rsxp == NULL) { - free(*rsp); + VirtualFree(*rsp, 0, MEM_RELEASE); + *rsp = NULL; return (-1); } return (0); -- cgit v1.2.3