From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqP00-0007fE-Nx for qemu-devel@nongnu.org; Tue, 21 Mar 2017 14:59:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqOzw-0004k7-Im for qemu-devel@nongnu.org; Tue, 21 Mar 2017 14:59:16 -0400 Received: from mail.kernel.org ([198.145.29.136]:39396) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqOzw-0004ie-8M for qemu-devel@nongnu.org; Tue, 21 Mar 2017 14:59:12 -0400 Date: Tue, 21 Mar 2017 11:59:07 -0700 (PDT) From: Stefano Stabellini In-Reply-To: <1490120877-3731-1-git-send-email-paul.durrant@citrix.com> Message-ID: References: <1490120877-3731-1-git-send-email-paul.durrant@citrix.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Subject: Re: [Qemu-devel] [PATCH v3] xen: use libxendevice model to restrict operations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paul Durrant Cc: qemu-devel@nongnu.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Anthony Perard , Paolo Bonzini On Tue, 21 Mar 2017, Paul Durrant wrote: > This patch adds a command-line option (-xen-domid-restrict) which will > use the new libxendevicemodel API to restrict devicemodel [1] operations > to the specified domid. (Such operations are not applicable to the xenpv > machine type). > > This patch also adds a tracepoint to allow successful enabling of the > restriction to be monitored. > > [1] I.e. operations issued by libxendevicemodel. Operation issued by other > xen libraries (e.g. libxenforeignmemory) are currently still unrestricted > but this will be rectified by subsequent patches. > > Signed-off-by: Paul Durrant In file included from qemu-options-wrapper.h:32:0, from qemu-options.h:33, from os-posix.c:36: qemu-options.def:698:1: error: missing terminating " character [-Werror] cc1: all warnings being treated as errors make: *** [os-posix.o] Error 1 make: *** Waiting for unfinished jobs.... You are missing a \" > --- > Cc: Stefano Stabellini > Cc: Anthony Perard > Cc: Paolo Bonzini > > NOTE: This is already re-based on Juergen Gross's patch "xen: use 5 digit > xen versions" and so should not be applied until after that patch > has been applied. > > v2: > - Log errno in tracepoint > --- > hw/xen/trace-events | 1 + > include/hw/xen/xen.h | 1 + > include/hw/xen/xen_common.h | 20 ++++++++++++++++++++ > qemu-options.hx | 7 +++++++ > vl.c | 8 ++++++++ > xen-hvm.c | 8 ++++++++ > 6 files changed, 45 insertions(+) > > diff --git a/hw/xen/trace-events b/hw/xen/trace-events > index c4fb6f1..5615dce 100644 > --- a/hw/xen/trace-events > +++ b/hw/xen/trace-events > @@ -11,3 +11,4 @@ xen_map_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: % > xen_unmap_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 > xen_map_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" > xen_unmap_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" > +xen_domid_restrict(int err) "err: %u" > diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h > index 2b1733b..7efcdaa 100644 > --- a/include/hw/xen/xen.h > +++ b/include/hw/xen/xen.h > @@ -21,6 +21,7 @@ enum xen_mode { > > extern uint32_t xen_domid; > extern enum xen_mode xen_mode; > +extern bool xen_domid_restrict; > > extern bool xen_allowed; > > diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h > index df098c7..4f3bd35 100644 > --- a/include/hw/xen/xen_common.h > +++ b/include/hw/xen/xen_common.h > @@ -152,6 +152,13 @@ static inline int xendevicemodel_set_mem_type( > return xc_hvm_set_mem_type(dmod, domid, mem_type, first_pfn, nr); > } > > +static inline int xendevicemodel_restrict( > + xendevicemodel_handle *dmod, domid_t domid) > +{ > + errno = ENOTTY; > + return -1; > +} > + > #else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40900 */ > > #include > @@ -206,6 +213,19 @@ static inline int xen_modified_memory(domid_t domid, uint64_t first_pfn, > return xendevicemodel_modified_memory(xen_dmod, domid, first_pfn, nr); > } > > +static inline int xen_restrict(domid_t domid) > +{ > + int rc = xendevicemodel_restrict(xen_dmod, domid); > + > + trace_xen_domid_restrict(errno); > + > + if (errno == ENOTTY) { > + return 0; > + } > + > + return rc; > +} > + > /* Xen 4.2 through 4.6 */ > #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40701 > > diff --git a/qemu-options.hx b/qemu-options.hx > index 99af8ed..d380f7d 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -3354,6 +3354,11 @@ DEF("xen-attach", 0, QEMU_OPTION_xen_attach, > "-xen-attach attach to existing xen domain\n" > " xend will use this when starting QEMU\n", > QEMU_ARCH_ALL) > +DEF("xen-domid-restrict", 0, QEMU_OPTION_xen_domid_restrict, > + "-xen-domid-restrict restrict set of available xen operations\n" > + " to specified domain id. (Does not affect\n > + " xenpv machine type).\n", > + QEMU_ARCH_ALL) > STEXI > @item -xen-domid @var{id} > @findex -xen-domid > @@ -3366,6 +3371,8 @@ Warning: should not be used when xend is in use (XEN only). > @findex -xen-attach > Attach to existing xen domain. > xend will use this when starting QEMU (XEN only). > +@findex -xen-domid-restrict > +Restrict set of available xen operations to specified domain id (XEN only). > ETEXI > > DEF("no-reboot", 0, QEMU_OPTION_no_reboot, \ > diff --git a/vl.c b/vl.c > index 0b4ed52..f46e070 100644 > --- a/vl.c > +++ b/vl.c > @@ -205,6 +205,7 @@ static NotifierList machine_init_done_notifiers = > bool xen_allowed; > uint32_t xen_domid; > enum xen_mode xen_mode = XEN_EMULATE; > +bool xen_domid_restrict; > > static int has_defaults = 1; > static int default_serial = 1; > @@ -3933,6 +3934,13 @@ int main(int argc, char **argv, char **envp) > } > xen_mode = XEN_ATTACH; > break; > + case QEMU_OPTION_xen_domid_restrict: > + if (!(xen_available())) { > + error_report("Option not supported for this target"); > + exit(1); > + } > + xen_domid_restrict = true; > + break; > case QEMU_OPTION_trace: > g_free(trace_file); > trace_file = trace_opt_parse(optarg); > diff --git a/xen-hvm.c b/xen-hvm.c > index 4b928cf..335e263 100644 > --- a/xen-hvm.c > +++ b/xen-hvm.c > @@ -1226,6 +1226,14 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) > goto err; > } > > + if (xen_domid_restrict) { > + rc = xen_restrict(xen_domid); > + if (rc < 0) { > + error_report("failed to restrict: error %d", errno); > + goto err; > + } > + } > + > xen_create_ioreq_server(xen_domid, &state->ioservid); > > state->exit.notify = xen_exit_notifier; > -- > 2.1.4 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: Re: [PATCH v3] xen: use libxendevice model to restrict operations Date: Tue, 21 Mar 2017 11:59:07 -0700 (PDT) Message-ID: References: <1490120877-3731-1-git-send-email-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cqOzy-0004Il-5h for xen-devel@lists.xenproject.org; Tue, 21 Mar 2017 18:59:14 +0000 In-Reply-To: <1490120877-3731-1-git-send-email-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Paul Durrant Cc: Anthony Perard , xen-devel@lists.xenproject.org, Stefano Stabellini , qemu-devel@nongnu.org, Paolo Bonzini List-Id: xen-devel@lists.xenproject.org T24gVHVlLCAyMSBNYXIgMjAxNywgUGF1bCBEdXJyYW50IHdyb3RlOgo+IFRoaXMgcGF0Y2ggYWRk cyBhIGNvbW1hbmQtbGluZSBvcHRpb24gKC14ZW4tZG9taWQtcmVzdHJpY3QpIHdoaWNoIHdpbGwK PiB1c2UgdGhlIG5ldyBsaWJ4ZW5kZXZpY2Vtb2RlbCBBUEkgdG8gcmVzdHJpY3QgZGV2aWNlbW9k ZWwgWzFdIG9wZXJhdGlvbnMKPiB0byB0aGUgc3BlY2lmaWVkIGRvbWlkLiAoU3VjaCBvcGVyYXRp b25zIGFyZSBub3QgYXBwbGljYWJsZSB0byB0aGUgeGVucHYKPiBtYWNoaW5lIHR5cGUpLgo+IAo+ IFRoaXMgcGF0Y2ggYWxzbyBhZGRzIGEgdHJhY2Vwb2ludCB0byBhbGxvdyBzdWNjZXNzZnVsIGVu YWJsaW5nIG9mIHRoZQo+IHJlc3RyaWN0aW9uIHRvIGJlIG1vbml0b3JlZC4KPiAKPiBbMV0gSS5l LiBvcGVyYXRpb25zIGlzc3VlZCBieSBsaWJ4ZW5kZXZpY2Vtb2RlbC4gT3BlcmF0aW9uIGlzc3Vl ZCBieSBvdGhlcgo+ICAgICB4ZW4gbGlicmFyaWVzIChlLmcuIGxpYnhlbmZvcmVpZ25tZW1vcnkp IGFyZSBjdXJyZW50bHkgc3RpbGwgdW5yZXN0cmljdGVkCj4gICAgIGJ1dCB0aGlzIHdpbGwgYmUg cmVjdGlmaWVkIGJ5IHN1YnNlcXVlbnQgcGF0Y2hlcy4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBQYXVs IER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29tPgoKSW4gZmlsZSBpbmNsdWRlZCBmcm9t IHFlbXUtb3B0aW9ucy13cmFwcGVyLmg6MzI6MCwKICAgICAgICAgICAgICAgICBmcm9tIHFlbXUt b3B0aW9ucy5oOjMzLAogICAgICAgICAgICAgICAgIGZyb20gb3MtcG9zaXguYzozNjoKcWVtdS1v cHRpb25zLmRlZjo2OTg6MTogZXJyb3I6IG1pc3NpbmcgdGVybWluYXRpbmcgIiBjaGFyYWN0ZXIg Wy1XZXJyb3JdCmNjMTogYWxsIHdhcm5pbmdzIGJlaW5nIHRyZWF0ZWQgYXMgZXJyb3JzCm1ha2U6 ICoqKiBbb3MtcG9zaXgub10gRXJyb3IgMQptYWtlOiAqKiogV2FpdGluZyBmb3IgdW5maW5pc2hl ZCBqb2JzLi4uLgoKWW91IGFyZSBtaXNzaW5nIGEgXCIKCgo+IC0tLQo+IENjOiBTdGVmYW5vIFN0 YWJlbGxpbmkgPHNzdGFiZWxsaW5pQGtlcm5lbC5vcmc+Cj4gQ2M6IEFudGhvbnkgUGVyYXJkIDxh bnRob255LnBlcmFyZEBjaXRyaXguY29tPgo+IENjOiBQYW9sbyBCb256aW5pIDxwYm9uemluaUBy ZWRoYXQuY29tPgo+IAo+IE5PVEU6IFRoaXMgaXMgYWxyZWFkeSByZS1iYXNlZCBvbiBKdWVyZ2Vu IEdyb3NzJ3MgcGF0Y2ggInhlbjogdXNlIDUgZGlnaXQKPiAgICAgICB4ZW4gdmVyc2lvbnMiIGFu ZCBzbyBzaG91bGQgbm90IGJlIGFwcGxpZWQgdW50aWwgYWZ0ZXIgdGhhdCBwYXRjaAo+ICAgICAg IGhhcyBiZWVuIGFwcGxpZWQuCj4gCj4gdjI6Cj4gIC0gTG9nIGVycm5vIGluIHRyYWNlcG9pbnQK PiAtLS0KPiAgaHcveGVuL3RyYWNlLWV2ZW50cyAgICAgICAgIHwgIDEgKwo+ICBpbmNsdWRlL2h3 L3hlbi94ZW4uaCAgICAgICAgfCAgMSArCj4gIGluY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaCB8 IDIwICsrKysrKysrKysrKysrKysrKysrCj4gIHFlbXUtb3B0aW9ucy5oeCAgICAgICAgICAgICB8 ICA3ICsrKysrKysKPiAgdmwuYyAgICAgICAgICAgICAgICAgICAgICAgIHwgIDggKysrKysrKysK PiAgeGVuLWh2bS5jICAgICAgICAgICAgICAgICAgIHwgIDggKysrKysrKysKPiAgNiBmaWxlcyBj aGFuZ2VkLCA0NSBpbnNlcnRpb25zKCspCj4gCj4gZGlmZiAtLWdpdCBhL2h3L3hlbi90cmFjZS1l dmVudHMgYi9ody94ZW4vdHJhY2UtZXZlbnRzCj4gaW5kZXggYzRmYjZmMS4uNTYxNWRjZSAxMDA2 NDQKPiAtLS0gYS9ody94ZW4vdHJhY2UtZXZlbnRzCj4gKysrIGIvaHcveGVuL3RyYWNlLWV2ZW50 cwo+IEBAIC0xMSwzICsxMSw0IEBAIHhlbl9tYXBfcG9ydGlvX3JhbmdlKHVpbnQzMl90IGlkLCB1 aW50NjRfdCBzdGFydF9hZGRyLCB1aW50NjRfdCBlbmRfYWRkcikgImlkOiAlCj4gIHhlbl91bm1h cF9wb3J0aW9fcmFuZ2UodWludDMyX3QgaWQsIHVpbnQ2NF90IHN0YXJ0X2FkZHIsIHVpbnQ2NF90 IGVuZF9hZGRyKSAiaWQ6ICV1IHN0YXJ0OiAlIyJQUkl4NjQiIGVuZDogJSMiUFJJeDY0Cj4gIHhl bl9tYXBfcGNpZGV2KHVpbnQzMl90IGlkLCB1aW50OF90IGJ1cywgdWludDhfdCBkZXYsIHVpbnQ4 X3QgZnVuYykgImlkOiAldSBiZGY6ICUwMnguJTAyeC4lMDJ4Igo+ICB4ZW5fdW5tYXBfcGNpZGV2 KHVpbnQzMl90IGlkLCB1aW50OF90IGJ1cywgdWludDhfdCBkZXYsIHVpbnQ4X3QgZnVuYykgImlk OiAldSBiZGY6ICUwMnguJTAyeC4lMDJ4Igo+ICt4ZW5fZG9taWRfcmVzdHJpY3QoaW50IGVycikg ImVycjogJXUiCj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvaHcveGVuL3hlbi5oIGIvaW5jbHVkZS9o dy94ZW4veGVuLmgKPiBpbmRleCAyYjE3MzNiLi43ZWZjZGFhIDEwMDY0NAo+IC0tLSBhL2luY2x1 ZGUvaHcveGVuL3hlbi5oCj4gKysrIGIvaW5jbHVkZS9ody94ZW4veGVuLmgKPiBAQCAtMjEsNiAr MjEsNyBAQCBlbnVtIHhlbl9tb2RlIHsKPiAgCj4gIGV4dGVybiB1aW50MzJfdCB4ZW5fZG9taWQ7 Cj4gIGV4dGVybiBlbnVtIHhlbl9tb2RlIHhlbl9tb2RlOwo+ICtleHRlcm4gYm9vbCB4ZW5fZG9t aWRfcmVzdHJpY3Q7Cj4gIAo+ICBleHRlcm4gYm9vbCB4ZW5fYWxsb3dlZDsKPiAgCj4gZGlmZiAt LWdpdCBhL2luY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaCBiL2luY2x1ZGUvaHcveGVuL3hlbl9j b21tb24uaAo+IGluZGV4IGRmMDk4YzcuLjRmM2JkMzUgMTAwNjQ0Cj4gLS0tIGEvaW5jbHVkZS9o dy94ZW4veGVuX2NvbW1vbi5oCj4gKysrIGIvaW5jbHVkZS9ody94ZW4veGVuX2NvbW1vbi5oCj4g QEAgLTE1Miw2ICsxNTIsMTMgQEAgc3RhdGljIGlubGluZSBpbnQgeGVuZGV2aWNlbW9kZWxfc2V0 X21lbV90eXBlKAo+ICAgICAgcmV0dXJuIHhjX2h2bV9zZXRfbWVtX3R5cGUoZG1vZCwgZG9taWQs IG1lbV90eXBlLCBmaXJzdF9wZm4sIG5yKTsKPiAgfQo+ICAKPiArc3RhdGljIGlubGluZSBpbnQg eGVuZGV2aWNlbW9kZWxfcmVzdHJpY3QoCj4gKyAgICB4ZW5kZXZpY2Vtb2RlbF9oYW5kbGUgKmRt b2QsIGRvbWlkX3QgZG9taWQpCj4gK3sKPiArICAgIGVycm5vID0gRU5PVFRZOwo+ICsgICAgcmV0 dXJuIC0xOwo+ICt9Cj4gKwo+ICAjZWxzZSAvKiBDT05GSUdfWEVOX0NUUkxfSU5URVJGQUNFX1ZF UlNJT04gPj0gNDA5MDAgKi8KPiAgCj4gICNpbmNsdWRlIDx4ZW5kZXZpY2Vtb2RlbC5oPgo+IEBA IC0yMDYsNiArMjEzLDE5IEBAIHN0YXRpYyBpbmxpbmUgaW50IHhlbl9tb2RpZmllZF9tZW1vcnko ZG9taWRfdCBkb21pZCwgdWludDY0X3QgZmlyc3RfcGZuLAo+ICAgICAgcmV0dXJuIHhlbmRldmlj ZW1vZGVsX21vZGlmaWVkX21lbW9yeSh4ZW5fZG1vZCwgZG9taWQsIGZpcnN0X3BmbiwgbnIpOwo+ ICB9Cj4gIAo+ICtzdGF0aWMgaW5saW5lIGludCB4ZW5fcmVzdHJpY3QoZG9taWRfdCBkb21pZCkK PiArewo+ICsgICAgaW50IHJjID0geGVuZGV2aWNlbW9kZWxfcmVzdHJpY3QoeGVuX2Rtb2QsIGRv bWlkKTsKPiArCj4gKyAgICB0cmFjZV94ZW5fZG9taWRfcmVzdHJpY3QoZXJybm8pOwo+ICsKPiAr ICAgIGlmIChlcnJubyA9PSBFTk9UVFkpIHsKPiArICAgICAgICByZXR1cm4gMDsKPiArICAgIH0K PiArCj4gKyAgICByZXR1cm4gcmM7Cj4gK30KPiArCj4gIC8qIFhlbiA0LjIgdGhyb3VnaCA0LjYg Ki8KPiAgI2lmIENPTkZJR19YRU5fQ1RSTF9JTlRFUkZBQ0VfVkVSU0lPTiA8IDQwNzAxCj4gIAo+ IGRpZmYgLS1naXQgYS9xZW11LW9wdGlvbnMuaHggYi9xZW11LW9wdGlvbnMuaHgKPiBpbmRleCA5 OWFmOGVkLi5kMzgwZjdkIDEwMDY0NAo+IC0tLSBhL3FlbXUtb3B0aW9ucy5oeAo+ICsrKyBiL3Fl bXUtb3B0aW9ucy5oeAo+IEBAIC0zMzU0LDYgKzMzNTQsMTEgQEAgREVGKCJ4ZW4tYXR0YWNoIiwg MCwgUUVNVV9PUFRJT05feGVuX2F0dGFjaCwKPiAgICAgICIteGVuLWF0dGFjaCAgICAgYXR0YWNo IHRvIGV4aXN0aW5nIHhlbiBkb21haW5cbiIKPiAgICAgICIgICAgICAgICAgICAgICAgeGVuZCB3 aWxsIHVzZSB0aGlzIHdoZW4gc3RhcnRpbmcgUUVNVVxuIiwKPiAgICAgIFFFTVVfQVJDSF9BTEwp Cj4gK0RFRigieGVuLWRvbWlkLXJlc3RyaWN0IiwgMCwgUUVNVV9PUFRJT05feGVuX2RvbWlkX3Jl c3RyaWN0LAo+ICsgICAgIi14ZW4tZG9taWQtcmVzdHJpY3QgICAgIHJlc3RyaWN0IHNldCBvZiBh dmFpbGFibGUgeGVuIG9wZXJhdGlvbnNcbiIKPiArICAgICIgICAgICAgICAgICAgICAgICAgICAg ICB0byBzcGVjaWZpZWQgZG9tYWluIGlkLiAoRG9lcyBub3QgYWZmZWN0XG4KPiArICAgICIgICAg ICAgICAgICAgICAgICAgICAgICB4ZW5wdiBtYWNoaW5lIHR5cGUpLlxuIiwKPiArICAgIFFFTVVf QVJDSF9BTEwpCj4gIFNURVhJCj4gIEBpdGVtIC14ZW4tZG9taWQgQHZhcntpZH0KPiAgQGZpbmRl eCAteGVuLWRvbWlkCj4gQEAgLTMzNjYsNiArMzM3MSw4IEBAIFdhcm5pbmc6IHNob3VsZCBub3Qg YmUgdXNlZCB3aGVuIHhlbmQgaXMgaW4gdXNlIChYRU4gb25seSkuCj4gIEBmaW5kZXggLXhlbi1h dHRhY2gKPiAgQXR0YWNoIHRvIGV4aXN0aW5nIHhlbiBkb21haW4uCj4gIHhlbmQgd2lsbCB1c2Ug dGhpcyB3aGVuIHN0YXJ0aW5nIFFFTVUgKFhFTiBvbmx5KS4KPiArQGZpbmRleCAteGVuLWRvbWlk LXJlc3RyaWN0Cj4gK1Jlc3RyaWN0IHNldCBvZiBhdmFpbGFibGUgeGVuIG9wZXJhdGlvbnMgdG8g c3BlY2lmaWVkIGRvbWFpbiBpZCAoWEVOIG9ubHkpLgo+ICBFVEVYSQo+ICAKPiAgREVGKCJuby1y ZWJvb3QiLCAwLCBRRU1VX09QVElPTl9ub19yZWJvb3QsIFwKPiBkaWZmIC0tZ2l0IGEvdmwuYyBi L3ZsLmMKPiBpbmRleCAwYjRlZDUyLi5mNDZlMDcwIDEwMDY0NAo+IC0tLSBhL3ZsLmMKPiArKysg Yi92bC5jCj4gQEAgLTIwNSw2ICsyMDUsNyBAQCBzdGF0aWMgTm90aWZpZXJMaXN0IG1hY2hpbmVf aW5pdF9kb25lX25vdGlmaWVycyA9Cj4gIGJvb2wgeGVuX2FsbG93ZWQ7Cj4gIHVpbnQzMl90IHhl bl9kb21pZDsKPiAgZW51bSB4ZW5fbW9kZSB4ZW5fbW9kZSA9IFhFTl9FTVVMQVRFOwo+ICtib29s IHhlbl9kb21pZF9yZXN0cmljdDsKPiAgCj4gIHN0YXRpYyBpbnQgaGFzX2RlZmF1bHRzID0gMTsK PiAgc3RhdGljIGludCBkZWZhdWx0X3NlcmlhbCA9IDE7Cj4gQEAgLTM5MzMsNiArMzkzNCwxMyBA QCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YsIGNoYXIgKiplbnZwKQo+ICAgICAgICAg ICAgICAgICAgfQo+ICAgICAgICAgICAgICAgICAgeGVuX21vZGUgPSBYRU5fQVRUQUNIOwo+ICAg ICAgICAgICAgICAgICAgYnJlYWs7Cj4gKyAgICAgICAgICAgIGNhc2UgUUVNVV9PUFRJT05feGVu X2RvbWlkX3Jlc3RyaWN0Ogo+ICsgICAgICAgICAgICAgICAgaWYgKCEoeGVuX2F2YWlsYWJsZSgp KSkgewo+ICsgICAgICAgICAgICAgICAgICAgIGVycm9yX3JlcG9ydCgiT3B0aW9uIG5vdCBzdXBw b3J0ZWQgZm9yIHRoaXMgdGFyZ2V0Iik7Cj4gKyAgICAgICAgICAgICAgICAgICAgZXhpdCgxKTsK PiArICAgICAgICAgICAgICAgIH0KPiArICAgICAgICAgICAgICAgIHhlbl9kb21pZF9yZXN0cmlj dCA9IHRydWU7Cj4gKyAgICAgICAgICAgICAgICBicmVhazsKPiAgICAgICAgICAgICAgY2FzZSBR RU1VX09QVElPTl90cmFjZToKPiAgICAgICAgICAgICAgICAgIGdfZnJlZSh0cmFjZV9maWxlKTsK PiAgICAgICAgICAgICAgICAgIHRyYWNlX2ZpbGUgPSB0cmFjZV9vcHRfcGFyc2Uob3B0YXJnKTsK PiBkaWZmIC0tZ2l0IGEveGVuLWh2bS5jIGIveGVuLWh2bS5jCj4gaW5kZXggNGI5MjhjZi4uMzM1 ZTI2MyAxMDA2NDQKPiAtLS0gYS94ZW4taHZtLmMKPiArKysgYi94ZW4taHZtLmMKPiBAQCAtMTIy Niw2ICsxMjI2LDE0IEBAIHZvaWQgeGVuX2h2bV9pbml0KFBDTWFjaGluZVN0YXRlICpwY21zLCBN ZW1vcnlSZWdpb24gKipyYW1fbWVtb3J5KQo+ICAgICAgICAgIGdvdG8gZXJyOwo+ICAgICAgfQo+ ICAKPiArICAgIGlmICh4ZW5fZG9taWRfcmVzdHJpY3QpIHsKPiArICAgICAgICByYyA9IHhlbl9y ZXN0cmljdCh4ZW5fZG9taWQpOwo+ICsgICAgICAgIGlmIChyYyA8IDApIHsKPiArICAgICAgICAg ICAgZXJyb3JfcmVwb3J0KCJmYWlsZWQgdG8gcmVzdHJpY3Q6IGVycm9yICVkIiwgZXJybm8pOwo+ ICsgICAgICAgICAgICBnb3RvIGVycjsKPiArICAgICAgICB9Cj4gKyAgICB9Cj4gKwo+ICAgICAg eGVuX2NyZWF0ZV9pb3JlcV9zZXJ2ZXIoeGVuX2RvbWlkLCAmc3RhdGUtPmlvc2VydmlkKTsKPiAg Cj4gICAgICBzdGF0ZS0+ZXhpdC5ub3RpZnkgPSB4ZW5fZXhpdF9ub3RpZmllcjsKPiAtLSAKPiAy LjEuNAo+IAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K WGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xp c3RzLnhlbi5vcmcveGVuLWRldmVsCg==