From 5c582f335d85139b8f9481d5b921b9a433277f46 Mon Sep 17 00:00:00 2001 From: bcook <> Date: Thu, 30 Jun 2016 12:19:51 +0000 Subject: 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@ --- src/lib/libcrypto/arc4random/arc4random_aix.h | 3 ++- src/lib/libcrypto/arc4random/arc4random_freebsd.h | 3 ++- src/lib/libcrypto/arc4random/arc4random_hpux.h | 3 ++- src/lib/libcrypto/arc4random/arc4random_linux.h | 3 ++- src/lib/libcrypto/arc4random/arc4random_netbsd.h | 3 ++- src/lib/libcrypto/arc4random/arc4random_osx.h | 3 ++- src/lib/libcrypto/arc4random/arc4random_solaris.h | 3 ++- src/lib/libcrypto/crypto/arc4random_aix.h | 3 ++- src/lib/libcrypto/crypto/arc4random_freebsd.h | 3 ++- src/lib/libcrypto/crypto/arc4random_hpux.h | 3 ++- src/lib/libcrypto/crypto/arc4random_linux.h | 3 ++- src/lib/libcrypto/crypto/arc4random_netbsd.h | 3 ++- src/lib/libcrypto/crypto/arc4random_osx.h | 3 ++- src/lib/libcrypto/crypto/arc4random_solaris.h | 3 ++- 14 files changed, 28 insertions(+), 14 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libcrypto/arc4random/arc4random_aix.h b/src/lib/libcrypto/arc4random/arc4random_aix.h index e76c8cb598..3142a1f278 100644 --- a/src/lib/libcrypto/arc4random/arc4random_aix.h +++ b/src/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 @@ -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/src/lib/libcrypto/arc4random/arc4random_freebsd.h b/src/lib/libcrypto/arc4random/arc4random_freebsd.h index b54f400c54..3faa5e4d31 100644 --- a/src/lib/libcrypto/arc4random/arc4random_freebsd.h +++ b/src/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 @@ -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/src/lib/libcrypto/arc4random/arc4random_hpux.h b/src/lib/libcrypto/arc4random/arc4random_hpux.h index 5081d9722f..2a3fe8c611 100644 --- a/src/lib/libcrypto/arc4random/arc4random_hpux.h +++ b/src/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 @@ -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/src/lib/libcrypto/arc4random/arc4random_linux.h b/src/lib/libcrypto/arc4random/arc4random_linux.h index 303deb5786..879f966391 100644 --- a/src/lib/libcrypto/arc4random/arc4random_linux.h +++ b/src/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 @@ -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/src/lib/libcrypto/arc4random/arc4random_netbsd.h b/src/lib/libcrypto/arc4random/arc4random_netbsd.h index 7092baf77d..611997d54d 100644 --- a/src/lib/libcrypto/arc4random/arc4random_netbsd.h +++ b/src/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 @@ -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/src/lib/libcrypto/arc4random/arc4random_osx.h b/src/lib/libcrypto/arc4random/arc4random_osx.h index 19233ab58c..818ae6bbf4 100644 --- a/src/lib/libcrypto/arc4random/arc4random_osx.h +++ b/src/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 @@ -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/src/lib/libcrypto/arc4random/arc4random_solaris.h b/src/lib/libcrypto/arc4random/arc4random_solaris.h index e8a14afdeb..b1084cda08 100644 --- a/src/lib/libcrypto/arc4random/arc4random_solaris.h +++ b/src/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 @@ -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/src/lib/libcrypto/crypto/arc4random_aix.h b/src/lib/libcrypto/crypto/arc4random_aix.h index e76c8cb598..3142a1f278 100644 --- a/src/lib/libcrypto/crypto/arc4random_aix.h +++ b/src/lib/libcrypto/crypto/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 @@ -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/src/lib/libcrypto/crypto/arc4random_freebsd.h b/src/lib/libcrypto/crypto/arc4random_freebsd.h index b54f400c54..3faa5e4d31 100644 --- a/src/lib/libcrypto/crypto/arc4random_freebsd.h +++ b/src/lib/libcrypto/crypto/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 @@ -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/src/lib/libcrypto/crypto/arc4random_hpux.h b/src/lib/libcrypto/crypto/arc4random_hpux.h index 5081d9722f..2a3fe8c611 100644 --- a/src/lib/libcrypto/crypto/arc4random_hpux.h +++ b/src/lib/libcrypto/crypto/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 @@ -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/src/lib/libcrypto/crypto/arc4random_linux.h b/src/lib/libcrypto/crypto/arc4random_linux.h index 303deb5786..879f966391 100644 --- a/src/lib/libcrypto/crypto/arc4random_linux.h +++ b/src/lib/libcrypto/crypto/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 @@ -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/src/lib/libcrypto/crypto/arc4random_netbsd.h b/src/lib/libcrypto/crypto/arc4random_netbsd.h index 7092baf77d..611997d54d 100644 --- a/src/lib/libcrypto/crypto/arc4random_netbsd.h +++ b/src/lib/libcrypto/crypto/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 @@ -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/src/lib/libcrypto/crypto/arc4random_osx.h b/src/lib/libcrypto/crypto/arc4random_osx.h index 19233ab58c..818ae6bbf4 100644 --- a/src/lib/libcrypto/crypto/arc4random_osx.h +++ b/src/lib/libcrypto/crypto/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 @@ -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/src/lib/libcrypto/crypto/arc4random_solaris.h b/src/lib/libcrypto/crypto/arc4random_solaris.h index e8a14afdeb..b1084cda08 100644 --- a/src/lib/libcrypto/crypto/arc4random_solaris.h +++ b/src/lib/libcrypto/crypto/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 @@ -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); } -- cgit v1.2.3-55-g6feb