From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH RFC 6/6] xen/keyhandler: Drop keyhandler_scratch Date: Thu, 6 Sep 2018 13:08:16 +0100 Message-ID: <1536235696-31359-7-git-send-email-andrew.cooper3@citrix.com> References: <1536235696-31359-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1536235696-31359-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Xen-devel Cc: Andrew Cooper , Wei Liu , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org V2l0aCBhbG1vc3QgYWxsIHVzZXJzIG9mIGtleWhhbmRsZXJfc2NyYXRjaCBnb25lLCBjbGVhbiB1 cCB0aGUgMyByZW1haW5pbmcKdXNlcnMgYW5kIGRyb3AgdGhlIGJ1ZmZlci4KClNpZ25lZC1vZmYt Ynk6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+Ci0tLQpDQzogSmFu IEJldWxpY2ggPEpCZXVsaWNoQHN1c2UuY29tPgpDQzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4 LmNvbT4KQ0M6IFJvZ2VyIFBhdSBNb25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgoKVGhlIE5V TUEgYW5kIHBlcmlvZGljIHRpbWVyIGFkanVzdG1lbnRzIGFyZSBkZWZpbml0ZWx5IGltcHJvdmVt ZW50cy4gIEhvd2V2ZXIsCnRoaXMgaXMgUkZDIGJlY2F1c2Ugb2YgdGhlIEVGSSBjaGFuZ2UsIHdo aWNoIG1pZ2h0IHBlcmhhcHMgbm90IHdhbiB0byBiZSBkb25lCnRoaXMgd2F5LiAgU3VnZ2VzdGlv bnMgd2VsY29tZS4KLS0tCiB4ZW4vYXJjaC94ODYvbnVtYS5jICAgICAgICAgIHwgMTEgKysrKy0t LS0tLS0KIHhlbi9jb21tb24vZWZpL2Jvb3QuYyAgICAgICAgfCAgNSArKy0tLQogeGVuL2NvbW1v bi9rZXloYW5kbGVyLmMgICAgICB8IDI2ICsrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiB4ZW4v aW5jbHVkZS94ZW4va2V5aGFuZGxlci5oIHwgIDMgLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDEzIGlu c2VydGlvbnMoKyksIDMyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9u dW1hLmMgYi94ZW4vYXJjaC94ODYvbnVtYS5jCmluZGV4IGE4Nzk4N2QuLmRlMTNhY2EgMTAwNjQ0 Ci0tLSBhL3hlbi9hcmNoL3g4Ni9udW1hLmMKKysrIGIveGVuL2FyY2gveDg2L251bWEuYwpAQCAt MzcyLDcgKzM3Miw2IEBAIHN0YXRpYyB2b2lkIGR1bXBfbnVtYSh1bnNpZ25lZCBjaGFyIGtleSkK IHsKICAgICBzX3RpbWVfdCBub3cgPSBOT1coKTsKICAgICB1bnNpZ25lZCBpbnQgaSwgaiwgbjsK LSAgICBpbnQgZXJyOwogICAgIHN0cnVjdCBkb21haW4gKmQ7CiAgICAgc3RydWN0IHBhZ2VfaW5m byAqcGFnZTsKICAgICB1bnNpZ25lZCBpbnQgcGFnZV9udW1fbm9kZVtNQVhfTlVNTk9ERVNdOwpA QCAtNDU0LDEyICs0NTMsMTAgQEAgc3RhdGljIHZvaWQgZHVtcF9udW1hKHVuc2lnbmVkIGNoYXIg a2V5KQogICAgICAgICB7CiAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgc3RhcnRfY3B1ID0gfjBV OwogCi0gICAgICAgICAgICBlcnIgPSBzbnByaW50ZihrZXloYW5kbGVyX3NjcmF0Y2gsIDEyLCAi JTN1IiwKLSAgICAgICAgICAgICAgICAgICAgdm51bWEtPnZub2RlX3RvX3Bub2RlW2ldKTsKLSAg ICAgICAgICAgIGlmICggZXJyIDwgMCB8fCB2bnVtYS0+dm5vZGVfdG9fcG5vZGVbaV0gPT0gTlVN QV9OT19OT0RFICkKLSAgICAgICAgICAgICAgICBzdHJsY3B5KGtleWhhbmRsZXJfc2NyYXRjaCwg Ij8/PyIsIHNpemVvZihrZXloYW5kbGVyX3NjcmF0Y2gpKTsKLQotICAgICAgICAgICAgcHJpbnRr KCIgICAgICAgJTN1OiBwbm9kZSAlcywiLCBpLCBrZXloYW5kbGVyX3NjcmF0Y2gpOworICAgICAg ICAgICAgaWYgKCB2bnVtYS0+dm5vZGVfdG9fcG5vZGVbaV0gPT0gTlVNQV9OT19OT0RFICkKKyAg ICAgICAgICAgICAgICBwcmludGsoIiAgICAgICAlM3U6IHBub2RlID8/PywiLCBpKTsKKyAgICAg ICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBwcmludGsoIiAgICAgICAlM3U6IHBub2RlICUz dSwiLCBpLCB2bnVtYS0+dm5vZGVfdG9fcG5vZGVbaV0pOwogCiAgICAgICAgICAgICBwcmludGso IiB2Y3B1cyAiKTsKIApkaWZmIC0tZ2l0IGEveGVuL2NvbW1vbi9lZmkvYm9vdC5jIGIveGVuL2Nv bW1vbi9lZmkvYm9vdC5jCmluZGV4IDJmNDk3MzEuLmFhOWE2NjYgMTAwNjQ0Ci0tLSBhL3hlbi9j b21tb24vZWZpL2Jvb3QuYworKysgYi94ZW4vY29tbW9uL2VmaS9ib290LmMKQEAgLTQ4OSw3ICs0 ODksNyBAQCBzdGF0aWMgRUZJX0ZJTEVfSEFORExFIF9faW5pdCBnZXRfcGFyZW50X2hhbmRsZShF RklfTE9BREVEX0lNQUdFICpsb2FkZWRfaW1hZ2UsCiAgICAgc3RhdGljIEVGSV9HVUlEIF9faW5p dGRhdGEgZnNfcHJvdG9jb2wgPSBTSU1QTEVfRklMRV9TWVNURU1fUFJPVE9DT0w7CiAgICAgRUZJ X0ZJTEVfSEFORExFIGRpcl9oYW5kbGU7CiAgICAgRUZJX0RFVklDRV9QQVRIICpkcDsKLSAgICBD SEFSMTYgKnBhdGhlbmQsICpwdHI7CisgICAgQ0hBUjE2ICpwYXRoZW5kLCAqcHRyLCBidWZmZXJb MTI4XTsKICAgICBFRklfU1RBVFVTIHJldDsKIAogICAgIGRvIHsKQEAgLTUwNiw4ICs1MDYsNyBA QCBzdGF0aWMgRUZJX0ZJTEVfSEFORExFIF9faW5pdCBnZXRfcGFyZW50X2hhbmRsZShFRklfTE9B REVEX0lNQUdFICpsb2FkZWRfaW1hZ2UsCiAgICAgaWYgKCByZXQgIT0gRUZJX1NVQ0NFU1MgKQog ICAgICAgICBQcmludEVyck1lc2coTCJPcGVuVm9sdW1lIGZhaWx1cmUiLCByZXQpOwogCi0jZGVm aW5lIGJ1ZmZlciAoKENIQVIxNiAqKWtleWhhbmRsZXJfc2NyYXRjaCkKLSNkZWZpbmUgQlVGRkVS U0laRSBzaXplb2Yoa2V5aGFuZGxlcl9zY3JhdGNoKQorI2RlZmluZSBCVUZGRVJTSVpFIHNpemVv ZihidWZmZXIpCiAgICAgZm9yICggZHAgPSBsb2FkZWRfaW1hZ2UtPkZpbGVQYXRoLCAqYnVmZmVy ID0gMDsKICAgICAgICAgICBEZXZpY2VQYXRoVHlwZShkcCkgIT0gRU5EX0RFVklDRV9QQVRIX1RZ UEU7CiAgICAgICAgICAgZHAgPSAodm9pZCAqKWRwICsgRGV2aWNlUGF0aE5vZGVMZW5ndGgoZHAp ICkKZGlmZiAtLWdpdCBhL3hlbi9jb21tb24va2V5aGFuZGxlci5jIGIveGVuL2NvbW1vbi9rZXlo YW5kbGVyLmMKaW5kZXggOTNhZTczOC4uNjRlNTc4MyAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9r ZXloYW5kbGVyLmMKKysrIGIveGVuL2NvbW1vbi9rZXloYW5kbGVyLmMKQEAgLTI5LDggKzI5LDYg QEAgc3RhdGljIGtleWhhbmRsZXJfZm5fdCBzaG93X2hhbmRsZXJzLCBkdW1wX2h3ZG9tX3JlZ2lz dGVycywKIHN0YXRpYyBpcnFfa2V5aGFuZGxlcl9mbl90IGRvX3RvZ2dsZV9hbHRfa2V5LCBkdW1w X3JlZ2lzdGVycywKICAgICByZWJvb3RfbWFjaGluZSwgcnVuX2FsbF9rZXloYW5kbGVycywgZG9f ZGVidWdfa2V5OwogCi1jaGFyIGtleWhhbmRsZXJfc2NyYXRjaFsxMDI0XTsKLQogc3RhdGljIHN0 cnVjdCBrZXloYW5kbGVyIHsKICAgICB1bmlvbiB7CiAgICAgICAgIGtleWhhbmRsZXJfZm5fdCAq Zm47CkBAIC0yNTAsMjUgKzI0OCwxMSBAQCBzdGF0aWMgdm9pZCByZWJvb3RfbWFjaGluZSh1bnNp Z25lZCBjaGFyIGtleSwgc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpCiAgICAgbWFjaGluZV9y ZXN0YXJ0KDApOwogfQogCi1zdGF0aWMgdm9pZCBwZXJpb2RpY190aW1lcl9wcmludChjaGFyICpz dHIsIGludCBzaXplLCB1aW50NjRfdCBwZXJpb2QpCi17Ci0gICAgaWYgKCBwZXJpb2QgPT0gMCAp Ci0gICAgewotICAgICAgICBzdHJsY3B5KHN0ciwgIk5vIHBlcmlvZGljIHRpbWVyIiwgc2l6ZSk7 Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBzbnByaW50ZihzdHIsIHNpemUsCi0gICAg ICAgICAgICAgIiV1IEh6IHBlcmlvZGljIHRpbWVyIChwZXJpb2QgJXUgbXMpIiwKLSAgICAgICAg ICAgICAxMDAwMDAwMDAwLyhpbnQpcGVyaW9kLCAoaW50KXBlcmlvZC8xMDAwMDAwKTsKLX0KLQog c3RhdGljIHZvaWQgZHVtcF9kb21haW5zKHVuc2lnbmVkIGNoYXIga2V5KQogewogICAgIHN0cnVj dCBkb21haW4gKmQ7CiAgICAgc3RydWN0IHZjcHUgICAqdjsKICAgICBzX3RpbWVfdCAgICAgICBu b3cgPSBOT1coKTsKLSNkZWZpbmUgdG1wc3RyIGtleWhhbmRsZXJfc2NyYXRjaAogCiAgICAgcHJp bnRrKCInJWMnIHByZXNzZWQgLT4gZHVtcGluZyBkb21haW4gaW5mbyAobm93PTB4JVg6JTA4WClc biIsIGtleSwKICAgICAgICAgICAgKHUzMikobm93Pj4zMiksICh1MzIpbm93KTsKQEAgLTMzMyw4 ICszMTcsMTMgQEAgc3RhdGljIHZvaWQgZHVtcF9kb21haW5zKHVuc2lnbmVkIGNoYXIga2V5KQog ICAgICAgICAgICAgcHJpbnRrKCIgICAgcGF1c2VfY291bnQ9JWQgcGF1c2VfZmxhZ3M9JWx4XG4i LAogICAgICAgICAgICAgICAgICAgIGF0b21pY19yZWFkKCZ2LT5wYXVzZV9jb3VudCksIHYtPnBh dXNlX2ZsYWdzKTsKICAgICAgICAgICAgIGFyY2hfZHVtcF92Y3B1X2luZm8odik7Ci0gICAgICAg ICAgICBwZXJpb2RpY190aW1lcl9wcmludCh0bXBzdHIsIHNpemVvZih0bXBzdHIpLCB2LT5wZXJp b2RpY19wZXJpb2QpOwotICAgICAgICAgICAgcHJpbnRrKCIgICAgJXNcbiIsIHRtcHN0cik7CisK KyAgICAgICAgICAgIGlmICggdi0+cGVyaW9kaWNfcGVyaW9kID09IDAgKQorICAgICAgICAgICAg ICAgIHByaW50aygiTm8gcGVyaW9kaWMgdGltZXJcbiIpOworICAgICAgICAgICAgZWxzZQorICAg ICAgICAgICAgICAgIHByaW50aygiJXUgSHogcGVyaW9kaWMgdGltZXIgKHBlcmlvZCAldSBtcylc biIsCisgICAgICAgICAgICAgICAgICAgICAgIDEwMDAwMDAwMDAvKGludCl2LT5wZXJpb2RpY19w ZXJpb2QsCisgICAgICAgICAgICAgICAgICAgICAgIChpbnQpdi0+cGVyaW9kaWNfcGVyaW9kLzEw MDAwMDApOwogICAgICAgICB9CiAgICAgfQogCkBAIC0zNTUsNyArMzQ0LDYgQEAgc3RhdGljIHZv aWQgZHVtcF9kb21haW5zKHVuc2lnbmVkIGNoYXIga2V5KQogICAgIGFyY2hfZHVtcF9zaGFyZWRf bWVtX2luZm8oKTsKIAogICAgIHJjdV9yZWFkX3VubG9jaygmZG9tbGlzdF9yZWFkX2xvY2spOwot I3VuZGVmIHRtcHN0cgogfQogCiBzdGF0aWMgY3B1bWFza190IHJlYWRfY2xvY2tzX2NwdW1hc2s7 CmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS94ZW4va2V5aGFuZGxlci5oIGIveGVuL2luY2x1ZGUv eGVuL2tleWhhbmRsZXIuaAppbmRleCAwNmMwNWM4Li41MTMxZTg2IDEwMDY0NAotLS0gYS94ZW4v aW5jbHVkZS94ZW4va2V5aGFuZGxlci5oCisrKyBiL3hlbi9pbmNsdWRlL3hlbi9rZXloYW5kbGVy LmgKQEAgLTQ4LDcgKzQ4LDQgQEAgdm9pZCByZWdpc3Rlcl9pcnFfa2V5aGFuZGxlcih1bnNpZ25l ZCBjaGFyIGtleSwKIC8qIEluamVjdCBhIGtleXByZXNzIGludG8gdGhlIGtleS1oYW5kbGluZyBz dWJzeXN0ZW0uICovCiBleHRlcm4gdm9pZCBoYW5kbGVfa2V5cHJlc3ModW5zaWduZWQgY2hhciBr ZXksIHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzKTsKIAotLyogU2NyYXRjaCBzcGFjZSBpcyBh dmFpbGFibGUgZm9yIHVzZSBvZiBhbnkga2V5aGFuZGxlci4gKi8KLWV4dGVybiBjaGFyIGtleWhh bmRsZXJfc2NyYXRjaFsxMDI0XTsKLQogI2VuZGlmIC8qIF9fWEVOX0tFWUhBTkRMRVJfSF9fICov Ci0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3Jn Cmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=