Attachment 729681 Details for Bug 1025068

[patch] Additional patch for openSUSE 42.2 with using these drop-in replacements for getentropy()

patch (text/plain), 2.98 KB, created by Stefan Dirsch on 2017-06-21 12:33:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2017-06-21 12:33:22 UTC

Size: 2.98 KB

patch

obsolete

>--- libICE-1.0.9.old/configure.ac	2017-06-21 11:18:12.192944661 +0000
>+++ libICE-1.0.9/configure.ac	2017-06-21 11:44:27.427169614 +0000
>@@ -38,7 +38,7 @@ AC_DEFINE(ICE_t, 1, [Xtrans transport ty
> 
> # Checks for library functions.
> AC_CHECK_LIB([bsd], [arc4random_buf])
>-AC_CHECK_FUNCS([asprintf arc4random_buf getentropy])
>+AC_CHECK_FUNCS([asprintf arc4random_buf getentropy getrandom])
> 
> # Allow checking code with lint, sparse, etc.
> XORG_WITH_LINT
>--- libICE-1.0.9.old/src/iceauth.c	2017-06-21 11:18:12.188944584 +0000
>+++ libICE-1.0.9/src/iceauth.c	2017-06-21 12:28:11.537538852 +0000
>@@ -40,6 +40,16 @@ Author: Ralph Mor, X Consortium
> #include <bsd/stdlib.h>	/* for arc4random_buf() */
> #endif
> 
>+#ifdef HAVE_GETRANDOM
>+#include <linux/random.h>
>+#include <sys/syscall.h>
>+#endif
>+
>+#include <sys/types.h>
>+#include <sys/stat.h>
>+#include <fcntl.h>
>+#include <errno.h>
>+
> static int was_called_state;
> 
> #ifndef HAVE_ARC4RANDOM_BUF
>@@ -78,20 +88,110 @@ emulate_getrandom_buf (
>     }
> }
> 
>+#ifdef HAVE_GETRANDOM
>+static int 
>+emulate_getentropy_getrandom
>+(
>+	void *buffer, 
>+	size_t length
>+)
>+{
>+    int res;
>+    size_t filled = 0;
>+
>+    if( length > 256 ) {
>+	errno = EIO;
>+	return -1;
>+    }
>+
>+    while( filled < length ) {
>+	/*
>+	 * glibc does not contain a syscall wrapper for this in older
>+	 * versions
>+	 */
>+	res = syscall(SYS_getrandom, (char*)buffer + filled, length - filled, 0);
>+
>+	if( res == -1 ) {
>+	    if( errno == EINTR )
>+		continue;
>+
>+	    return -1;
>+	} else if ( res == 0 ) {
>+	    // no more bytes available? should not happen
>+	    errno = EIO;
>+	    return -1;
>+	}
>+
>+	filled += res;
>+    }
>+
>+    return 0;
>+}
>+#endif
>+
>+static int emulate_getentropy_devurandom
>+(
>+	void *buffer, 
>+	size_t length
>+)
>+{
>+    int random_fd = -1;
>+    ssize_t res = -1;
>+    size_t filled = 0;
>+
>+    if( length > 256 ) {
>+	errno = EIO;
>+	return -1;
>+    }
>+
>+    random_fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC);
>+
>+    if( random_fd == -1 ) {
>+	return -1;
>+    }
>+
>+    while( filled < length ) {
>+	res = read(random_fd, (char*)buffer + filled, length - filled);
>+
>+	if( res == -1 ) {
>+	    // shouldn't actually happen acc. to man(4) random,
>+	    // but you never know
>+	    if( errno == EINTR )
>+		continue;
>+
>+	    return -1;
>+	} else if( res == 0 ) {
>+	    // no more bytes available? should not happen
>+	    errno = EIO;
>+	    return -1;
>+	}
>+
>+	filled += res;
>+    }
>+
>+    return 0;
>+}
>+
> static void
> arc4random_buf (
> 	char *auth,
> 	int len
> )
> {
>-    int	    ret;
>+    int	    ret = -1;
> 
> #if HAVE_GETENTROPY
>     /* weak emulation of arc4random through the entropy libc */
>     ret = getentropy (auth, len);
>+#elif HAVE_GETRANDOM
>+    /* drop-in replacement for getentropy() via getrandrom() */
>+    ret = emulate_getentropy_getrandom (auth, len);
>+#else 
>+    /* drop-in replacement for getentropy() using /dev/urandom */
>+    ret = emulate_getentropy_devurandom(auth, len);
>+#endif /* HAVE_GETENTROPY */
>     if (ret == 0)
> 	return;
>-#endif /* HAVE_GETENTROPY */
> 
>     emulate_getrandom_buf (auth, len);
> }

Actions: View | Diff

Attachments on bug 1025068: 715740 | 715748 | 729646 | 729648 | 729649 | 729681 | 729683 | 730002 | 730193 | 730205 | 730212 | 730213 | 730361 | 730982 | 731944