From: Norbert Manthey Subject: [PATCH L1TF v9 7/7] common/grant_table: block speculative out-of-bound accesses Date: Wed, 27 Feb 2019 17:13:40 +0100 Message-ID: <1551284020-7050-8-git-send-email-nmanthey@amazon.de> References: <1551284020-7050-1-git-send-email-nmanthey@amazon.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gz1tK-0006Kt-LF for xen-devel@lists.xenproject.org; Wed, 27 Feb 2019 16:17:06 +0000 In-Reply-To: <1551284020-7050-1-git-send-email-nmanthey@amazon.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Tim Deegan , Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Dario Faggioli , Martin Pohlack , Pawel Wieczorkiewicz , Julien Grall , David Woodhouse , Jan Beulich , Martin Mazein , Julian Stecklina , Bjoern Doebel , Norbert Manthey List-Id: xen-devel@lists.xenproject.org R3Vlc3RzIGNhbiBpc3N1ZSBncmFudCB0YWJsZSBvcGVyYXRpb25zIGFuZCBwcm92aWRlIGd1ZXN0 IGNvbnRyb2xsZWQKZGF0YSB0byB0aGVtLiBUaGlzIGRhdGEgaXMgYWxzbyB1c2VkIGZvciBtZW1v cnkgbG9hZHMuIFRvIGF2b2lkCnNwZWN1bGF0aXZlIG91dC1vZi1ib3VuZCBhY2Nlc3Nlcywgd2Ug dXNlIHRoZSBhcnJheV9pbmRleF9ub3NwZWMgbWFjcm8Kd2hlcmUgYXBwbGljYWJsZS4gSG93ZXZl ciwgdGhlcmUgYXJlIGFsc28gbWVtb3J5IGFjY2Vzc2VzIHRoYXQgY2Fubm90CmJlIHByb3RlY3Rl ZCBieSBhIHNpbmdsZSBhcnJheSBwcm90ZWN0aW9uLCBvciBtdWx0aXBsZSBhY2Nlc3NlcyBpbiBh CnJvdy4gVG8gcHJvdGVjdCB0aGVzZSwgYSBub3NwZWMgYmFycmllciBpcyBwbGFjZWQgYmV0d2Vl biB0aGUgYWN0dWFsCnJhbmdlIGNoZWNrIGFuZCB0aGUgYWNjZXNzIHZpYSB0aGUgYmxvY2tfc3Bl Y3VsYXRpb24gbWFjcm8uCgpBcyBkaWZmZXJlbnQgdmVyc2lvbnMgb2YgZ3JhbnQgdGFibGVzIHVz ZSBzdHJ1Y3R1cmVzIG9mIGRpZmZlcmVudCBzaXplLAphbmQgdGhlIHN0YXR1cyBpcyBlbmNvZGVk IGluIGFuIGFycmF5IGZvciB2ZXJzaW9uIDIsIHNwZWN1bGF0aXZlCmV4ZWN1dGlvbiBtaWdodCBw ZXJmb3JtIG91dC1vZi1ib3VuZCBhY2Nlc3NlcyBvZiB2ZXJzaW9uIDIgd2hpbGUKdGhlIHRhYmxl IGlzIGFjdHVhbGx5IHVzaW5nIHZlcnNpb24gMS4gSGVuY2UsIHNwZWN1bGF0aW9uIGlzIHByZXZl bnRlZAp3aGVuIGFjY2Vzc2luZyBtZW1vcnkgYmFzZWQgb24gdGhlIGdyYW50IHRhYmxlIHZlcnNp b24uCgpTcGVjdWxhdGl2ZSBleGVjdXRpb24gaXMgbm90IGJsb2NrZWQgaW4gY2FzZSBvbmUgb2Yg dGhlIGZvbGxvd2luZwpwcm9wZXJ0aWVzIGlzIHRydWU6CiAtIHBhdGggY2Fubm90IGJlIHRyaWdn ZXJlZCBieSB0aGUgZ3Vlc3QKIC0gcGF0aCBkb2VzIG5vdCByZXR1cm4gdG8gdGhlIGd1ZXN0CiAt IHBhdGggZG9lcyBub3QgcmVzdWx0IGluIGFuIG91dC1vZi1ib3VuZCBhY2Nlc3MKIC0gcGF0aCBj YW5ub3QgYmUgZXhlY3V0ZWQgcmVwZWF0ZWRseQpPbmx5IHRoZSBjb21iaW5hdGlvbiBvZiB0aGUg YWJvdmUgcHJvcGVydGllcyBhbGxvd3MgdG8gYWN0dWFsbHkgbGVhawpjb250aW51b3VzIGNodW5r cyBvZiBtZW1vcnkuIFRoZXJlZm9yZSwgd2Ugb25seSBhZGQgdGhlIHBlbmFsdHkgb2YKcHJvdGVj dGl2ZSBtZWNoYW5pc21zIGluIGNhc2UgYSBwb3RlbnRpYWwgc3BlY3VsYXRpdmUgb3V0LW9mLWJv dW5kCmFjY2VzcyBtYXRjaGVzIGFsbCB0aGUgYWJvdmUgcHJvcGVydGllcy4KClRoaXMgaXMgcGFy dCBvZiB0aGUgc3BlY3VsYXRpdmUgaGFyZGVuaW5nIGVmZm9ydC4KClNpZ25lZC1vZmYtYnk6IE5v cmJlcnQgTWFudGhleSA8bm1hbnRoZXlAYW1hem9uLmRlPgoKLS0tCgpOb3RlczoKICB2ODogZXh0 ZW5kZWQgY29tbWl0IG1lc3NhZ2Ugd2l0aCByZWFzb24gd2hlbiB0byBibG9jayBzcGVjdWxhdGlv bgogICAgICBmaXggb3JkZXIgYXNzZXJ0X3VucmVhY2hhYmxlIGFuZCBibG9ja19zcGVjdWxhdGlv bgogICAgICBhZGQgYmxvY2tfc3BlY3VsYXRpb24gdG8gZ250dGFiX2dldF9zdGF0dXNfZnJhbWVf bWZuCiAgICAgIHByb3RlY3QgdmVyc2lvbiBjb21wYXJpc29uIGluIGdudHRhYl9tYXBfZnJhbWUg YW5kIHJlbGVhc2VfZ3JhbnRfZm9yX2NvcHkKCiB4ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMgfCA5 NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCA3NCBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMgYi94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMKLS0t IGEveGVuL2NvbW1vbi9ncmFudF90YWJsZS5jCisrKyBiL3hlbi9jb21tb24vZ3JhbnRfdGFibGUu YwpAQCAtMzcsNiArMzcsNyBAQAogI2luY2x1ZGUgPHhlbi9wYWdpbmcuaD4KICNpbmNsdWRlIDx4 ZW4va2V5aGFuZGxlci5oPgogI2luY2x1ZGUgPHhlbi92bWFwLmg+CisjaW5jbHVkZSA8eGVuL25v c3BlYy5oPgogI2luY2x1ZGUgPHhzbS94c20uaD4KICNpbmNsdWRlIDxhc20vZmx1c2h0bGIuaD4K IApAQCAtMjAzLDggKzIwNCw5IEBAIHN0YXRpYyBpbmxpbmUgdW5zaWduZWQgaW50IG5yX3N0YXR1 c19mcmFtZXMoY29uc3Qgc3RydWN0IGdyYW50X3RhYmxlICpndCkKIH0KIAogI2RlZmluZSBNQVBU UkFDS19QRVJfUEFHRSAoUEFHRV9TSVpFIC8gc2l6ZW9mKHN0cnVjdCBncmFudF9tYXBwaW5nKSkK LSNkZWZpbmUgbWFwdHJhY2tfZW50cnkodCwgZSkgXAotICAgICgodCktPm1hcHRyYWNrWyhlKS9N QVBUUkFDS19QRVJfUEFHRV1bKGUpJU1BUFRSQUNLX1BFUl9QQUdFXSkKKyNkZWZpbmUgbWFwdHJh Y2tfZW50cnkodCwgZSkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcCisgICAgKCh0KS0+bWFwdHJhY2tbYXJyYXlfaW5kZXhfbm9zcGVjKGUsICh0KS0+ bWFwdHJhY2tfbGltaXQpIC8gICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgTUFQVFJBQ0tfUEVSX1BBR0VdWyhlKSAlIE1BUFRSQUNLX1BFUl9QQUdF XSkKIAogc3RhdGljIGlubGluZSB1bnNpZ25lZCBpbnQKIG5yX21hcHRyYWNrX2ZyYW1lcyhzdHJ1 Y3QgZ3JhbnRfdGFibGUgKnQpCkBAIC0yMjYsMTAgKzIyOCwyMyBAQCBucl9tYXB0cmFja19mcmFt ZXMoc3RydWN0IGdyYW50X3RhYmxlICp0KQogc3RhdGljIGdyYW50X2VudHJ5X2hlYWRlcl90ICoK IHNoYXJlZF9lbnRyeV9oZWFkZXIoc3RydWN0IGdyYW50X3RhYmxlICp0LCBncmFudF9yZWZfdCBy ZWYpCiB7Ci0gICAgaWYgKCB0LT5ndF92ZXJzaW9uID09IDEgKQorICAgIHN3aXRjaCAoIHQtPmd0 X3ZlcnNpb24gKQorICAgIHsKKyAgICBjYXNlIDE6CisgICAgICAgIC8qIFJldHVybmVkIHZhbHVl cyBzaG91bGQgYmUgaW5kZXBlbmRlbnQgb2Ygc3BlY3VsYXRpdmUgZXhlY3V0aW9uICovCisgICAg ICAgIGJsb2NrX3NwZWN1bGF0aW9uKCk7CiAgICAgICAgIHJldHVybiAoZ3JhbnRfZW50cnlfaGVh ZGVyX3QqKSZzaGFyZWRfZW50cnlfdjEodCwgcmVmKTsKLSAgICBlbHNlCisKKyAgICBjYXNlIDI6 CisgICAgICAgIC8qIFJldHVybmVkIHZhbHVlcyBzaG91bGQgYmUgaW5kZXBlbmRlbnQgb2Ygc3Bl Y3VsYXRpdmUgZXhlY3V0aW9uICovCisgICAgICAgIGJsb2NrX3NwZWN1bGF0aW9uKCk7CiAgICAg ICAgIHJldHVybiAmc2hhcmVkX2VudHJ5X3YyKHQsIHJlZikuaGRyOworICAgIH0KKworICAgIEFT U0VSVF9VTlJFQUNIQUJMRSgpOworICAgIGJsb2NrX3NwZWN1bGF0aW9uKCk7CisKKyAgICByZXR1 cm4gTlVMTDsKIH0KIAogLyogQWN0aXZlIGdyYW50IGVudHJ5IC0gdXNlZCBmb3Igc2hhZG93aW5n IEdURl9wZXJtaXRfYWNjZXNzIGdyYW50cy4gKi8KQEAgLTYzNCwxNCArNjQ5LDI0IEBAIHN0YXRp YyB1bnNpZ25lZCBpbnQgbnJfZ3JhbnRfZW50cmllcyhzdHJ1Y3QgZ3JhbnRfdGFibGUgKmd0KQog ICAgIGNhc2UgMToKICAgICAgICAgQlVJTERfQlVHX09OKGYyZShJTklUSUFMX05SX0dSQU5UX0ZS QU1FUywgMSkgPAogICAgICAgICAgICAgICAgICAgICAgR05UVEFCX05SX1JFU0VSVkVEX0VOVFJJ RVMpOworCisgICAgICAgIC8qIE1ha2Ugc3VyZSB3ZSByZXR1cm4gYSB2YWx1ZSBpbmRlcGVuZGVu dGx5IG9mIHNwZWN1bGF0aXZlIGV4ZWN1dGlvbiAqLworICAgICAgICBibG9ja19zcGVjdWxhdGlv bigpOwogICAgICAgICByZXR1cm4gZjJlKG5yX2dyYW50X2ZyYW1lcyhndCksIDEpOworCiAgICAg Y2FzZSAyOgogICAgICAgICBCVUlMRF9CVUdfT04oZjJlKElOSVRJQUxfTlJfR1JBTlRfRlJBTUVT LCAyKSA8CiAgICAgICAgICAgICAgICAgICAgICBHTlRUQUJfTlJfUkVTRVJWRURfRU5UUklFUyk7 CisKKyAgICAgICAgLyogTWFrZSBzdXJlIHdlIHJldHVybiBhIHZhbHVlIGluZGVwZW5kZW50bHkg b2Ygc3BlY3VsYXRpdmUgZXhlY3V0aW9uICovCisgICAgICAgIGJsb2NrX3NwZWN1bGF0aW9uKCk7 CiAgICAgICAgIHJldHVybiBmMmUobnJfZ3JhbnRfZnJhbWVzKGd0KSwgMik7CiAjdW5kZWYgZjJl CiAgICAgfQogCisgICAgQVNTRVJUX1VOUkVBQ0hBQkxFKCk7CisgICAgYmxvY2tfc3BlY3VsYXRp b24oKTsKKwogICAgIHJldHVybiAwOwogfQogCkBAIC05NjMsOSArOTg4LDEzIEBAIG1hcF9ncmFu dF9yZWYoCiAgICAgICAgIFBJTl9GQUlMKHVubG9ja19vdXQsIEdOVFNUX2JhZF9nbnRyZWYsICJC YWQgcmVmICUjeCBmb3IgZCVkXG4iLAogICAgICAgICAgICAgICAgICBvcC0+cmVmLCByZ3QtPmRv bWFpbi0+ZG9tYWluX2lkKTsKIAotICAgIGFjdCA9IGFjdGl2ZV9lbnRyeV9hY3F1aXJlKHJndCwg b3AtPnJlZik7CisgICAgLyogVGhpcyBjYWxsIGVuc3VyZXMgdGhlIGFib3ZlIGNoZWNrIGNhbm5v dCBiZSBieXBhc3NlZCBzcGVjdWxhdGl2ZWx5ICovCiAgICAgc2hhaCA9IHNoYXJlZF9lbnRyeV9o ZWFkZXIocmd0LCBvcC0+cmVmKTsKLSAgICBzdGF0dXMgPSByZ3QtPmd0X3ZlcnNpb24gPT0gMSA/ ICZzaGFoLT5mbGFncyA6ICZzdGF0dXNfZW50cnkocmd0LCBvcC0+cmVmKTsKKyAgICBhY3QgPSBh Y3RpdmVfZW50cnlfYWNxdWlyZShyZ3QsIG9wLT5yZWYpOworCisgICAgLyogTWFrZSBzdXJlIHdl IGRvIG5vdCBhY2Nlc3MgbWVtb3J5IHNwZWN1bGF0aXZlbHkgKi8KKyAgICBzdGF0dXMgPSBldmFs dWF0ZV9ub3NwZWMocmd0LT5ndF92ZXJzaW9uID09IDEpID8gJnNoYWgtPmZsYWdzCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOiAmc3RhdHVzX2VudHJ5 KHJndCwgb3AtPnJlZik7CiAKICAgICAvKiBJZiBhbHJlYWR5IHBpbm5lZCwgY2hlY2sgdGhlIGFj dGl2ZSBkb21pZCBhbmQgYXZvaWQgcmVmY250IG92ZXJmbG93LiAqLwogICAgIGlmICggYWN0LT5w aW4gJiYKQEAgLTk4Nyw3ICsxMDE2LDcgQEAgbWFwX2dyYW50X3JlZigKIAogICAgICAgICBpZiAo ICFhY3QtPnBpbiApCiAgICAgICAgIHsKLSAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgZ2ZuID0g cmd0LT5ndF92ZXJzaW9uID09IDEgPworICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBnZm4gPSBl dmFsdWF0ZV9ub3NwZWMocmd0LT5ndF92ZXJzaW9uID09IDEpID8KICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc2hhcmVkX2VudHJ5X3YxKHJndCwgb3AtPnJlZikuZnJhbWUgOgogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzaGFyZWRfZW50cnlfdjIocmd0LCBvcC0+cmVm KS5mdWxsX3BhZ2UuZnJhbWU7CiAKQEAgLTEzMjEsNiArMTM1MCw5IEBAIHVubWFwX2NvbW1vbigK ICAgICAgICAgZ290byB1bmxvY2tfb3V0OwogICAgIH0KIAorICAgIC8qIE1ha2Ugc3VyZSB0aGUg YWJvdmUgYm91bmQgY2hlY2sgY2Fubm90IGJlIGJ5cGFzc2VkIHNwZWN1bGF0aXZlbHkgKi8KKyAg ICBibG9ja19zcGVjdWxhdGlvbigpOworCiAgICAgYWN0ID0gYWN0aXZlX2VudHJ5X2FjcXVpcmUo cmd0LCBvcC0+cmVmKTsKIAogICAgIC8qCkBAIC0xNDE4LDcgKzE0NTAsNyBAQCB1bm1hcF9jb21t b25fY29tcGxldGUoc3RydWN0IGdudHRhYl91bm1hcF9jb21tb24gKm9wKQogICAgIHN0cnVjdCBw YWdlX2luZm8gKnBnOwogICAgIHVpbnQxNl90ICpzdGF0dXM7CiAKLSAgICBpZiAoICFvcC0+ZG9u ZSApCisgICAgaWYgKCBldmFsdWF0ZV9ub3NwZWMoIW9wLT5kb25lKSApCiAgICAgewogICAgICAg ICAvKiB1bm1hcF9jb21tb24oKSBkaWRuJ3QgZG8gYW55dGhpbmcgLSBub3RoaW5nIHRvIGNvbXBs ZXRlLiAqLwogICAgICAgICByZXR1cm47CkBAIC0yMDI2LDYgKzIwNTgsNyBAQCBnbnR0YWJfcHJl cGFyZV9mb3JfdHJhbnNmZXIoCiAgICAgICAgIGdvdG8gZmFpbDsKICAgICB9CiAKKyAgICAvKiBU aGlzIGNhbGwgZW5zdXJlcyB0aGUgYWJvdmUgY2hlY2sgY2Fubm90IGJlIGJ5cGFzc2VkIHNwZWN1 bGF0aXZlbHkgKi8KICAgICBzaGEgPSBzaGFyZWRfZW50cnlfaGVhZGVyKHJndCwgcmVmKTsKIAog ICAgIHNjb21iby53b3JkID0gKih1MzIgKikmc2hhLT5mbGFnczsKQEAgLTIyMjMsNyArMjI1Niwx MSBAQCBnbnR0YWJfdHJhbnNmZXIoCiAgICAgICAgIG9rYXkgPSBnbnR0YWJfcHJlcGFyZV9mb3Jf dHJhbnNmZXIoZSwgZCwgZ29wLnJlZik7CiAgICAgICAgIHNwaW5fbG9jaygmZS0+cGFnZV9hbGxv Y19sb2NrKTsKIAotICAgICAgICBpZiAoIHVubGlrZWx5KCFva2F5KSB8fCB1bmxpa2VseShlLT5p c19keWluZykgKQorICAgICAgICAvKgorICAgICAgICAgKiBNYWtlIHN1cmUgdGhlIHJlZmVyZW5j ZSBib3VuZCBjaGVjayBpbiBnbnR0YWJfcHJlcGFyZV9mb3JfdHJhbnNmZXIKKyAgICAgICAgICog aXMgcmVzcGVjdGVkIGFuZCBzcGVjdWxhdGl2ZSBleGVjdXRpb24gaXMgYmxvY2tlZCBhY2NvcmRp bmdseQorICAgICAgICAgKi8KKyAgICAgICAgaWYgKCB1bmxpa2VseSghZXZhbHVhdGVfbm9zcGVj KG9rYXkpKSB8fCB1bmxpa2VseShlLT5pc19keWluZykgKQogICAgICAgICB7CiAgICAgICAgICAg ICBib29sX3QgZHJvcF9kb21fcmVmID0gIWRvbWFpbl9hZGp1c3RfdG90X3BhZ2VzKGUsIC0xKTsK IApAQCAtMjI1Myw3ICsyMjkwLDcgQEAgZ250dGFiX3RyYW5zZmVyKAogICAgICAgICBncmFudF9y ZWFkX2xvY2soZS0+Z3JhbnRfdGFibGUpOwogICAgICAgICBhY3QgPSBhY3RpdmVfZW50cnlfYWNx dWlyZShlLT5ncmFudF90YWJsZSwgZ29wLnJlZik7CiAKLSAgICAgICAgaWYgKCBlLT5ncmFudF90 YWJsZS0+Z3RfdmVyc2lvbiA9PSAxICkKKyAgICAgICAgaWYgKCBldmFsdWF0ZV9ub3NwZWMoZS0+ Z3JhbnRfdGFibGUtPmd0X3ZlcnNpb24gPT0gMSkgKQogICAgICAgICB7CiAgICAgICAgICAgICBn cmFudF9lbnRyeV92MV90ICpzaGEgPSAmc2hhcmVkX2VudHJ5X3YxKGUtPmdyYW50X3RhYmxlLCBn b3AucmVmKTsKIApAQCAtMjMxNCw3ICsyMzUxLDcgQEAgcmVsZWFzZV9ncmFudF9mb3JfY29weSgK ICAgICBzaGEgPSBzaGFyZWRfZW50cnlfaGVhZGVyKHJndCwgZ3JlZik7CiAgICAgbWZuID0gYWN0 LT5tZm47CiAKLSAgICBpZiAoIHJndC0+Z3RfdmVyc2lvbiA9PSAxICkKKyAgICBpZiAoIGV2YWx1 YXRlX25vc3BlYyhyZ3QtPmd0X3ZlcnNpb24gPT0gMSkgKQogICAgIHsKICAgICAgICAgc3RhdHVz ID0gJnNoYS0+ZmxhZ3M7CiAgICAgICAgIHRkID0gcmQ7CkBAIC0yNDA4LDkgKzI0NDUsMTEgQEAg YWNxdWlyZV9ncmFudF9mb3JfY29weSgKICAgICAgICAgUElOX0ZBSUwoZ3RfdW5sb2NrX291dCwg R05UU1RfYmFkX2dudHJlZiwKICAgICAgICAgICAgICAgICAgIkJhZCBncmFudCByZWZlcmVuY2Ug JSN4XG4iLCBncmVmKTsKIAotICAgIGFjdCA9IGFjdGl2ZV9lbnRyeV9hY3F1aXJlKHJndCwgZ3Jl Zik7CisgICAgLyogVGhpcyBjYWxsIGVuc3VyZXMgdGhlIGFib3ZlIGNoZWNrIGNhbm5vdCBiZSBi eXBhc3NlZCBzcGVjdWxhdGl2ZWx5ICovCiAgICAgc2hhaCA9IHNoYXJlZF9lbnRyeV9oZWFkZXIo cmd0LCBncmVmKTsKLSAgICBpZiAoIHJndC0+Z3RfdmVyc2lvbiA9PSAxICkKKyAgICBhY3QgPSBh Y3RpdmVfZW50cnlfYWNxdWlyZShyZ3QsIGdyZWYpOworCisgICAgaWYgKCBldmFsdWF0ZV9ub3Nw ZWMocmd0LT5ndF92ZXJzaW9uID09IDEpICkKICAgICB7CiAgICAgICAgIHNoYTIgPSBOVUxMOwog ICAgICAgICBzdGF0dXMgPSAmc2hhaC0+ZmxhZ3M7CkBAIC0yODI2LDYgKzI4NjUsOSBAQCBzdGF0 aWMgaW50IGdudHRhYl9jb3B5X2J1Zihjb25zdCBzdHJ1Y3QgZ250dGFiX2NvcHkgKm9wLAogICAg ICAgICAgICAgICAgICBvcC0+ZGVzdC5vZmZzZXQsIGRlc3QtPnB0ci5vZmZzZXQsCiAgICAgICAg ICAgICAgICAgIG9wLT5sZW4sIGRlc3QtPmxlbik7CiAKKyAgICAvKiBNYWtlIHN1cmUgdGhlIGFi b3ZlIGNoZWNrcyBhcmUgbm90IGJ5cGFzc2VkIHNwZWN1bGF0aXZlbHkgKi8KKyAgICBibG9ja19z cGVjdWxhdGlvbigpOworCiAgICAgbWVtY3B5KGRlc3QtPnZpcnQgKyBvcC0+ZGVzdC5vZmZzZXQs IHNyYy0+dmlydCArIG9wLT5zb3VyY2Uub2Zmc2V0LAogICAgICAgICAgICBvcC0+bGVuKTsKICAg ICBnbnR0YWJfbWFya19kaXJ0eShkZXN0LT5kb21haW4sIGRlc3QtPm1mbik7CkBAIC0yOTQ1LDcg KzI5ODcsNyBAQCBnbnR0YWJfc2V0X3ZlcnNpb24oWEVOX0dVRVNUX0hBTkRMRV9QQVJBTShnbnR0 YWJfc2V0X3ZlcnNpb25fdCkgdW9wKQogICAgIHN0cnVjdCBncmFudF90YWJsZSAqZ3QgPSBjdXJy ZC0+Z3JhbnRfdGFibGU7CiAgICAgZ3JhbnRfZW50cnlfdjFfdCByZXNlcnZlZF9lbnRyaWVzW0dO VFRBQl9OUl9SRVNFUlZFRF9FTlRSSUVTXTsKICAgICBpbnQgcmVzOwotICAgIHVuc2lnbmVkIGlu dCBpOworICAgIHVuc2lnbmVkIGludCBpLCBucl9lbnRzOwogCiAgICAgaWYgKCBjb3B5X2Zyb21f Z3Vlc3QoJm9wLCB1b3AsIDEpICkKICAgICAgICAgcmV0dXJuIC1FRkFVTFQ7CkBAIC0yOTY5LDcg KzMwMTEsOCBAQCBnbnR0YWJfc2V0X3ZlcnNpb24oWEVOX0dVRVNUX0hBTkRMRV9QQVJBTShnbnR0 YWJfc2V0X3ZlcnNpb25fdCkgdW9wKQogICAgICAqIGFyZSBhbGxvd2VkIHRvIGJlIGluIHVzZSAo eGVuc3RvcmUveGVuY29uc29sZSBrZWVwcyB0aGVtIG1hcHBlZCkuCiAgICAgICogKFlvdSBuZWVk IHRvIGNoYW5nZSB0aGUgdmVyc2lvbiBudW1iZXIgZm9yIGUuZy4ga2V4ZWMuKQogICAgICAqLwot ICAgIGZvciAoIGkgPSBHTlRUQUJfTlJfUkVTRVJWRURfRU5UUklFUzsgaSA8IG5yX2dyYW50X2Vu dHJpZXMoZ3QpOyBpKysgKQorICAgIG5yX2VudHMgPSBucl9ncmFudF9lbnRyaWVzKGd0KTsKKyAg ICBmb3IgKCBpID0gR05UVEFCX05SX1JFU0VSVkVEX0VOVFJJRVM7IGkgPCBucl9lbnRzOyBpKysg KQogICAgIHsKICAgICAgICAgaWYgKCByZWFkX2F0b21pYygmX2FjdGl2ZV9lbnRyeShndCwgaSku cGluKSAhPSAwICkKICAgICAgICAgewpAQCAtMzIxMSw2ICszMjU0LDkgQEAgc3dhcF9ncmFudF9y ZWYoZ3JhbnRfcmVmX3QgcmVmX2EsIGdyYW50X3JlZl90IHJlZl9iKQogICAgIGlmICggdW5saWtl bHkocmVmX2IgPj0gbnJfZ3JhbnRfZW50cmllcyhkLT5ncmFudF90YWJsZSkpKQogICAgICAgICBQ SU5fRkFJTChvdXQsIEdOVFNUX2JhZF9nbnRyZWYsICJCYWQgcmVmLWIgJSN4XG4iLCByZWZfYik7 CiAKKyAgICAvKiBNYWtlIHN1cmUgdGhlIGFib3ZlIGNoZWNrcyBhcmUgbm90IGJ5cGFzc2VkIHNw ZWN1bGF0aXZlbHkgKi8KKyAgICBibG9ja19zcGVjdWxhdGlvbigpOworCiAgICAgLyogU3dhcHBp bmcgdGhlIHNhbWUgcmVmIGlzIGEgbm8tb3AuICovCiAgICAgaWYgKCByZWZfYSA9PSByZWZfYiAp CiAgICAgICAgIGdvdG8gb3V0OwpAQCAtMzIyMyw3ICszMjY5LDcgQEAgc3dhcF9ncmFudF9yZWYo Z3JhbnRfcmVmX3QgcmVmX2EsIGdyYW50X3JlZl90IHJlZl9iKQogICAgIGlmICggYWN0X2ItPnBp biApCiAgICAgICAgIFBJTl9GQUlMKG91dCwgR05UU1RfZWFnYWluLCAicmVmIGIgJSN4IGJ1c3lc biIsIHJlZl9iKTsKIAotICAgIGlmICggZ3QtPmd0X3ZlcnNpb24gPT0gMSApCisgICAgaWYgKCBl dmFsdWF0ZV9ub3NwZWMoZ3QtPmd0X3ZlcnNpb24gPT0gMSkgKQogICAgIHsKICAgICAgICAgZ3Jh bnRfZW50cnlfdjFfdCBzaGFyZWQ7CiAKQEAgLTM2ODAsMTMgKzM3MjYsMTQgQEAgdm9pZCBncmFu dF90YWJsZV93YXJuX2FjdGl2ZV9ncmFudHMoc3RydWN0IGRvbWFpbiAqZCkKICAgICBzdHJ1Y3Qg Z3JhbnRfdGFibGUgKmd0ID0gZC0+Z3JhbnRfdGFibGU7CiAgICAgc3RydWN0IGFjdGl2ZV9ncmFu dF9lbnRyeSAqYWN0OwogICAgIGdyYW50X3JlZl90IHJlZjsKLSAgICB1bnNpZ25lZCBpbnQgbnJf YWN0aXZlID0gMDsKKyAgICB1bnNpZ25lZCBpbnQgbnJfYWN0aXZlID0gMCwgbnJfZW50czsKIAog I2RlZmluZSBXQVJOX0dSQU5UX01BWCAxMAogCiAgICAgZ3JhbnRfcmVhZF9sb2NrKGd0KTsKIAot ICAgIGZvciAoIHJlZiA9IDA7IHJlZiAhPSBucl9ncmFudF9lbnRyaWVzKGd0KTsgcmVmKysgKQor ICAgIG5yX2VudHMgPSBucl9ncmFudF9lbnRyaWVzKGd0KTsKKyAgICBmb3IgKCByZWYgPSAwOyBy ZWYgIT0gbnJfZW50czsgcmVmKysgKQogICAgIHsKICAgICAgICAgYWN0ID0gYWN0aXZlX2VudHJ5 X2FjcXVpcmUoZ3QsIHJlZik7CiAgICAgICAgIGlmICggIWFjdC0+cGluICkKQEAgLTM3NzEsNyAr MzgxOCw3IEBAIGludCBtZW1fc2hhcmluZ19ncmVmX3RvX2dmbihzdHJ1Y3QgZ3JhbnRfdGFibGUg Kmd0LCBncmFudF9yZWZfdCByZWYsCiAgICAgICAgIHJjID0gLUVJTlZBTDsKICAgICBlbHNlIGlm ICggcmVmID49IG5yX2dyYW50X2VudHJpZXMoZ3QpICkKICAgICAgICAgcmMgPSAtRU5PRU5UOwot ICAgIGVsc2UgaWYgKCBndC0+Z3RfdmVyc2lvbiA9PSAxICkKKyAgICBlbHNlIGlmICggZXZhbHVh dGVfbm9zcGVjKGd0LT5ndF92ZXJzaW9uID09IDEpICkKICAgICB7CiAgICAgICAgIGNvbnN0IGdy YW50X2VudHJ5X3YxX3QgKnNoYTEgPSAmc2hhcmVkX2VudHJ5X3YxKGd0LCByZWYpOwogCkBAIC0z NzkzLDcgKzM4NDAsNyBAQCBpbnQgbWVtX3NoYXJpbmdfZ3JlZl90b19nZm4oc3RydWN0IGdyYW50 X3RhYmxlICpndCwgZ3JhbnRfcmVmX3QgcmVmLAogICAgICAgICByYyA9IC1FTlhJTzsKICAgICBl bHNlIGlmICggIXJjICYmIHN0YXR1cyApCiAgICAgewotICAgICAgICBpZiAoIGd0LT5ndF92ZXJz aW9uID09IDEgKQorICAgICAgICBpZiAoIGV2YWx1YXRlX25vc3BlYyhndC0+Z3RfdmVyc2lvbiA9 PSAxKSApCiAgICAgICAgICAgICAqc3RhdHVzID0gZmxhZ3M7CiAgICAgICAgIGVsc2UKICAgICAg ICAgICAgICpzdGF0dXMgPSBzdGF0dXNfZW50cnkoZ3QsIHJlZik7CkBAIC0zODM2LDYgKzM4ODMs OSBAQCBzdGF0aWMgaW50IGdudHRhYl9nZXRfc3RhdHVzX2ZyYW1lX21mbihzdHJ1Y3QgZG9tYWlu ICpkLAogICAgICAgICAgICAgcmV0dXJuIC1FSU5WQUw7CiAgICAgfQogCisgICAgLyogTWFrZSBz dXJlIGlkeCBpcyBib3VuZGVkIHdydCBucl9zdGF0dXNfZnJhbWVzICovCisgICAgYmxvY2tfc3Bl Y3VsYXRpb24oKTsKKwogICAgICptZm4gPSBfbWZuKHZpcnRfdG9fbWZuKGd0LT5zdGF0dXNbaWR4 XSkpOwogICAgIHJldHVybiAwOwogfQpAQCAtMzg3Nyw3ICszOTI3LDcgQEAgaW50IGdudHRhYl9t YXBfZnJhbWUoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBpZHgsIGdmbl90IGdmbiwg bWZuX3QgKm1mbikKIAogICAgIGdyYW50X3dyaXRlX2xvY2soZ3QpOwogCi0gICAgaWYgKCBndC0+ Z3RfdmVyc2lvbiA9PSAyICYmIChpZHggJiBYRU5NQVBJRFhfZ3JhbnRfdGFibGVfc3RhdHVzKSAp CisgICAgaWYgKCBldmFsdWF0ZV9ub3NwZWMoZ3QtPmd0X3ZlcnNpb24gPT0gMikgJiYgKGlkeCAm IFhFTk1BUElEWF9ncmFudF90YWJsZV9zdGF0dXMpICkKICAgICB7CiAgICAgICAgIGlkeCAmPSB+ WEVOTUFQSURYX2dyYW50X3RhYmxlX3N0YXR1czsKICAgICAgICAgc3RhdHVzID0gdHJ1ZTsKQEAg LTM5MzUsNiArMzk4NSw3IEBAIHN0YXRpYyB2b2lkIGdudHRhYl91c2FnZV9wcmludChzdHJ1Y3Qg ZG9tYWluICpyZCkKICAgICBpbnQgZmlyc3QgPSAxOwogICAgIGdyYW50X3JlZl90IHJlZjsKICAg ICBzdHJ1Y3QgZ3JhbnRfdGFibGUgKmd0ID0gcmQtPmdyYW50X3RhYmxlOworICAgIHVuc2lnbmVk IGludCBucl9lbnRzOwogCiAgICAgcHJpbnRrKCIgICAgICAtLS0tLS0tLSBhY3RpdmUgLS0tLS0t LS0gICAgICAgLS0tLS0tLS0gc2hhcmVkIC0tLS0tLS0tXG4iKTsKICAgICBwcmludGsoIltyZWZd IGxvY2FsZG9tIG1mbiAgICAgIHBpbiAgICAgICAgICBsb2NhbGRvbSBnbWZuICAgICBmbGFnc1xu Iik7CkBAIC0zOTQ3LDcgKzM5OTgsOCBAQCBzdGF0aWMgdm9pZCBnbnR0YWJfdXNhZ2VfcHJpbnQo c3RydWN0IGRvbWFpbiAqcmQpCiAgICAgICAgICAgIG5yX2dyYW50X2ZyYW1lcyhndCksIGd0LT5t YXhfZ3JhbnRfZnJhbWVzLAogICAgICAgICAgICBucl9tYXB0cmFja19mcmFtZXMoZ3QpLCBndC0+ bWF4X21hcHRyYWNrX2ZyYW1lcyk7CiAKLSAgICBmb3IgKCByZWYgPSAwOyByZWYgIT0gbnJfZ3Jh bnRfZW50cmllcyhndCk7IHJlZisrICkKKyAgICBucl9lbnRzID0gbnJfZ3JhbnRfZW50cmllcyhn dCk7CisgICAgZm9yICggcmVmID0gMDsgcmVmICE9IG5yX2VudHM7IHJlZisrICkKICAgICB7CiAg ICAgICAgIHN0cnVjdCBhY3RpdmVfZ3JhbnRfZW50cnkgKmFjdDsKICAgICAgICAgc3RydWN0IGdy YW50X2VudHJ5X2hlYWRlciAqc2hhOwotLSAKMi43LjQKCgoKCkFtYXpvbiBEZXZlbG9wbWVudCBD ZW50ZXIgR2VybWFueSBHbWJICktyYXVzZW5zdHIuIDM4CjEwMTE3IEJlcmxpbgpHZXNjaGFlZnRz ZnVlaHJlcjogQ2hyaXN0aWFuIFNjaGxhZWdlciwgUmFsZiBIZXJicmljaApVc3QtSUQ6IERFIDI4 OSAyMzcgODc5CkVpbmdldHJhZ2VuIGFtIEFtdHNnZXJpY2h0IENoYXJsb3R0ZW5idXJnIEhSQiAx NDkxNzMgQgoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpo dHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs