diff options
| author | Brent Cook <bcook@cvs.openbsd.org> | 2016-06-30 12:19:52 +0000 |
|---|---|---|
| committer | Brent Cook <bcook@cvs.openbsd.org> | 2016-06-30 12:19:52 +0000 |
| commit | 69a1217464e4c3cdba2bf74aef7b9e537c5311e2 (patch) | |
| tree | ebbef462f384c07b8ade45023c37cf313f391862 /lib | |
| parent | 9c9a7e7ccd89f3f0a2a8dc11920215db554d7c10 (diff) | |
Tighten behavior of _rs_allocate failure for portable arc4random implementations.
In the event of a failure in _rs_allocate for rsx, we still have a reference to
freed memory for rs on return. Not a huge deal since we subsequently abort in
_rs_init, but it looks strange on its own.
ok deraadt@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/arc4random/arc4random_aix.h | 3 | ||||
| -rw-r--r-- | lib/libcrypto/arc4random/arc4random_freebsd.h | 3 | ||||
| -rw-r--r-- | lib/libcrypto/arc4random/arc4random_hpux.h | 3 | ||||
| -rw-r--r-- | lib/libcrypto/arc4random/arc4random_linux.h | 3 | ||||
| -rw-r--r-- | lib/libcrypto/arc4random/arc4random_netbsd.h | 3 | ||||
| -rw-r--r-- | lib/libcrypto/arc4random/arc4random_osx.h | 3 | ||||
| -rw-r--r-- | lib/libcrypto/arc4random/arc4random_solaris.h | 3 |
7 files changed, 14 insertions, 7 deletions
diff --git a/lib/libcrypto/arc4random/arc4random_aix.h b/lib/libcrypto/arc4random/arc4random_aix.h index e76c8cb5983..3142a1f2789 100644 --- a/lib/libcrypto/arc4random/arc4random_aix.h +++ b/lib/libcrypto/arc4random/arc4random_aix.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arc4random_aix.h,v 1.1 2015/03/30 11:29:48 bcook Exp $ */ +/* $OpenBSD: arc4random_aix.h,v 1.2 2016/06/30 12:19:51 bcook Exp $ */ /* * Copyright (c) 1996, David Mazieres <dm@uun.org> @@ -72,6 +72,7 @@ _rs_allocate(struct _rs **rsp, struct _rsx **rsxp) if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { munmap(*rsp, sizeof(**rsp)); + *rsp = NULL; return (-1); } diff --git a/lib/libcrypto/arc4random/arc4random_freebsd.h b/lib/libcrypto/arc4random/arc4random_freebsd.h index b54f400c545..3faa5e4d317 100644 --- a/lib/libcrypto/arc4random/arc4random_freebsd.h +++ b/lib/libcrypto/arc4random/arc4random_freebsd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arc4random_freebsd.h,v 1.3 2015/09/11 11:52:55 deraadt Exp $ */ +/* $OpenBSD: arc4random_freebsd.h,v 1.4 2016/06/30 12:19:51 bcook Exp $ */ /* * Copyright (c) 1996, David Mazieres <dm@uun.org> @@ -78,6 +78,7 @@ _rs_allocate(struct _rs **rsp, struct _rsx **rsxp) if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { munmap(*rsp, sizeof(**rsp)); + *rsp = NULL; return (-1); } diff --git a/lib/libcrypto/arc4random/arc4random_hpux.h b/lib/libcrypto/arc4random/arc4random_hpux.h index 5081d9722f2..2a3fe8c6114 100644 --- a/lib/libcrypto/arc4random/arc4random_hpux.h +++ b/lib/libcrypto/arc4random/arc4random_hpux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arc4random_hpux.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $ */ +/* $OpenBSD: arc4random_hpux.h,v 1.3 2016/06/30 12:19:51 bcook Exp $ */ /* * Copyright (c) 1996, David Mazieres <dm@uun.org> @@ -72,6 +72,7 @@ _rs_allocate(struct _rs **rsp, struct _rsx **rsxp) if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { munmap(*rsp, sizeof(**rsp)); + *rsp = NULL; return (-1); } diff --git a/lib/libcrypto/arc4random/arc4random_linux.h b/lib/libcrypto/arc4random/arc4random_linux.h index 303deb57861..879f9663914 100644 --- a/lib/libcrypto/arc4random/arc4random_linux.h +++ b/lib/libcrypto/arc4random/arc4random_linux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arc4random_linux.h,v 1.10 2016/01/04 02:04:56 bcook Exp $ */ +/* $OpenBSD: arc4random_linux.h,v 1.11 2016/06/30 12:19:51 bcook Exp $ */ /* * Copyright (c) 1996, David Mazieres <dm@uun.org> @@ -79,6 +79,7 @@ _rs_allocate(struct _rs **rsp, struct _rsx **rsxp) if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { munmap(*rsp, sizeof(**rsp)); + *rsp = NULL; return (-1); } diff --git a/lib/libcrypto/arc4random/arc4random_netbsd.h b/lib/libcrypto/arc4random/arc4random_netbsd.h index 7092baf77dc..611997d54d6 100644 --- a/lib/libcrypto/arc4random/arc4random_netbsd.h +++ b/lib/libcrypto/arc4random/arc4random_netbsd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arc4random_netbsd.h,v 1.2 2015/09/11 11:52:55 deraadt Exp $ */ +/* $OpenBSD: arc4random_netbsd.h,v 1.3 2016/06/30 12:19:51 bcook Exp $ */ /* * Copyright (c) 1996, David Mazieres <dm@uun.org> @@ -78,6 +78,7 @@ _rs_allocate(struct _rs **rsp, struct _rsx **rsxp) if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { munmap(*rsp, sizeof(**rsp)); + *rsp = NULL; return (-1); } diff --git a/lib/libcrypto/arc4random/arc4random_osx.h b/lib/libcrypto/arc4random/arc4random_osx.h index 19233ab58c2..818ae6bbf48 100644 --- a/lib/libcrypto/arc4random/arc4random_osx.h +++ b/lib/libcrypto/arc4random/arc4random_osx.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arc4random_osx.h,v 1.10 2015/09/11 11:52:55 deraadt Exp $ */ +/* $OpenBSD: arc4random_osx.h,v 1.11 2016/06/30 12:19:51 bcook Exp $ */ /* * Copyright (c) 1996, David Mazieres <dm@uun.org> @@ -72,6 +72,7 @@ _rs_allocate(struct _rs **rsp, struct _rsx **rsxp) if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { munmap(*rsp, sizeof(**rsp)); + *rsp = NULL; return (-1); } diff --git a/lib/libcrypto/arc4random/arc4random_solaris.h b/lib/libcrypto/arc4random/arc4random_solaris.h index e8a14afdebf..b1084cda087 100644 --- a/lib/libcrypto/arc4random/arc4random_solaris.h +++ b/lib/libcrypto/arc4random/arc4random_solaris.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arc4random_solaris.h,v 1.9 2015/01/15 06:57:18 deraadt Exp $ */ +/* $OpenBSD: arc4random_solaris.h,v 1.10 2016/06/30 12:19:51 bcook Exp $ */ /* * Copyright (c) 1996, David Mazieres <dm@uun.org> @@ -72,6 +72,7 @@ _rs_allocate(struct _rs **rsp, struct _rsx **rsxp) if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { munmap(*rsp, sizeof(**rsp)); + *rsp = NULL; return (-1); } |