Pullup ticket #6423 - requested by bouyer
sysutils/xentools413: security patch

Revisions pulled up:
- sysutils/xentools413/Makefile                                 1.16
- sysutils/xentools413/distinfo                                 1.8
- sysutils/xentools413/patches/patch-XSA355                     1.1
- sysutils/xentools413/patches/patch-tools_xenstore_xenstored_core.c 1.1

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Wed Feb  3 22:30:22 UTC 2021

   Modified Files:
   	pkgsrc/sysutils/xentools413: Makefile distinfo
   Added Files:
   	pkgsrc/sysutils/xentools413/patches: patch-XSA355
   	    patch-tools_xenstore_xenstored_core.c

   Log Message:
   Add upstream patch for Xen Security Advisory 355
   Also, fix xenstored looping keeping the CPU 100% busy and leaking
   file descriptors.

   To generate a diff of this commit:
   cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/xentools413/Makefile
   cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/xentools413/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/xentools413/patches/patch-XSA355 \
       pkgsrc/sysutils/xentools413/patches/patch-tools_xenstore_xenstored_core.c


(spz)

$NetBSD: patch-XSA355,v 1.1.2.2 2021/02/18 05:21:21 spz Exp $

From: Jan Beulich <jbeulich@suse.com>
Subject: memory: fix off-by-one in XSA-346 change

The comparison against ARRAY_SIZE() needs to be >= in order to avoid
overrunning the pages[] array.

This is XSA-355.

Fixes: 5777a3742d88 ("IOMMU: hold page ref until after deferred TLB flush")
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Julien Grall <jgrall@amazon.com>

--- xen/common/memory.c.orig
+++ xen/common/memory.c
@@ -854,7 +854,7 @@ int xenmem_add_to_physmap(struct domain
             ++extra.ppage;
 
         /* Check for continuation if it's not the last iteration. */
-        if ( (++done > ARRAY_SIZE(pages) && extra.ppage) ||
+        if ( (++done >= ARRAY_SIZE(pages) && extra.ppage) ||
              (xatp->size > done && hypercall_preempt_check()) )
         {
             rc = start + done;

$NetBSD: patch-tools_xenstore_xenstored_core.c,v 1.1.2.2 2021/02/18 05:21:21 spz Exp $

On error, don't keep socket connection in ignored state but close them.
When the remote end of a socket is closed, xenstored will flag it as an
error and switch the connection to ignored. But on some OSes (e.g.
NetBSD), poll(2) will return only POLLIN in this case, so sockets in ignored
state will stay open forever in xenstored (and it will loop with CPU 100%
busy).

Signed-off-by: Manuel Bouyer <bouyer@netbsd.org>
Fixes: d2fa370d3ef9cbe22d7256c608671cdcdf6e0083
---
 tools/xenstore/xenstored_core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index 1ab6f162cb..0fea598352 100644
--- tools/xenstore/xenstored_core.c.orig
+++ tools/xenstore/xenstored_core.c
@@ -1440,6 +1440,9 @@ static void ignore_connection(struct connection *conn)
 
 	talloc_free(conn->in);
 	conn->in = NULL;
+	/* if this is a socket connection, drop it now */
+	if (conn->fd >= 0)
+		talloc_free(conn);
 }
 
 static const char *sockmsg_string(enum xsd_sockmsg_type type)