75 lines
2.1 KiB
Diff
75 lines
2.1 KiB
Diff
From e18672ce9a5fff383992fd6e842d1cbe85c141ea Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Tue, 12 Dec 2017 16:23:40 +0100
|
|
Subject: [PATCH 10/19] 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 f30a04b145..29b73fa046 100644
|
|
--- a/src/libvirt_private.syms
|
|
+++ b/src/libvirt_private.syms
|
|
@@ -1703,6 +1703,7 @@ virFileReadAll;
|
|
virFileReadAllQuiet;
|
|
virFileReadBufQuiet;
|
|
virFileReadHeaderFD;
|
|
+virFileReadHeaderQuiet;
|
|
virFileReadLimFD;
|
|
virFileReadLink;
|
|
virFileReadValueBitmap;
|
|
diff --git a/src/util/virfile.c b/src/util/virfile.c
|
|
index 2f28e83f44..269db995ff 100644
|
|
--- a/src/util/virfile.c
|
|
+++ b/src/util/virfile.c
|
|
@@ -1356,6 +1356,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 57ceb80721..657e7216fb 100644
|
|
--- a/src/util/virfile.h
|
|
+++ b/src/util/virfile.h
|
|
@@ -129,6 +129,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.17.0
|
|
|