From: Norbert Manthey Subject: [PATCH L1TF v8 9/9] common/grant_table: block speculative out-of-bound accesses Date: Mon, 25 Feb 2019 14:34:43 +0100 Message-ID: <1551101683-996-10-git-send-email-nmanthey@amazon.de> References: <1551101683-996-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 us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gyGRi-00078P-MN for xen-devel@lists.xenproject.org; Mon, 25 Feb 2019 13:37:26 +0000 In-Reply-To: <1551101683-996-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 b24uCgpUaGlzIGlzIHBhcnQgb2YgdGhlIHNwZWN1bGF0aXZlIGhhcmRlbmluZyBlZmZvcnQuCgpT aWduZWQtb2ZmLWJ5OiBOb3JiZXJ0IE1hbnRoZXkgPG5tYW50aGV5QGFtYXpvbi5kZT4KCi0tLQoK Tm90ZXM6CiAgdjg6IGZpeCBzdHlsZSBpbiBzaGFyZWRfZW50cnlfaGVhZGVyIHN3aXRjaCBzdGF0 ZW1lbnQgYW5kIGNvbW1lbnRzCiAgICAgIGFkZCBibG9ja19zcGVjdWxhdGlvbiBhbmQgYXNzZXJ0 X3VucmVhY2hhYmxlIHRvIHNoYXJlZF9lbnRyeV9oZWFkZXIKICAgICAgYWRkIGJsb2NrX3NwZWN1 bGF0aW9uIGFuZCBhc3NlcnRfdW5yZWFjaGFibGUgdG8gbnJfZ3JhbnRfZW50cmllcwogICAgICBk cm9wIGJsb2NrX3NwZWN1bGF0aW9uIGlmIHNoYXJlZF9lbnRyeV9oZWFkZXIgaXMgY2FsbGVkCiAg ICAgIHJlbmFtZSBndF9ucl9ncmFudF9lbnRyaWVzIGludG8gbnJfZW50cwoKIHhlbi9jb21tb24v Z3JhbnRfdGFibGUuYyB8IDg5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDY5IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL3hlbi9jb21tb24vZ3JhbnRfdGFibGUuYyBiL3hlbi9jb21tb24v Z3JhbnRfdGFibGUuYwotLS0gYS94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMKKysrIGIveGVuL2Nv bW1vbi9ncmFudF90YWJsZS5jCkBAIC0zNyw2ICszNyw3IEBACiAjaW5jbHVkZSA8eGVuL3BhZ2lu Zy5oPgogI2luY2x1ZGUgPHhlbi9rZXloYW5kbGVyLmg+CiAjaW5jbHVkZSA8eGVuL3ZtYXAuaD4K KyNpbmNsdWRlIDx4ZW4vbm9zcGVjLmg+CiAjaW5jbHVkZSA8eHNtL3hzbS5oPgogI2luY2x1ZGUg PGFzbS9mbHVzaHRsYi5oPgogCkBAIC0yMDMsOCArMjA0LDkgQEAgc3RhdGljIGlubGluZSB1bnNp Z25lZCBpbnQgbnJfc3RhdHVzX2ZyYW1lcyhjb25zdCBzdHJ1Y3QgZ3JhbnRfdGFibGUgKmd0KQog fQogCiAjZGVmaW5lIE1BUFRSQUNLX1BFUl9QQUdFIChQQUdFX1NJWkUgLyBzaXplb2Yoc3RydWN0 IGdyYW50X21hcHBpbmcpKQotI2RlZmluZSBtYXB0cmFja19lbnRyeSh0LCBlKSBcCi0gICAgKCh0 KS0+bWFwdHJhY2tbKGUpL01BUFRSQUNLX1BFUl9QQUdFXVsoZSklTUFQVFJBQ0tfUEVSX1BBR0Vd KQorI2RlZmluZSBtYXB0cmFja19lbnRyeSh0LCBlKSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAoKHQpLT5tYXB0cmFja1thcnJheV9pbmRl eF9ub3NwZWMoZSwgKHQpLT5tYXB0cmFja19saW1pdCkgLyAgICAgICAgICAgICAgICBcCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNQVBUUkFDS19QRVJfUEFHRV1bKGUpICUg TUFQVFJBQ0tfUEVSX1BBR0VdKQogCiBzdGF0aWMgaW5saW5lIHVuc2lnbmVkIGludAogbnJfbWFw dHJhY2tfZnJhbWVzKHN0cnVjdCBncmFudF90YWJsZSAqdCkKQEAgLTIyNiwxMCArMjI4LDIzIEBA IG5yX21hcHRyYWNrX2ZyYW1lcyhzdHJ1Y3QgZ3JhbnRfdGFibGUgKnQpCiBzdGF0aWMgZ3JhbnRf ZW50cnlfaGVhZGVyX3QgKgogc2hhcmVkX2VudHJ5X2hlYWRlcihzdHJ1Y3QgZ3JhbnRfdGFibGUg KnQsIGdyYW50X3JlZl90IHJlZikKIHsKLSAgICBpZiAoIHQtPmd0X3ZlcnNpb24gPT0gMSApCisg ICAgc3dpdGNoICggdC0+Z3RfdmVyc2lvbiApCisgICAgeworICAgIGNhc2UgMToKKyAgICAgICAg LyogUmV0dXJuZWQgdmFsdWVzIHNob3VsZCBiZSBpbmRlcGVuZGVudCBvZiBzcGVjdWxhdGl2ZSBl eGVjdXRpb24gKi8KKyAgICAgICAgYmxvY2tfc3BlY3VsYXRpb24oKTsKICAgICAgICAgcmV0dXJu IChncmFudF9lbnRyeV9oZWFkZXJfdCopJnNoYXJlZF9lbnRyeV92MSh0LCByZWYpOwotICAgIGVs c2UKKworICAgIGNhc2UgMjoKKyAgICAgICAgLyogUmV0dXJuZWQgdmFsdWVzIHNob3VsZCBiZSBp bmRlcGVuZGVudCBvZiBzcGVjdWxhdGl2ZSBleGVjdXRpb24gKi8KKyAgICAgICAgYmxvY2tfc3Bl Y3VsYXRpb24oKTsKICAgICAgICAgcmV0dXJuICZzaGFyZWRfZW50cnlfdjIodCwgcmVmKS5oZHI7 CisgICAgfQorCisgICAgYmxvY2tfc3BlY3VsYXRpb24oKTsKKyAgICBBU1NFUlRfVU5SRUFDSEFC TEUoKTsKKworICAgIHJldHVybiBOVUxMOwogfQogCiAvKiBBY3RpdmUgZ3JhbnQgZW50cnkgLSB1 c2VkIGZvciBzaGFkb3dpbmcgR1RGX3Blcm1pdF9hY2Nlc3MgZ3JhbnRzLiAqLwpAQCAtNjM0LDE0 ICs2NDksMjQgQEAgc3RhdGljIHVuc2lnbmVkIGludCBucl9ncmFudF9lbnRyaWVzKHN0cnVjdCBn cmFudF90YWJsZSAqZ3QpCiAgICAgY2FzZSAxOgogICAgICAgICBCVUlMRF9CVUdfT04oZjJlKElO SVRJQUxfTlJfR1JBTlRfRlJBTUVTLCAxKSA8CiAgICAgICAgICAgICAgICAgICAgICBHTlRUQUJf TlJfUkVTRVJWRURfRU5UUklFUyk7CisKKyAgICAgICAgLyogTWFrZSBzdXJlIHdlIHJldHVybiBh IHZhbHVlIGluZGVwZW5kZW50bHkgb2Ygc3BlY3VsYXRpdmUgZXhlY3V0aW9uICovCisgICAgICAg IGJsb2NrX3NwZWN1bGF0aW9uKCk7CiAgICAgICAgIHJldHVybiBmMmUobnJfZ3JhbnRfZnJhbWVz KGd0KSwgMSk7CisKICAgICBjYXNlIDI6CiAgICAgICAgIEJVSUxEX0JVR19PTihmMmUoSU5JVElB TF9OUl9HUkFOVF9GUkFNRVMsIDIpIDwKICAgICAgICAgICAgICAgICAgICAgIEdOVFRBQl9OUl9S RVNFUlZFRF9FTlRSSUVTKTsKKworICAgICAgICAvKiBNYWtlIHN1cmUgd2UgcmV0dXJuIGEgdmFs dWUgaW5kZXBlbmRlbnRseSBvZiBzcGVjdWxhdGl2ZSBleGVjdXRpb24gKi8KKyAgICAgICAgYmxv Y2tfc3BlY3VsYXRpb24oKTsKICAgICAgICAgcmV0dXJuIGYyZShucl9ncmFudF9mcmFtZXMoZ3Qp LCAyKTsKICN1bmRlZiBmMmUKICAgICB9CiAKKyAgICBibG9ja19zcGVjdWxhdGlvbigpOworICAg IEFTU0VSVF9VTlJFQUNIQUJMRSgpOworCiAgICAgcmV0dXJuIDA7CiB9CiAKQEAgLTk2Myw5ICs5 ODgsMTMgQEAgbWFwX2dyYW50X3JlZigKICAgICAgICAgUElOX0ZBSUwodW5sb2NrX291dCwgR05U U1RfYmFkX2dudHJlZiwgIkJhZCByZWYgJSN4IGZvciBkJWRcbiIsCiAgICAgICAgICAgICAgICAg IG9wLT5yZWYsIHJndC0+ZG9tYWluLT5kb21haW5faWQpOwogCi0gICAgYWN0ID0gYWN0aXZlX2Vu dHJ5X2FjcXVpcmUocmd0LCBvcC0+cmVmKTsKKyAgICAvKiBUaGlzIGNhbGwgZW5zdXJlcyB0aGUg YWJvdmUgY2hlY2sgY2Fubm90IGJlIGJ5cGFzc2VkIHNwZWN1bGF0aXZlbHkgKi8KICAgICBzaGFo ID0gc2hhcmVkX2VudHJ5X2hlYWRlcihyZ3QsIG9wLT5yZWYpOwotICAgIHN0YXR1cyA9IHJndC0+ Z3RfdmVyc2lvbiA9PSAxID8gJnNoYWgtPmZsYWdzIDogJnN0YXR1c19lbnRyeShyZ3QsIG9wLT5y ZWYpOworICAgIGFjdCA9IGFjdGl2ZV9lbnRyeV9hY3F1aXJlKHJndCwgb3AtPnJlZik7CisKKyAg ICAvKiBNYWtlIHN1cmUgd2UgZG8gbm90IGFjY2VzcyBtZW1vcnkgc3BlY3VsYXRpdmVseSAqLwor ICAgIHN0YXR1cyA9IGV2YWx1YXRlX25vc3BlYyhyZ3QtPmd0X3ZlcnNpb24gPT0gMSkgPyAmc2hh aC0+ZmxhZ3MKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICA6ICZzdGF0dXNfZW50cnkocmd0LCBvcC0+cmVmKTsKIAogICAgIC8qIElmIGFscmVhZHkgcGlu bmVkLCBjaGVjayB0aGUgYWN0aXZlIGRvbWlkIGFuZCBhdm9pZCByZWZjbnQgb3ZlcmZsb3cuICov CiAgICAgaWYgKCBhY3QtPnBpbiAmJgpAQCAtOTg3LDcgKzEwMTYsNyBAQCBtYXBfZ3JhbnRfcmVm KAogCiAgICAgICAgIGlmICggIWFjdC0+cGluICkKICAgICAgICAgewotICAgICAgICAgICAgdW5z aWduZWQgbG9uZyBnZm4gPSByZ3QtPmd0X3ZlcnNpb24gPT0gMSA/CisgICAgICAgICAgICB1bnNp Z25lZCBsb25nIGdmbiA9IGV2YWx1YXRlX25vc3BlYyhyZ3QtPmd0X3ZlcnNpb24gPT0gMSkgPwog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzaGFyZWRfZW50cnlfdjEocmd0LCBvcC0+ cmVmKS5mcmFtZSA6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNoYXJlZF9lbnRy eV92MihyZ3QsIG9wLT5yZWYpLmZ1bGxfcGFnZS5mcmFtZTsKIApAQCAtMTMyMSw2ICsxMzUwLDkg QEAgdW5tYXBfY29tbW9uKAogICAgICAgICBnb3RvIHVubG9ja19vdXQ7CiAgICAgfQogCisgICAg LyogTWFrZSBzdXJlIHRoZSBhYm92ZSBib3VuZCBjaGVjayBjYW5ub3QgYmUgYnlwYXNzZWQgc3Bl Y3VsYXRpdmVseSAqLworICAgIGJsb2NrX3NwZWN1bGF0aW9uKCk7CisKICAgICBhY3QgPSBhY3Rp dmVfZW50cnlfYWNxdWlyZShyZ3QsIG9wLT5yZWYpOwogCiAgICAgLyoKQEAgLTE0MTgsNyArMTQ1 MCw3IEBAIHVubWFwX2NvbW1vbl9jb21wbGV0ZShzdHJ1Y3QgZ250dGFiX3VubWFwX2NvbW1vbiAq b3ApCiAgICAgc3RydWN0IHBhZ2VfaW5mbyAqcGc7CiAgICAgdWludDE2X3QgKnN0YXR1czsKIAot ICAgIGlmICggIW9wLT5kb25lICkKKyAgICBpZiAoIGV2YWx1YXRlX25vc3BlYyghb3AtPmRvbmUp ICkKICAgICB7CiAgICAgICAgIC8qIHVubWFwX2NvbW1vbigpIGRpZG4ndCBkbyBhbnl0aGluZyAt IG5vdGhpbmcgdG8gY29tcGxldGUuICovCiAgICAgICAgIHJldHVybjsKQEAgLTIwMjYsNiArMjA1 OCw3IEBAIGdudHRhYl9wcmVwYXJlX2Zvcl90cmFuc2ZlcigKICAgICAgICAgZ290byBmYWlsOwog ICAgIH0KIAorICAgIC8qIFRoaXMgY2FsbCBlbnN1cmVzIHRoZSBhYm92ZSBjaGVjayBjYW5ub3Qg YmUgYnlwYXNzZWQgc3BlY3VsYXRpdmVseSAqLwogICAgIHNoYSA9IHNoYXJlZF9lbnRyeV9oZWFk ZXIocmd0LCByZWYpOwogCiAgICAgc2NvbWJvLndvcmQgPSAqKHUzMiAqKSZzaGEtPmZsYWdzOwpA QCAtMjIyMyw3ICsyMjU2LDExIEBAIGdudHRhYl90cmFuc2ZlcigKICAgICAgICAgb2theSA9IGdu dHRhYl9wcmVwYXJlX2Zvcl90cmFuc2ZlcihlLCBkLCBnb3AucmVmKTsKICAgICAgICAgc3Bpbl9s b2NrKCZlLT5wYWdlX2FsbG9jX2xvY2spOwogCi0gICAgICAgIGlmICggdW5saWtlbHkoIW9rYXkp IHx8IHVubGlrZWx5KGUtPmlzX2R5aW5nKSApCisgICAgICAgIC8qCisgICAgICAgICAqIE1ha2Ug c3VyZSB0aGUgcmVmZXJlbmNlIGJvdW5kIGNoZWNrIGluIGdudHRhYl9wcmVwYXJlX2Zvcl90cmFu c2ZlcgorICAgICAgICAgKiBpcyByZXNwZWN0ZWQgYW5kIHNwZWN1bGF0aXZlIGV4ZWN1dGlvbiBp cyBibG9ja2VkIGFjY29yZGluZ2x5CisgICAgICAgICAqLworICAgICAgICBpZiAoIHVubGlrZWx5 KCFldmFsdWF0ZV9ub3NwZWMob2theSkpIHx8IHVubGlrZWx5KGUtPmlzX2R5aW5nKSApCiAgICAg ICAgIHsKICAgICAgICAgICAgIGJvb2xfdCBkcm9wX2RvbV9yZWYgPSAhZG9tYWluX2FkanVzdF90 b3RfcGFnZXMoZSwgLTEpOwogCkBAIC0yMjUzLDcgKzIyOTAsNyBAQCBnbnR0YWJfdHJhbnNmZXIo CiAgICAgICAgIGdyYW50X3JlYWRfbG9jayhlLT5ncmFudF90YWJsZSk7CiAgICAgICAgIGFjdCA9 IGFjdGl2ZV9lbnRyeV9hY3F1aXJlKGUtPmdyYW50X3RhYmxlLCBnb3AucmVmKTsKIAotICAgICAg ICBpZiAoIGUtPmdyYW50X3RhYmxlLT5ndF92ZXJzaW9uID09IDEgKQorICAgICAgICBpZiAoIGV2 YWx1YXRlX25vc3BlYyhlLT5ncmFudF90YWJsZS0+Z3RfdmVyc2lvbiA9PSAxKSApCiAgICAgICAg IHsKICAgICAgICAgICAgIGdyYW50X2VudHJ5X3YxX3QgKnNoYSA9ICZzaGFyZWRfZW50cnlfdjEo ZS0+Z3JhbnRfdGFibGUsIGdvcC5yZWYpOwogCkBAIC0yNDA4LDkgKzI0NDUsMTEgQEAgYWNxdWly ZV9ncmFudF9mb3JfY29weSgKICAgICAgICAgUElOX0ZBSUwoZ3RfdW5sb2NrX291dCwgR05UU1Rf YmFkX2dudHJlZiwKICAgICAgICAgICAgICAgICAgIkJhZCBncmFudCByZWZlcmVuY2UgJSN4XG4i LCBncmVmKTsKIAotICAgIGFjdCA9IGFjdGl2ZV9lbnRyeV9hY3F1aXJlKHJndCwgZ3JlZik7Cisg ICAgLyogVGhpcyBjYWxsIGVuc3VyZXMgdGhlIGFib3ZlIGNoZWNrIGNhbm5vdCBiZSBieXBhc3Nl ZCBzcGVjdWxhdGl2ZWx5ICovCiAgICAgc2hhaCA9IHNoYXJlZF9lbnRyeV9oZWFkZXIocmd0LCBn cmVmKTsKLSAgICBpZiAoIHJndC0+Z3RfdmVyc2lvbiA9PSAxICkKKyAgICBhY3QgPSBhY3RpdmVf ZW50cnlfYWNxdWlyZShyZ3QsIGdyZWYpOworCisgICAgaWYgKCBldmFsdWF0ZV9ub3NwZWMocmd0 LT5ndF92ZXJzaW9uID09IDEpICkKICAgICB7CiAgICAgICAgIHNoYTIgPSBOVUxMOwogICAgICAg ICBzdGF0dXMgPSAmc2hhaC0+ZmxhZ3M7CkBAIC0yODI2LDYgKzI4NjUsOSBAQCBzdGF0aWMgaW50 IGdudHRhYl9jb3B5X2J1Zihjb25zdCBzdHJ1Y3QgZ250dGFiX2NvcHkgKm9wLAogICAgICAgICAg ICAgICAgICBvcC0+ZGVzdC5vZmZzZXQsIGRlc3QtPnB0ci5vZmZzZXQsCiAgICAgICAgICAgICAg ICAgIG9wLT5sZW4sIGRlc3QtPmxlbik7CiAKKyAgICAvKiBNYWtlIHN1cmUgdGhlIGFib3ZlIGNo ZWNrcyBhcmUgbm90IGJ5cGFzc2VkIHNwZWN1bGF0aXZlbHkgKi8KKyAgICBibG9ja19zcGVjdWxh dGlvbigpOworCiAgICAgbWVtY3B5KGRlc3QtPnZpcnQgKyBvcC0+ZGVzdC5vZmZzZXQsIHNyYy0+ dmlydCArIG9wLT5zb3VyY2Uub2Zmc2V0LAogICAgICAgICAgICBvcC0+bGVuKTsKICAgICBnbnR0 YWJfbWFya19kaXJ0eShkZXN0LT5kb21haW4sIGRlc3QtPm1mbik7CkBAIC0yOTQ1LDcgKzI5ODcs NyBAQCBnbnR0YWJfc2V0X3ZlcnNpb24oWEVOX0dVRVNUX0hBTkRMRV9QQVJBTShnbnR0YWJfc2V0 X3ZlcnNpb25fdCkgdW9wKQogICAgIHN0cnVjdCBncmFudF90YWJsZSAqZ3QgPSBjdXJyZC0+Z3Jh bnRfdGFibGU7CiAgICAgZ3JhbnRfZW50cnlfdjFfdCByZXNlcnZlZF9lbnRyaWVzW0dOVFRBQl9O Ul9SRVNFUlZFRF9FTlRSSUVTXTsKICAgICBpbnQgcmVzOwotICAgIHVuc2lnbmVkIGludCBpOwor ICAgIHVuc2lnbmVkIGludCBpLCBucl9lbnRzOwogCiAgICAgaWYgKCBjb3B5X2Zyb21fZ3Vlc3Qo Jm9wLCB1b3AsIDEpICkKICAgICAgICAgcmV0dXJuIC1FRkFVTFQ7CkBAIC0yOTY5LDcgKzMwMTEs OCBAQCBnbnR0YWJfc2V0X3ZlcnNpb24oWEVOX0dVRVNUX0hBTkRMRV9QQVJBTShnbnR0YWJfc2V0 X3ZlcnNpb25fdCkgdW9wKQogICAgICAqIGFyZSBhbGxvd2VkIHRvIGJlIGluIHVzZSAoeGVuc3Rv cmUveGVuY29uc29sZSBrZWVwcyB0aGVtIG1hcHBlZCkuCiAgICAgICogKFlvdSBuZWVkIHRvIGNo YW5nZSB0aGUgdmVyc2lvbiBudW1iZXIgZm9yIGUuZy4ga2V4ZWMuKQogICAgICAqLwotICAgIGZv ciAoIGkgPSBHTlRUQUJfTlJfUkVTRVJWRURfRU5UUklFUzsgaSA8IG5yX2dyYW50X2VudHJpZXMo Z3QpOyBpKysgKQorICAgIG5yX2VudHMgPSBucl9ncmFudF9lbnRyaWVzKGd0KTsKKyAgICBmb3Ig KCBpID0gR05UVEFCX05SX1JFU0VSVkVEX0VOVFJJRVM7IGkgPCBucl9lbnRzOyBpKysgKQogICAg IHsKICAgICAgICAgaWYgKCByZWFkX2F0b21pYygmX2FjdGl2ZV9lbnRyeShndCwgaSkucGluKSAh PSAwICkKICAgICAgICAgewpAQCAtMzIxMSw2ICszMjU0LDkgQEAgc3dhcF9ncmFudF9yZWYoZ3Jh bnRfcmVmX3QgcmVmX2EsIGdyYW50X3JlZl90IHJlZl9iKQogICAgIGlmICggdW5saWtlbHkocmVm X2IgPj0gbnJfZ3JhbnRfZW50cmllcyhkLT5ncmFudF90YWJsZSkpKQogICAgICAgICBQSU5fRkFJ TChvdXQsIEdOVFNUX2JhZF9nbnRyZWYsICJCYWQgcmVmLWIgJSN4XG4iLCByZWZfYik7CiAKKyAg ICAvKiBNYWtlIHN1cmUgdGhlIGFib3ZlIGNoZWNrcyBhcmUgbm90IGJ5cGFzc2VkIHNwZWN1bGF0 aXZlbHkgKi8KKyAgICBibG9ja19zcGVjdWxhdGlvbigpOworCiAgICAgLyogU3dhcHBpbmcgdGhl IHNhbWUgcmVmIGlzIGEgbm8tb3AuICovCiAgICAgaWYgKCByZWZfYSA9PSByZWZfYiApCiAgICAg ICAgIGdvdG8gb3V0OwpAQCAtMzIyMyw3ICszMjY5LDcgQEAgc3dhcF9ncmFudF9yZWYoZ3JhbnRf cmVmX3QgcmVmX2EsIGdyYW50X3JlZl90IHJlZl9iKQogICAgIGlmICggYWN0X2ItPnBpbiApCiAg ICAgICAgIFBJTl9GQUlMKG91dCwgR05UU1RfZWFnYWluLCAicmVmIGIgJSN4IGJ1c3lcbiIsIHJl Zl9iKTsKIAotICAgIGlmICggZ3QtPmd0X3ZlcnNpb24gPT0gMSApCisgICAgaWYgKCBldmFsdWF0 ZV9ub3NwZWMoZ3QtPmd0X3ZlcnNpb24gPT0gMSkgKQogICAgIHsKICAgICAgICAgZ3JhbnRfZW50 cnlfdjFfdCBzaGFyZWQ7CiAKQEAgLTM2ODAsMTMgKzM3MjYsMTQgQEAgdm9pZCBncmFudF90YWJs ZV93YXJuX2FjdGl2ZV9ncmFudHMoc3RydWN0IGRvbWFpbiAqZCkKICAgICBzdHJ1Y3QgZ3JhbnRf dGFibGUgKmd0ID0gZC0+Z3JhbnRfdGFibGU7CiAgICAgc3RydWN0IGFjdGl2ZV9ncmFudF9lbnRy eSAqYWN0OwogICAgIGdyYW50X3JlZl90IHJlZjsKLSAgICB1bnNpZ25lZCBpbnQgbnJfYWN0aXZl ID0gMDsKKyAgICB1bnNpZ25lZCBpbnQgbnJfYWN0aXZlID0gMCwgbnJfZW50czsKIAogI2RlZmlu ZSBXQVJOX0dSQU5UX01BWCAxMAogCiAgICAgZ3JhbnRfcmVhZF9sb2NrKGd0KTsKIAotICAgIGZv ciAoIHJlZiA9IDA7IHJlZiAhPSBucl9ncmFudF9lbnRyaWVzKGd0KTsgcmVmKysgKQorICAgIG5y X2VudHMgPSBucl9ncmFudF9lbnRyaWVzKGd0KTsKKyAgICBmb3IgKCByZWYgPSAwOyByZWYgIT0g bnJfZW50czsgcmVmKysgKQogICAgIHsKICAgICAgICAgYWN0ID0gYWN0aXZlX2VudHJ5X2FjcXVp cmUoZ3QsIHJlZik7CiAgICAgICAgIGlmICggIWFjdC0+cGluICkKQEAgLTM3NzEsNyArMzgxOCw3 IEBAIGludCBtZW1fc2hhcmluZ19ncmVmX3RvX2dmbihzdHJ1Y3QgZ3JhbnRfdGFibGUgKmd0LCBn cmFudF9yZWZfdCByZWYsCiAgICAgICAgIHJjID0gLUVJTlZBTDsKICAgICBlbHNlIGlmICggcmVm ID49IG5yX2dyYW50X2VudHJpZXMoZ3QpICkKICAgICAgICAgcmMgPSAtRU5PRU5UOwotICAgIGVs c2UgaWYgKCBndC0+Z3RfdmVyc2lvbiA9PSAxICkKKyAgICBlbHNlIGlmICggZXZhbHVhdGVfbm9z cGVjKGd0LT5ndF92ZXJzaW9uID09IDEpICkKICAgICB7CiAgICAgICAgIGNvbnN0IGdyYW50X2Vu dHJ5X3YxX3QgKnNoYTEgPSAmc2hhcmVkX2VudHJ5X3YxKGd0LCByZWYpOwogCkBAIC0zNzkzLDcg KzM4NDAsNyBAQCBpbnQgbWVtX3NoYXJpbmdfZ3JlZl90b19nZm4oc3RydWN0IGdyYW50X3RhYmxl ICpndCwgZ3JhbnRfcmVmX3QgcmVmLAogICAgICAgICByYyA9IC1FTlhJTzsKICAgICBlbHNlIGlm ICggIXJjICYmIHN0YXR1cyApCiAgICAgewotICAgICAgICBpZiAoIGd0LT5ndF92ZXJzaW9uID09 IDEgKQorICAgICAgICBpZiAoIGV2YWx1YXRlX25vc3BlYyhndC0+Z3RfdmVyc2lvbiA9PSAxKSAp CiAgICAgICAgICAgICAqc3RhdHVzID0gZmxhZ3M7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAg ICpzdGF0dXMgPSBzdGF0dXNfZW50cnkoZ3QsIHJlZik7CkBAIC0zOTM1LDYgKzM5ODIsNyBAQCBz dGF0aWMgdm9pZCBnbnR0YWJfdXNhZ2VfcHJpbnQoc3RydWN0IGRvbWFpbiAqcmQpCiAgICAgaW50 IGZpcnN0ID0gMTsKICAgICBncmFudF9yZWZfdCByZWY7CiAgICAgc3RydWN0IGdyYW50X3RhYmxl ICpndCA9IHJkLT5ncmFudF90YWJsZTsKKyAgICB1bnNpZ25lZCBpbnQgbnJfZW50czsKIAogICAg IHByaW50aygiICAgICAgLS0tLS0tLS0gYWN0aXZlIC0tLS0tLS0tICAgICAgIC0tLS0tLS0tIHNo YXJlZCAtLS0tLS0tLVxuIik7CiAgICAgcHJpbnRrKCJbcmVmXSBsb2NhbGRvbSBtZm4gICAgICBw aW4gICAgICAgICAgbG9jYWxkb20gZ21mbiAgICAgZmxhZ3NcbiIpOwpAQCAtMzk0Nyw3ICszOTk1 LDggQEAgc3RhdGljIHZvaWQgZ250dGFiX3VzYWdlX3ByaW50KHN0cnVjdCBkb21haW4gKnJkKQog ICAgICAgICAgICBucl9ncmFudF9mcmFtZXMoZ3QpLCBndC0+bWF4X2dyYW50X2ZyYW1lcywKICAg ICAgICAgICAgbnJfbWFwdHJhY2tfZnJhbWVzKGd0KSwgZ3QtPm1heF9tYXB0cmFja19mcmFtZXMp OwogCi0gICAgZm9yICggcmVmID0gMDsgcmVmICE9IG5yX2dyYW50X2VudHJpZXMoZ3QpOyByZWYr KyApCisgICAgbnJfZW50cyA9IG5yX2dyYW50X2VudHJpZXMoZ3QpOworICAgIGZvciAoIHJlZiA9 IDA7IHJlZiAhPSBucl9lbnRzOyByZWYrKyApCiAgICAgewogICAgICAgICBzdHJ1Y3QgYWN0aXZl X2dyYW50X2VudHJ5ICphY3Q7CiAgICAgICAgIHN0cnVjdCBncmFudF9lbnRyeV9oZWFkZXIgKnNo YTsKLS0gCjIuNy40CgoKCgpBbWF6b24gRGV2ZWxvcG1lbnQgQ2VudGVyIEdlcm1hbnkgR21iSApL cmF1c2Vuc3RyLiAzOAoxMDExNyBCZXJsaW4KR2VzY2hhZWZ0c2Z1ZWhyZXI6IENocmlzdGlhbiBT Y2hsYWVnZXIsIFJhbGYgSGVyYnJpY2gKVXN0LUlEOiBERSAyODkgMjM3IDg3OQpFaW5nZXRyYWdl biBhbSBBbXRzZ2VyaWNodCBDaGFybG90dGVuYnVyZyBIUkIgMTQ5MTczIEIKCgoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcg bGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9q ZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==