libre/{qemu-static => qemu-user-static}: upgpkg 2.11.0-3.parabola1

1 files changed, 30 insertions, 0 deletions

diff --git a/libre/qemu-user-static/0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch b/libre/qemu-user-static/0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch
new file mode 100644
index 000000000..4436b7817
--- /dev/null
+++ b/libre/qemu-user-static/0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch
@@ -0,0 +1,30 @@
+From ca873a81cc020df0ee0ec072a60678bb83dce9e2 Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@parabola.nu>
+Date: Wed, 27 Dec 2017 21:05:29 -0500
+Subject: [PATCH 06/10] linux-user: init_guest_commpage: Add a comment about
+ size check
+
+Signed-off-by: Luke Shumaker <lukeshu@parabola.nu>
+---
+ linux-user/elfload.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/linux-user/elfload.c b/linux-user/elfload.c
+index 22f2632dfa..b560f5d6fe 100644
+--- a/linux-user/elfload.c
++++ b/linux-user/elfload.c
+@@ -374,6 +374,11 @@ static int init_guest_commpage(unsigned long guest_base,
+ 
+     /* If the commpage lies within the already allocated guest space,
+      * then there is no way we can allocate it.
++     *
++     * You may be thinking that that this check is redundant because
++     * we already validated the guest size against MAX_RESERVED_VA;
++     * but if qemu_host_page_mask is unusually large, then
++     * test_page_addr may be lower.
+      */
+     if (test_page_addr >= guest_base
+         && test_page_addr < (guest_base + guest_size)) {
+-- 
+2.15.1
+