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@

diff --git a/lib/libcrypto/arc4random/arc4random_aix.h b/lib/libcrypto/arc4random/arc4random_aix.h
index e76c8cb..3142a1f 100644 (file)
--- 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 b54f400..3faa5e4 100644 (file)
--- 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 5081d97..2a3fe8c 100644 (file)
--- 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 303deb5..879f966 100644 (file)
--- 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 7092baf..611997d 100644 (file)
--- 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 19233ab..818ae6b 100644 (file)
--- 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 e8a14af..b1084cd 100644 (file)
--- 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);
        }
 

diff --git a/lib/libcrypto/crypto/arc4random_aix.h b/lib/libcrypto/crypto/arc4random_aix.h
index e76c8cb..3142a1f 100644 (file)
--- a/lib/libcrypto/crypto/arc4random_aix.h
+++ b/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 <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/crypto/arc4random_freebsd.h b/lib/libcrypto/crypto/arc4random_freebsd.h
index b54f400..3faa5e4 100644 (file)
--- a/lib/libcrypto/crypto/arc4random_freebsd.h
+++ b/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 <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/crypto/arc4random_hpux.h b/lib/libcrypto/crypto/arc4random_hpux.h
index 5081d97..2a3fe8c 100644 (file)
--- a/lib/libcrypto/crypto/arc4random_hpux.h
+++ b/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 <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/crypto/arc4random_linux.h b/lib/libcrypto/crypto/arc4random_linux.h
index 303deb5..879f966 100644 (file)
--- a/lib/libcrypto/crypto/arc4random_linux.h
+++ b/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 <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/crypto/arc4random_netbsd.h b/lib/libcrypto/crypto/arc4random_netbsd.h
index 7092baf..611997d 100644 (file)
--- a/lib/libcrypto/crypto/arc4random_netbsd.h
+++ b/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 <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/crypto/arc4random_osx.h b/lib/libcrypto/crypto/arc4random_osx.h
index 19233ab..818ae6b 100644 (file)
--- a/lib/libcrypto/crypto/arc4random_osx.h
+++ b/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 <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/crypto/arc4random_solaris.h b/lib/libcrypto/crypto/arc4random_solaris.h
index e8a14af..b1084cd 100644 (file)
--- a/lib/libcrypto/crypto/arc4random_solaris.h
+++ b/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 <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);
        }