Accepting request 719793 from security

OBS-URL: https://build.opensuse.org/request/show/719793
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/haveged?expand=0&rev=54

get-poolsize.patch

@@ -0,0 +1,27 @@
+From 6d52229623c296385813bc8178987cd50fa55193 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Thu, 25 Jul 2019 11:19:12 +0200
+Subject: [PATCH] Fix type mismatch in get_poolsize
+
+Make max_bits signed so that error checking works.
+---
+ src/haveged.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/haveged.c b/src/haveged.c
+index 9788bda..543d833 100644
+--- a/src/haveged.c
++++ b/src/haveged.c
+@@ -496,7 +496,8 @@ static int get_poolsize(   /* RETURN: number of bits  */
+    void)                   /* IN: nothing             */
+ {
+    FILE *poolsize_fh,*osrel_fh;
+-   unsigned int max_bits,major,minor;
++   unsigned int major,minor;
++   int max_bits;
+ 
+    poolsize_fh = fopen(params->poolsize, "rb");
+    if (poolsize_fh) {
+-- 
+2.22.0
+

haveged.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 30 08:25:59 UTC 2019 - Andreas Schwab <schwab@suse.de>
+
+- get-poolsize.patch: Fix type mismatch in get_poolsize that breaks error
+  checking (bsc#1111047)
+
 -------------------------------------------------------------------
 Wed Sep 19 09:27:15 UTC 2018 - Dr. Werner Fink <werner@suse.de>
 

haveged.spec

@@ -36,6 +36,8 @@ Patch1:         haveged-conditional-enttest.patch
 Patch2:         haveged-no-syslog.patch
 # PATCH-FIX-GITHUB: Fix segfault on arm machines
 Patch3:         f2193587.patch
+# PATCH-FIX-GITHUB: Fix type mismatch in get_poolsize bsc#1111047
+Patch4:         get-poolsize.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -85,6 +87,7 @@ algorithm and supporting features.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 autoreconf -fvi