File libvirt-util-add-virFileReadHeaderQuiet-wrapper... of Package libvirt.6841

Overview Repositories Revisions Requests Users Attributes Meta

File libvirt-util-add-virFileReadHeaderQuiet-wrapper-around-virFileReadHeaderFD.patch of Package libvirt.6841

From 5c553cc45f0da07f729be7d4b5260a29d4552abd Mon Sep 17 00:00:00 2001
Message-Id: <5c553cc45f0da07f729be7d4b5260a29d4552abd@dist-git>
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 12 Dec 2017 16:23:40 +0100
Subject: [PATCH] util: add virFileReadHeaderQuiet wrapper around
 virFileReadHeaderFD

CVE-2017-5715

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/libvirt_private.syms |  1 +
 src/util/virfile.c       | 19 +++++++++++++++++++
 src/util/virfile.h       |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index bfeb1e58f9..554b24f287 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1562,6 +1562,7 @@ virFileReadAll;
 virFileReadAllQuiet;
 virFileReadBufQuiet;
 virFileReadHeaderFD;
+virFileReadHeaderQuiet;
 virFileReadLimFD;
 virFileRelLinkPointsTo;
 virFileRemove;
diff --git a/src/util/virfile.c b/src/util/virfile.c
index a45279abf8..71e542bc39 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -1326,6 +1326,25 @@ virFileReadHeaderFD(int fd, int maxlen, char **buf)
 }
 
 
+int
+virFileReadHeaderQuiet(const char *path,
+                       int maxlen,
+                       char **buf)
+{
+    int fd;
+    int len;
+
+    fd = open(path, O_RDONLY);
+    if (fd < 0)
+        return -1;
+
+    len = virFileReadHeaderFD(fd, maxlen, buf);
+    VIR_FORCE_CLOSE(fd);
+
+    return len;
+}
+
+
 /* A wrapper around saferead_lim that maps a failure due to
    exceeding the maximum size limitation to EOVERFLOW.  */
 int
diff --git a/src/util/virfile.h b/src/util/virfile.h
index b4ae6ea5f1..79d6bb20b0 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -125,6 +125,8 @@ int virFileDeleteTree(const char *dir);
 
 int virFileReadHeaderFD(int fd, int maxlen, char **buf)
     ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(3);
+int virFileReadHeaderQuiet(const char *path, int maxlen, char **buf)
+    ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
 int virFileReadLimFD(int fd, int maxlen, char **buf)
     ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(3);
 int virFileReadAll(const char *path, int maxlen, char **buf)
-- 
2.15.1

Places

File libvirt-util-add-virFileReadHeaderQuiet-wrapper-around-virFileReadHeaderFD.patch of Package libvirt.6841

Places