From: Liam Merwick Subject: [RFC 2/3] pc: Read PVH entry point from ELF note in kernel binary Date: Wed, 5 Dec 2018 22:37:25 +0000 Message-ID: <1544049446-6359-3-git-send-email-liam.merwick@oracle.com> References: <1544049446-6359-1-git-send-email-liam.merwick@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gUfnr-0005dg-Gz for xen-devel@lists.xenproject.org; Wed, 05 Dec 2018 22:37:59 +0000 In-Reply-To: <1544049446-6359-1-git-send-email-liam.merwick@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: liam.merwick@oracle.com, ehabkost@redhat.com, mst@redhat.com, maran.wilson@oracle.com, stefanha@redhat.com, xen-devel@lists.xenproject.org, pbonzini@redhat.com, rth@twiddle.net, sgarzare@redhat.com List-Id: xen-devel@lists.xenproject.org RnJvbTogTGlhbSBNZXJ3aWNrIDxMaWFtLk1lcndpY2tAb3JhY2xlLmNvbT4KCkFkZCBzdXBwb3J0 IHRvIHJlYWQgdGhlIFBWSCBFbnRyeSBhZGRyZXNzIGZyb20gYW4gRUxGIG5vdGUgaW4gdGhlCnVu Y29tcHJlc3NlZCBrZXJuZWwgYmluYXJ5IChhcyBkZWZpbmVkIGJ5IHRoZSB4ODYvSFZNIGRpcmVj dCBib290IEFCSSkuClRoaXMgMzItYml0IGVudHJ5IHBvaW50IHdpbGwgYmUgdXNlZCBieSBRRU1V IHRvIGxvYWQgdGhlIGtlcm5lbCBpbiB0aGUKZ3Vlc3QgYW5kIGp1bXAgaW50byB0aGUga2VybmVs IGVudHJ5IHBvaW50LgoKRm9yIG5vdywgYSBjYWxsIHRvIHRoaXMgZnVuY3Rpb24gaXMgYWRkZWQg aW4gcGNfbWVtb3J5X2luaXQoKSB0byByZWFkIHRoZQphZGRyZXNzIC0gYSBmdXR1cmUgcGF0Y2gg d2lsbCB1c2UgdGhlIGVudHJ5IHBvaW50LgoKU2lnbmVkLW9mZi1ieTogTGlhbSBNZXJ3aWNrIDxM aWFtLk1lcndpY2tAb3JhY2xlLmNvbT4KLS0tCiBody9pMzg2L3BjLmMgIHwgMjcyICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIGluY2x1 ZGUvZWxmLmggfCAgMTAgKysrCiAyIGZpbGVzIGNoYW5nZWQsIDI4MSBpbnNlcnRpb25zKCspLCAx IGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvaHcvaTM4Ni9wYy5jIGIvaHcvaTM4Ni9wYy5jCmlu ZGV4IGYwOTU3MjVkYmFiMi4uMDU2YWE0NmQ5OWI5IDEwMDY0NAotLS0gYS9ody9pMzg2L3BjLmMK KysrIGIvaHcvaTM4Ni9wYy5jCkBAIC0xMDksNiArMTA5LDkgQEAgc3RhdGljIHN0cnVjdCBlODIw X2VudHJ5ICplODIwX3RhYmxlOwogc3RhdGljIHVuc2lnbmVkIGU4MjBfZW50cmllczsKIHN0cnVj dCBocGV0X2Z3X2NvbmZpZyBocGV0X2NmZyA9IHsuY291bnQgPSBVSU5UOF9NQVh9OwogCisvKiBQ aHlzaWNhbCBBZGRyZXNzIG9mIFBWSCBlbnRyeSBwb2ludCByZWFkIGZyb20ga2VybmVsIEVMRiBO T1RFICovCitzdGF0aWMgc2l6ZV90IHB2aF9zdGFydF9hZGRyOworCiB2b2lkIGdzaV9oYW5kbGVy KHZvaWQgKm9wYXF1ZSwgaW50IG4sIGludCBsZXZlbCkKIHsKICAgICBHU0lTdGF0ZSAqcyA9IG9w YXF1ZTsKQEAgLTgzNCw2ICs4MzcsMjY3IEBAIHN0cnVjdCBzZXR1cF9kYXRhIHsKICAgICB1aW50 OF90IGRhdGFbMF07CiB9IF9fYXR0cmlidXRlX18oKHBhY2tlZCkpOwogCisvKgorICogU2VhcmNo IHRocm91Z2ggdGhlIEVMRiBOb3RlcyBmb3IgYW4gZW50cnkgd2l0aCB0aGUgZ2l2ZW4KKyAqIEVM RiBOb3RlIHR5cGUKKyAqLworc3RhdGljIHZvaWQgKmdldF9lbGZfbm90ZV90eXBlKHZvaWQgKmVo ZHIsIHZvaWQgKnBoZHIsIGJvb2wgZWxmX2lzNjQsCisgICAgc2l6ZV90IGVsZl9ub3RlX3R5cGUp Cit7CisgICAgdm9pZCAqbmhkciA9IE5VTEw7CisgICAgc2l6ZV90IG5oZHJfc2l6ZSA9IGVsZl9p czY0ID8gc2l6ZW9mKEVsZjY0X05oZHIpIDogc2l6ZW9mKEVsZjMyX05oZHIpOworICAgIHNpemVf dCBlbGZfbm90ZV9lbnRyeV9zeiA9IDA7CisgICAgc2l6ZV90IHBoZHJfb2ZmOworICAgIHNpemVf dCBwaGRyX2FsaWduOworICAgIHNpemVfdCBwaGRyX21lbXN6OworICAgIHNpemVfdCBuaGRyX25h bWVzejsKKyAgICBzaXplX3Qgbmhkcl9kZXNjc3o7CisgICAgc2l6ZV90IG5vdGVfdHlwZTsKKwor ICAgIHBoZHJfb2ZmID0gZWxmX2lzNjQgPworICAgICAgICAoKEVsZjY0X1BoZHIgKilwaGRyKS0+ cF9vZmZzZXQgOiAoKEVsZjMyX1BoZHIgKilwaGRyKS0+cF9vZmZzZXQ7CisgICAgcGhkcl9hbGln biA9IGVsZl9pczY0ID8KKyAgICAgICAgKChFbGY2NF9QaGRyICopcGhkciktPnBfYWxpZ24gOiAo KEVsZjMyX1BoZHIgKilwaGRyKS0+cF9hbGlnbjsKKyAgICBwaGRyX21lbXN6ID0gZWxmX2lzNjQg PworICAgICAgICAoKEVsZjY0X1BoZHIgKilwaGRyKS0+cF9tZW1zeiA6ICgoRWxmMzJfUGhkciAq KXBoZHIpLT5wX21lbXN6OworCisgICAgbmhkciA9IGVoZHIgKyBwaGRyX29mZjsKKyAgICBub3Rl X3R5cGUgPSBlbGZfaXM2NCA/CisgICAgICAgICgoRWxmNjRfTmhkciAqKW5oZHIpLT5uX3R5cGUg OiAoKEVsZjMyX05oZHIgKiluaGRyKS0+bl90eXBlOworICAgIG5oZHJfbmFtZXN6ID0gZWxmX2lz NjQgPworICAgICAgICAoKEVsZjY0X05oZHIgKiluaGRyKS0+bl9uYW1lc3ogOiAoKEVsZjMyX05o ZHIgKiluaGRyKS0+bl9uYW1lc3o7CisgICAgbmhkcl9kZXNjc3ogPSBlbGZfaXM2NCA/CisgICAg ICAgICgoRWxmNjRfTmhkciAqKW5oZHIpLT5uX2Rlc2NzeiA6ICgoRWxmMzJfTmhkciAqKW5oZHIp LT5uX2Rlc2NzejsKKworICAgIHdoaWxlIChub3RlX3R5cGUgIT0gZWxmX25vdGVfdHlwZSkgewor ICAgICAgICBlbGZfbm90ZV9lbnRyeV9zeiA9IG5oZHJfc2l6ZSArCisgICAgICAgICAgICBRRU1V X0FMSUdOX1VQKG5oZHJfbmFtZXN6LCBwaGRyX2FsaWduKSArCisgICAgICAgICAgICBRRU1VX0FM SUdOX1VQKG5oZHJfZGVzY3N6LCBwaGRyX2FsaWduKTsKKworICAgICAgICAvKgorICAgICAgICAg KiBWZXJpZnkgdGhhdCB3ZSBoYXZlbid0IGV4Y2VlZGVkIHRoZSBlbmQgb2YgdGhlIEVMRiBOb3Rl IHNlY3Rpb24uCisgICAgICAgICAqIElmIHdlIGhhdmUsIHRoZW4gdGhlcmUgaXMgbm8gbm90ZSBv ZiB0aGUgZ2l2ZW4gdHlwZSBwcmVzZW50CisgICAgICAgICAqIGluIHRoZSBFTEYgTm90ZXMuCisg ICAgICAgICAqLworICAgICAgICBpZiAocGhkcl9vZmYgKyBwaGRyX21lbXN6IDwgKChuaGRyIC0g ZWhkcikgKyBlbGZfbm90ZV9lbnRyeV9zeikpIHsKKyAgICAgICAgICAgIGVycm9yX3JlcG9ydCgi Tm90ZSB0eXBlICgweCVseCkgbm90IGZvdW5kIGluIEVMRiBOb3RlIHNlY3Rpb24iLAorICAgICAg ICAgICAgICAgIGVsZl9ub3RlX3R5cGUpOworICAgICAgICAgICAgcmV0dXJuIE5VTEw7CisgICAg ICAgIH0KKworICAgICAgICAvKiBza2lwIHRvIHRoZSBuZXh0IEVMRiBOb3RlIGVudHJ5ICovCisg ICAgICAgIG5oZHIgKz0gZWxmX25vdGVfZW50cnlfc3o7CisgICAgICAgIG5vdGVfdHlwZSA9IGVs Zl9pczY0ID8KKyAgICAgICAgICAgICgoRWxmNjRfTmhkciAqKW5oZHIpLT5uX3R5cGUgOiAoKEVs ZjMyX05oZHIgKiluaGRyKS0+bl90eXBlOworICAgICAgICBuaGRyX25hbWVzeiA9IGVsZl9pczY0 ID8KKyAgICAgICAgICAgICgoRWxmNjRfTmhkciAqKW5oZHIpLT5uX25hbWVzeiA6ICgoRWxmMzJf TmhkciAqKW5oZHIpLT5uX25hbWVzejsKKyAgICAgICAgbmhkcl9kZXNjc3ogPSBlbGZfaXM2NCA/ CisgICAgICAgICAgICAoKEVsZjY0X05oZHIgKiluaGRyKS0+bl9kZXNjc3ogOiAoKEVsZjMyX05o ZHIgKiluaGRyKS0+bl9kZXNjc3o7CisgICAgfQorCisgICAgcmV0dXJuIG5oZHI7Cit9CisKKy8q CisgKiBUaGUgZW50cnkgcG9pbnQgaW50byB0aGUga2VybmVsIGZvciBQVkggYm9vdCBpcyBkaWZm ZXJlbnQgZnJvbQorICogdGhlIG5hdGl2ZSBlbnRyeSBwb2ludC4gIFRoZSBQVkggZW50cnkgaXMg ZGVmaW5lZCBieSB0aGUgeDg2L0hWTQorICogZGlyZWN0IGJvb3QgQUJJIGFuZCBpcyBhdmFpbGFi bGUgaW4gYW4gRUxGTk9URSBpbiB0aGUga2VybmVsIGJpbmFyeS4KKyAqIFRoaXMgZnVuY3Rpb24g cmVhZHMgdGhlIEVMRiBoZWFkZXJzIG9mIHRoZSBiaW5hcnkgc3BlY2lmaWVkIG9uIHRoZQorICog Y29tbWFuZCBsaW5lIGJ5IC1rZXJuZWwgKHBhdGggY29udGFpbmVkIGluICdmaWxlbmFtZScpIGFu ZCBkaXNjb3ZlcnMKKyAqIHRoZSBQVkggZW50cnkgYWRkcmVzcyBmcm9tIHRoZSBhcHByb3ByaWF0 ZSBFTEYgTm90ZS4KKyAqCisgKiBUaGUgYWRkcmVzcyBvZiB0aGUgUFZIIGVudHJ5IHBvaW50IGlz IHNhdmVkIHRvIHRoZSAncHZoX3N0YXJ0X2FkZHInCisgKiBnbG9iYWwgdmFyaWFibGUuIFRoZSBF TEYgY2xhc3Mgb2YgdGhlIGJpbmFyeSBpcyByZXR1cm5lZCB2aWEgJ2VsZmNsYXNzJworICogKGFs dGhvdWdoIHRoZSBlbnRyeSBwb2ludCBpcyAzMi1iaXQsIHRoZSBrZXJuZWwgYmluYXJ5IGNhbiBi ZSBlaXRoZXIKKyAqIDMyLWJpdCBvciA2NC1iaXQpLgorICovCitzdGF0aWMgYm9vbCByZWFkX3B2 aF9zdGFydF9hZGRyX2VsZl9ub3RlKGNvbnN0IGNoYXIgKmZpbGVuYW1lLAorICAgIHVuc2lnbmVk IGNoYXIgKmVsZmNsYXNzKQoreworICAgIHZvaWQgKmVoZHIgPSBOVUxMOyAvKiBDYXN0IHRvIEVs ZjY0X0VoZHIgb3IgRWxmMzJfRWhkciAqLworICAgIHZvaWQgKnBoZHIgPSBOVUxMOyAvKiBDYXN0 IHRvIEVsZjY0X1BoZHIgb3IgRWxmMzJfUGhkciAqLworICAgIHZvaWQgKm5oZHIgPSBOVUxMOyAv KiBDYXN0IHRvIEVsZjY0X05oZHIgb3IgRWxmMzJfTmhkciAqLworICAgIHN0cnVjdCBzdGF0IHN0 YXRidWY7CisgICAgc2l6ZV90IGVoZHJfc2l6ZTsKKyAgICBzaXplX3QgcGhkcl9zaXplOworICAg IHNpemVfdCBuaGRyX3NpemU7CisgICAgc2l6ZV90IGVsZl9ub3RlX2RhdGFfYWRkcjsKKyAgICAv KiBFaGRyIGZpZWxkcyAqLworICAgIHNpemVfdCBlaGRyX3BvZmY7CisgICAgLyogUGhkciBmaWVs ZHMgKi8KKyAgICBzaXplX3QgcGhkcl9vZmY7CisgICAgc2l6ZV90IHBoZHJfYWxpZ247CisgICAg c2l6ZV90IHBoZHJfbWVtc3o7CisgICAgc2l6ZV90IHBoZHJfdHlwZTsKKyAgICAvKiBOaGRyIGZp ZWxkcyAqLworICAgIHNpemVfdCBuaGRyX25hbWVzejsKKyAgICBzaXplX3Qgbmhkcl9kZXNjc3o7 CisgICAgYm9vbCBlbGZfaXM2NDsKKyAgICBGSUxFICpmaWxlOworICAgIHVuaW9uIHsKKyAgICAg ICAgRWxmMzJfRWhkciBoMzI7CisgICAgICAgIEVsZjY0X0VoZHIgaDY0OworICAgIH0gZWxmX2hl YWRlcjsKKyAgICBFcnJvciAqZXJyID0gTlVMTDsKKworICAgIHB2aF9zdGFydF9hZGRyID0gMDsK KworICAgIGlmIChmaWxlbmFtZSA9PSBOVUxMKSB7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICB9CisKKyAgICBmaWxlID0gZm9wZW4oZmlsZW5hbWUsICJyYiIpOworICAgIGlmIChmaWxlID09 IE5VTEwpIHsKKyAgICAgICAgZXJyb3JfcmVwb3J0KCJmb3BlbiglcykgZmFpbGVkIiwgZmlsZW5h bWUpOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgaWYgKGZzdGF0KGZpbGVu byhmaWxlKSwgJnN0YXRidWYpIDwgMCkgeworICAgICAgICBlcnJvcl9yZXBvcnQoImZzdGF0KCkg ZmFpbGVkIG9uIGZpbGUgKCVzKSIsIGZpbGVuYW1lKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIH0KKworICAgIGxvYWRfZWxmX2hkcihmaWxlbmFtZSwgJmVsZl9oZWFkZXIsICZlbGZfaXM2 NCwgJmVycik7CisgICAgaWYgKGVycikgeworICAgICAgICBlcnJvcl9mcmVlKGVycik7CisgICAg ICAgIGZjbG9zZShmaWxlKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgICpl bGZjbGFzcyA9IGVsZl9pczY0ID8KKyAgICAgICAgZWxmX2hlYWRlci5oNjQuZV9pZGVudFtFSV9D TEFTU10gOiBlbGZfaGVhZGVyLmgzMi5lX2lkZW50W0VJX0NMQVNTXTsKKyAgICBpZiAoKmVsZmNs YXNzID09IEVMRkNMQVNTTk9ORSkgeworICAgICAgICBlcnJvcl9yZXBvcnQoImtlcm5lbCBiaW5h cnkgKCVzKSBpcyBFTEZDTEFTU05PTkUiLCBmaWxlbmFtZSk7CisgICAgICAgIGZjbG9zZShmaWxl KTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIGVoZHJfc2l6ZSA9IGVsZl9p czY0ID8gc2l6ZW9mKEVsZjY0X0VoZHIpIDogc2l6ZW9mKEVsZjMyX0VoZHIpOworICAgIHBoZHJf c2l6ZSA9IGVsZl9pczY0ID8gc2l6ZW9mKEVsZjY0X1BoZHIpIDogc2l6ZW9mKEVsZjMyX1BoZHIp OworICAgIG5oZHJfc2l6ZSA9IGVsZl9pczY0ID8gc2l6ZW9mKEVsZjY0X05oZHIpIDogc2l6ZW9m KEVsZjMyX05oZHIpOworCisgICAgLyogV2UgaGF2ZSBhbHJlYWR5IHZhbGlkYXRlZCB0aGUgRUxG IGhlYWRlciB3aGVuIGNhbGxpbmcgZWxmX2xvYWRfaGRyKCkgKi8KKworICAgIGVoZHIgPSBtbWFw KDAsIHN0YXRidWYuc3Rfc2l6ZSwKKyAgICAgICAgUFJPVF9SRUFEIHwgUFJPVF9XUklURSwgTUFQ X1BSSVZBVEUsIGZpbGVubyhmaWxlKSwgMCk7CisgICAgaWYgKGVoZHIgPT0gTUFQX0ZBSUxFRCkg eworICAgICAgICBlcnJvcl9yZXBvcnQoIkZhaWxlZCB0byBtbWFwIGtlcm5lbCBiaW5hcnkgKCVz KSIsIGZpbGVuYW1lKTsKKyAgICAgICAgZ290byBkb25lOworICAgIH0KKworICAgIC8qCisgICAg ICogU2VhcmNoIHRocm91Z2ggdGhlIHByb2dyYW0gZXhlY3V0aW9uIGhlYWRlciBmb3IgdGhlCisg ICAgICogRUxGIE5vdGUgc2VjdGlvbi4KKyAgICAgKi8KKworICAgIGVoZHJfcG9mZiA9IGVsZl9p czY0ID8KKyAgICAgICAgKChFbGY2NF9FaGRyICopKGVoZHIpKS0+ZV9waG9mZiA6ICgoRWxmMzJf RWhkciAqKShlaGRyKSktPmVfcGhvZmY7CisgICAgaWYgKHN0YXRidWYuc3Rfc2l6ZSA8IChlaGRy X3NpemUgKyBlaGRyX3BvZmYpKSB7CisgICAgICAgIGVycm9yX3JlcG9ydCgiRUxGIE5PVEUgc2Vj dGlvbiBleGNlZWRzIGZpbGUgKCVzKSBzaXplIiwKKyAgICAgICAgICAgIGZpbGVuYW1lKTsKKyAg ICAgICAgZ290byBkb25lOworICAgIH0KKworICAgIHBoZHIgPSBlaGRyICsgZWhkcl9wb2ZmOwor ICAgIHBoZHJfdHlwZSA9IGVsZl9pczY0ID8KKyAgICAgICAgKChFbGY2NF9QaGRyICopcGhkcikt PnBfdHlwZSA6ICgoRWxmMzJfUGhkciAqKXBoZHIpLT5wX3R5cGU7CisgICAgd2hpbGUgKHBoZHIg IT0gTlVMTCAmJiBwaGRyX3R5cGUgIT0gUFRfTk9URSkgeworICAgICAgICBpZiAoc3RhdGJ1Zi5z dF9zaXplIDwgKChwaGRyIC0gZWhkcikgKyBwaGRyX3NpemUpKSB7CisgICAgICAgICAgICBlcnJv cl9yZXBvcnQoIkVMRiBQcm9ncmFtIGhlYWRlcnMgaW4gZmlsZSAoJXMpIHRvbyBzaG9ydCIsCisg ICAgICAgICAgICAgICAgZmlsZW5hbWUpOworICAgICAgICAgICAgZ290byBkb25lOworICAgICAg ICB9CisgICAgICAgIHBoZHIgKz0gcGhkcl9zaXplOworICAgICAgICBwaGRyX3R5cGUgPSBlbGZf aXM2NCA/CisgICAgICAgICAgICAoKEVsZjY0X1BoZHIgKilwaGRyKS0+cF90eXBlIDogKChFbGYz Ml9QaGRyICopcGhkciktPnBfdHlwZTsKKyAgICB9CisKKyAgICBwaGRyX29mZiA9IGVsZl9pczY0 ID8KKyAgICAgICAgKChFbGY2NF9QaGRyICopcGhkciktPnBfb2Zmc2V0IDogKChFbGYzMl9QaGRy ICopcGhkciktPnBfb2Zmc2V0OworICAgIHBoZHJfYWxpZ24gPSBlbGZfaXM2NCA/CisgICAgICAg ICgoRWxmNjRfUGhkciAqKXBoZHIpLT5wX2FsaWduIDogKChFbGYzMl9QaGRyICopcGhkciktPnBf YWxpZ247CisgICAgcGhkcl9tZW1zeiA9IGVsZl9pczY0ID8KKyAgICAgICAgKChFbGY2NF9QaGRy ICopcGhkciktPnBfbWVtc3ogOiAoKEVsZjMyX1BoZHIgKilwaGRyKS0+cF9tZW1zejsKKworICAg IC8qCisgICAgICogY2hlY2sgdGhhdCB0aGUgc3RhcnQgb2YgdGhlIEVMRiBOb3RlIHNlY3Rpb24g aXMgd2l0aGluIHRoZSBib3VuZHMKKyAgICAgKiBvZiB0aGUga2VybmVsIEVMRiBiaW5hcnkKKyAg ICAgKi8KKyAgICBpZiAoc3RhdGJ1Zi5zdF9zaXplIDwgKGVoZHJfcG9mZiArIHBoZHJfc2l6ZSAr IHBoZHJfb2ZmKSkgeworICAgICAgICBlcnJvcl9yZXBvcnQoIlN0YXJ0IG9mIEVMRiBub3RlIHNl Y3Rpb24gb3V0c2lkZSBvZiBmaWxlICglcykgYm91bmRzIiwKKyAgICAgICAgICAgIGZpbGVuYW1l KTsKKyAgICAgICAgZ290byBkb25lOworICAgIH0KKyAgICAvKgorICAgICAqIGNoZWNrIHRoYXQg dGhlIGVuZCBvZiB0aGUgRUxGIE5vdGUgc2VjdGlvbiBpcyB3aXRoaW4gdGhlIGJvdW5kcworICAg ICAqIG9mIHRoZSBrZXJuZWwgRUxGIGJpbmFyeQorICAgICAqLworICAgIGlmIChzdGF0YnVmLnN0 X3NpemUgPCAocGhkcl9vZmYgKyBwaGRyX21lbXN6KSkgeworICAgICAgICBlcnJvcl9yZXBvcnQo IkVuZCBvZiBFTEYgbm90ZSBzZWN0aW9uIG91dHNpZGUgb2YgZmlsZSAoJXMpIGJvdW5kcyIsCisg ICAgICAgICAgICBmaWxlbmFtZSk7CisgICAgICAgIGdvdG8gZG9uZTsKKyAgICB9CisKKyAgICAv KgorICAgICAqIFNlYXJjaCB0aHJvdWdoIHRoZSBFTEYgTm90ZXMgZm9yIGFuIGVudHJ5IHdpdGgg dGhlCisgICAgICogUGh5c2ljYWwgQWRkcmVzcyAoUEEpIG9mIHRoZSBQVkggZW50cnkgcG9pbnQu CisgICAgICovCisgICAgbmhkciA9IGdldF9lbGZfbm90ZV90eXBlKGVoZHIsIHBoZHIsIGVsZl9p czY0LCBYRU5fRUxGTk9URV9QSFlTMzJfRU5UUlkpOworICAgIGlmIChuaGRyID09IE5VTEwpIHsK KyAgICAgICAgZXJyb3JfcmVwb3J0KCJObyBQVkggRW50cnkgZGV0YWlscyBpbiBrZXJuZWwgKCVz KSBFTEYgTm90ZSBzZWN0aW9uIiwKKyAgICAgICAgICAgIGZpbGVuYW1lKTsKKyAgICAgICAgZ290 byBkb25lOworICAgIH0KKworICAgIC8qCisgICAgICogVmVyaWZ5IHRoYXQgdGhlIHJldHVybmVk IEVMRiBOb3RlIGhlYWRlciBkb2Vzbid0IGV4Y2VlZCB0aGUKKyAgICAgKiBlbmQgb2YgdGhlIGtl cm5lbCBmaWxlCisgICAgICovCisgICAgaWYgKHN0YXRidWYuc3Rfc2l6ZSA8ICgobmhkciAtIGVo ZHIpKSkgeworICAgICAgICBlcnJvcl9yZXBvcnQoIkVMRiBOaGRyIG9mZnNldCAoMHglbHgpIGV4 Y2VlZHMgZmlsZSAoJXMpIGJvdW5kcyAoJWxkKSIsCisgICAgICAgICAgICAobmhkciAtIGVoZHIp LCBmaWxlbmFtZSwgc3RhdGJ1Zi5zdF9zaXplKTsKKyAgICAgICAgZ290byBkb25lOworICAgIH0K KworICAgIG5oZHJfbmFtZXN6ID0gZWxmX2lzNjQgPworICAgICAgICAoKEVsZjY0X05oZHIgKilu aGRyKS0+bl9uYW1lc3ogOiAoKEVsZjMyX05oZHIgKiluaGRyKS0+bl9uYW1lc3o7CisgICAgbmhk cl9kZXNjc3ogPSBlbGZfaXM2NCA/CisgICAgICAgICgoRWxmNjRfTmhkciAqKW5oZHIpLT5uX2Rl c2NzeiA6ICgoRWxmMzJfTmhkciAqKW5oZHIpLT5uX2Rlc2NzejsKKworICAgIC8qCisgICAgICog VmVyaWZ5IHRoYXQgdGhlIEVMRiBOb3RlIGNvbnRlbnRzIGRvbid0IGV4Y2VlZCB0aGUgZW5kIG9m IHRoZQorICAgICAqIGtlcm5lbCBmaWxlCisgICAgICovCisgICAgaWYgKHN0YXRidWYuc3Rfc2l6 ZSA8ICgobmhkciAtIGVoZHIpKSArIG5oZHJfc2l6ZSArCisgICAgICAgIFFFTVVfQUxJR05fVVAo bmhkcl9uYW1lc3osIHBoZHJfYWxpZ24pICsKKyAgICAgICAgUUVNVV9BTElHTl9VUChuaGRyX2Rl c2NzeiwgcGhkcl9hbGlnbikpIHsKKyAgICAgICAgZXJyb3JfcmVwb3J0KCJFTEYgTmhkciBjb250 ZW50cyAoMHglbHgpIGV4Y2VlZHMgZmlsZSBib3VuZHMgKCVsZCkiLAorICAgICAgICAgICAgKG5o ZHIgLSBlaGRyKSArIG5oZHJfc2l6ZSArIFFFTVVfQUxJR05fVVAobmhkcl9uYW1lc3osIHBoZHJf YWxpZ24pICsKKyAgICAgICAgICAgIFFFTVVfQUxJR05fVVAobmhkcl9kZXNjc3osIHBoZHJfYWxp Z24pLCBzdGF0YnVmLnN0X3NpemUpOworICAgICAgICBnb3RvIGRvbmU7CisgICAgfQorCisgICAg ZWxmX25vdGVfZGF0YV9hZGRyID0KKyAgICAgICAgKHNpemVfdCluaGRyICsgbmhkcl9zaXplICsg UUVNVV9BTElHTl9VUChuaGRyX25hbWVzeiwgcGhkcl9hbGlnbik7CisKKyAgICBwdmhfc3RhcnRf YWRkciA9ICooc2l6ZV90ICopZWxmX25vdGVfZGF0YV9hZGRyOworCisgICAgLyoKKyAgICAgKiBW ZXJpZnkgdGhhdCB0aGUgUFZIIEVudHJ5IHBvaW50IGFkZHJlc3MgZG9lcyBub3QgZXhjZWVkIHRo ZQorICAgICAqIGJvdW5kcyBvZiB0aGUga2VybmVsIGZpbGUuCisgICAgICovCisgICAgaWYgKHN0 YXRidWYuc3Rfc2l6ZSA8IHB2aF9zdGFydF9hZGRyKSB7CisgICAgICAgIGVycm9yX3JlcG9ydCgi UFZIIEVMRiBub3RlIGFkZHIgKDB4JWx4KSBleGNlZWRzIGZpbGUgKCVzKSBib3VuZHMgKCVsZCki LAorICAgICAgICAgICAgKGVsZl9ub3RlX2RhdGFfYWRkciAtIChzaXplX3QpZWhkciksIGZpbGVu YW1lLCBzdGF0YnVmLnN0X3NpemUpOworICAgICAgICBwdmhfc3RhcnRfYWRkciA9IDA7CisgICAg ICAgIGdvdG8gZG9uZTsKKyAgICB9CisKK2RvbmU6CisgICAgKHZvaWQpIG11bm1hcChlaGRyLCBz dGF0YnVmLnN0X3NpemUpOworICAgIHJldHVybiBwdmhfc3RhcnRfYWRkciAhPSAwOworfQorCiBz dGF0aWMgdm9pZCBsb2FkX2xpbnV4KFBDTWFjaGluZVN0YXRlICpwY21zLAogICAgICAgICAgICAg ICAgICAgICAgICBGV0NmZ1N0YXRlICpmd19jZmcpCiB7CkBAIC0xMzM0LDkgKzE1OTgsMTEgQEAg dm9pZCBwY19tZW1vcnlfaW5pdChQQ01hY2hpbmVTdGF0ZSAqcGNtcywKICAgICBpbnQgbGludXhf Ym9vdCwgaTsKICAgICBNZW1vcnlSZWdpb24gKnJhbSwgKm9wdGlvbl9yb21fbXI7CiAgICAgTWVt b3J5UmVnaW9uICpyYW1fYmVsb3dfNGcsICpyYW1fYWJvdmVfNGc7Ci0gICAgRldDZmdTdGF0ZSAq ZndfY2ZnOworICAgIEZXQ2ZnU3RhdGUgKmZ3X2NmZyA9IE5VTEw7CisgICAgdW5zaWduZWQgY2hh ciBjbGFzcyA9IEVMRkNMQVNTTk9ORTsKICAgICBNYWNoaW5lU3RhdGUgKm1hY2hpbmUgPSBNQUNI SU5FKHBjbXMpOwogICAgIFBDTWFjaGluZUNsYXNzICpwY21jID0gUENfTUFDSElORV9HRVRfQ0xB U1MocGNtcyk7CisgICAgY29uc3QgY2hhciAqa2VybmVsX2ZpbGVuYW1lID0gbWFjaGluZS0+a2Vy bmVsX2ZpbGVuYW1lOwogCiAgICAgYXNzZXJ0KG1hY2hpbmUtPnJhbV9zaXplID09IHBjbXMtPmJl bG93XzRnX21lbV9zaXplICsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGNtcy0+ YWJvdmVfNGdfbWVtX3NpemUpOwpAQCAtMTQxOCw2ICsxNjg0LDEwIEBAIHZvaWQgcGNfbWVtb3J5 X2luaXQoUENNYWNoaW5lU3RhdGUgKnBjbXMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAmbWFjaGluZS0+ZGV2aWNlX21lbW9yeS0+bXIpOwogICAgIH0KIAorICAgIGlmIChs aW51eF9ib290KSB7CisgICAgICAgIHJlYWRfcHZoX3N0YXJ0X2FkZHJfZWxmX25vdGUoa2VybmVs X2ZpbGVuYW1lLCAmY2xhc3MpOworICAgIH0KKwogICAgIC8qIEluaXRpYWxpemUgUEMgc3lzdGVt IGZpcm13YXJlICovCiAgICAgcGNfc3lzdGVtX2Zpcm13YXJlX2luaXQocm9tX21lbW9yeSwgIXBj bWMtPnBjaV9lbmFibGVkKTsKIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9lbGYuaCBiL2luY2x1ZGUv ZWxmLmgKaW5kZXggYzE1MTE2NGI2M2RhLi4xZjgyYzdhNzEyNGIgMTAwNjQ0Ci0tLSBhL2luY2x1 ZGUvZWxmLmgKKysrIGIvaW5jbHVkZS9lbGYuaApAQCAtMTU4NSw2ICsxNTg1LDE2IEBAIHR5cGVk ZWYgc3RydWN0IGVsZjY0X3NoZHIgewogI2RlZmluZSBOVF9BUk1fSFdfV0FUQ0ggMHg0MDMgICAg ICAgICAgIC8qIEFSTSBoYXJkd2FyZSB3YXRjaHBvaW50IHJlZ2lzdGVycyAqLwogI2RlZmluZSBO VF9BUk1fU1lTVEVNX0NBTEwgICAgICAweDQwNCAgIC8qIEFSTSBzeXN0ZW0gY2FsbCBudW1iZXIg Ki8KIAorLyoKKyAqIFBoeXNpY2FsIGVudHJ5IHBvaW50IGludG8gdGhlIGtlcm5lbC4KKyAqCisg KiAzMmJpdCBlbnRyeSBwb2ludCBpbnRvIHRoZSBrZXJuZWwuIFdoZW4gcmVxdWVzdGVkIHRvIGxh dW5jaCB0aGUKKyAqIGd1ZXN0IGtlcm5lbCwgdXNlIHRoaXMgZW50cnkgcG9pbnQgdG8gbGF1bmNo IHRoZSBndWVzdCBpbiAzMi1iaXQKKyAqIHByb3RlY3RlZCBtb2RlIHdpdGggcGFnaW5nIGRpc2Fi bGVkLgorICoKKyAqIFsgQ29ycmVzcG9uZGluZyBkZWZpbml0aW9uIGluIExpbnV4IGtlcm5lbDog aW5jbHVkZS94ZW4vaW50ZXJmYWNlL2VsZm5vdGUuaCBdCisgKi8KKyNkZWZpbmUgWEVOX0VMRk5P VEVfUEhZUzMyX0VOVFJZICAgIDE4ICAvKiAweDEyICovCiAKIC8qIE5vdGUgaGVhZGVyIGluIGEg UFRfTk9URSBzZWN0aW9uICovCiB0eXBlZGVmIHN0cnVjdCBlbGYzMl9ub3RlIHsKLS0gCjEuOC4z LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4t ZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczov L2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs