From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 8 Feb 2016 07:40:19 +0000 (+0100)
Subject: Fix #885: vma-writer: don't bail out on zero length files
X-Git-Url: https://git.proxmox.com/?p=pve-qemu-kvm.git;a=commitdiff_plain;h=1ecfb4ca4728fb38366ccf77155f2722a6a4e6a1

Fix #885: vma-writer: don't bail out on zero length files
---

diff --git a/debian/patches/pve/0042-vma-writer-don-t-bail-out-on-zero-length-files.patch b/debian/patches/pve/0042-vma-writer-don-t-bail-out-on-zero-length-files.patch
new file mode 100644
index 0000000..5289a8a
--- /dev/null
+++ b/debian/patches/pve/0042-vma-writer-don-t-bail-out-on-zero-length-files.patch
@@ -0,0 +1,24 @@
+From 7844d4dd830c71ecfd437556251ecef96352e1e7 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Mon, 8 Feb 2016 08:23:34 +0100
+Subject: [PATCH 42/44] vma-writer: don't bail out on zero-length files
+
+---
+ vma-writer.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/vma-writer.c b/vma-writer.c
+index f5a7abd..3cde204 100644
+--- a/vma-writer.c
++++ b/vma-writer.c
+@@ -136,7 +136,6 @@ int vma_writer_add_config(VmaWriter *vmaw, const char *name, gpointer data,
+     assert(vmaw->config_count < VMA_MAX_CONFIGS);
+     assert(name);
+     assert(data);
+-    assert(len);
+ 
+     gchar *basename = g_path_get_basename(name);
+     uint32_t name_ptr = allocate_header_string(vmaw, basename);
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 0368984..e109baa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,6 +39,7 @@ pve/0038-qapi-qmp_mashal_-renames-for-async-snapshot.patch
 pve/0039-qapi-qmp_mashal_-renames-for-get_link_status.patch
 pve/0040-vnc-make-x509-imply-tls-again.patch
 pve/0041-PVE-VNC-authentication.patch
+pve/0042-vma-writer-don-t-bail-out-on-zero-length-files.patch
 extra/CVE-2015-8558-ehci_make_idt_processing_more_robust.patch
 extra/CVE-2015-8613-scsi-initialize-info-object.patch
 extra/CVE-2015-8701-net-rocker-off-by-one.patch