From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 29 May 2018 06:55:28 +0000 (+0200)
Subject: virRandomBytes: Prefer saferead over plain read
X-Git-Tag: v4.5.0-rc1~265
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6be5a4ce105975fd106f094411671d0d3b69445;p=thirdparty%2Flibvirt.git

virRandomBytes: Prefer saferead over plain read

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/util/virrandom.c b/src/util/virrandom.c
index bfd044df55..4283611065 100644
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -182,9 +182,7 @@ virRandomBytes(unsigned char *buf,
     while (buflen > 0) {
         ssize_t n;
 
-        if ((n = read(fd, buf, buflen)) <= 0) {
-            if (errno == EINTR)
-                continue;
+        if ((n = saferead(fd, buf, buflen)) <= 0) {
             VIR_FORCE_CLOSE(fd);
             return n < 0 ? -errno : -ENODATA;
         }