From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel De Graaf Subject: [PATCH 08/17] flask: remove unused secondary context in ocontext Date: Mon, 20 Jun 2016 10:04:17 -0400 Message-ID: <1466431466-28055-9-git-send-email-dgdegra@tycho.nsa.gov> References: <1466431466-28055-1-git-send-email-dgdegra@tycho.nsa.gov> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1466431466-28055-1-git-send-email-dgdegra@tycho.nsa.gov> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Daniel De Graaf List-Id: xen-devel@lists.xenproject.org VGhpcyBmaWVsZCB3YXMgb3JpZ2luYWxseSB1c2VkIGluIExpbnV4IGZvciBhIGRlZmF1bHQgbWVz c2FnZSBjb2RlIGZvcgpuZXR3b3JrIGludGVyZmFjZXMuICBJdCBoYXMgbmV2ZXIgYmVlbiB1c2Vk IGluIFhlbiwgc28gcmVtb3ZlIGl0LgoKU2lnbmVkLW9mZi1ieTogRGFuaWVsIERlIEdyYWFmIDxk Z2RlZ3JhQHR5Y2hvLm5zYS5nb3Y+Ci0tLQogeGVuL3hzbS9mbGFzay9zcy9wb2xpY3lkYi5jIHwg MjEgKysrKysrKystLS0tLS0tLQogeGVuL3hzbS9mbGFzay9zcy9wb2xpY3lkYi5oIHwgIDQgKyst LQogeGVuL3hzbS9mbGFzay9zcy9zZXJ2aWNlcy5jIHwgNTggKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDQxIGluc2VydGlvbnMo KyksIDQyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi94c20vZmxhc2svc3MvcG9saWN5 ZGIuYyBiL3hlbi94c20vZmxhc2svc3MvcG9saWN5ZGIuYwppbmRleCBlZWJmZTljLi4wMGI1Mzkw IDEwMDY0NAotLS0gYS94ZW4veHNtL2ZsYXNrL3NzL3BvbGljeWRiLmMKKysrIGIveGVuL3hzbS9m bGFzay9zcy9wb2xpY3lkYi5jCkBAIC02MzgsOCArNjM4LDcgQEAgc3RhdGljIGludCAoKmRlc3Ry b3lfZltTWU1fTlVNXSkgKHZvaWQgKmtleSwgdm9pZCAqZGF0dW0sIHZvaWQgKmRhdGFwKSA9CiAK IHN0YXRpYyB2b2lkIG9jb250ZXh0X2Rlc3Ryb3koc3RydWN0IG9jb250ZXh0ICpjLCBpbnQgaSkK IHsKLSAgICBjb250ZXh0X2Rlc3Ryb3koJmMtPmNvbnRleHRbMF0pOwotICAgIGNvbnRleHRfZGVz dHJveSgmYy0+Y29udGV4dFsxXSk7CisgICAgY29udGV4dF9kZXN0cm95KCZjLT5jb250ZXh0KTsK ICAgICBpZiAoIGkgPT0gT0NPTl9JU0lEIHx8IGkgPT0gT0NPTl9EVFJFRSApCiAgICAgICAgIHhm cmVlKGMtPnUubmFtZSk7CiAgICAgeGZyZWUoYyk7CkBAIC03NDcsMTQgKzc0NiwxNCBAQCBpbnQg cG9saWN5ZGJfbG9hZF9pc2lkcyhzdHJ1Y3QgcG9saWN5ZGIgKnAsIHN0cnVjdCBzaWR0YWIgKnMp CiAgICAgaGVhZCA9IHAtPm9jb250ZXh0c1tPQ09OX0lTSURdOwogICAgIGZvciAoIGMgPSBoZWFk OyBjOyBjID0gYy0+bmV4dCApCiAgICAgewotICAgICAgICBpZiAoICFjLT5jb250ZXh0WzBdLnVz ZXIgKQorICAgICAgICBpZiAoICFjLT5jb250ZXh0LnVzZXIgKQogICAgICAgICB7CiAgICAgICAg ICAgICBwcmludGsoS0VSTl9FUlIgIkZsYXNrOiAgU0lEICVzIHdhcyBuZXZlciAiCiAgICAgICAg ICAgICAgICAgICAgImRlZmluZWQuXG4iLCBjLT51Lm5hbWUpOwogICAgICAgICAgICAgcmMgPSAt RUlOVkFMOwogICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKCBz aWR0YWJfaW5zZXJ0KHMsIGMtPnNpZFswXSwgJmMtPmNvbnRleHRbMF0pICkKKyAgICAgICAgaWYg KCBzaWR0YWJfaW5zZXJ0KHMsIGMtPnNpZCwgJmMtPmNvbnRleHQpICkKICAgICAgICAgewogICAg ICAgICAgICAgcHJpbnRrKEtFUk5fRVJSICJGbGFzazogIHVuYWJsZSB0byBsb2FkIGluaXRpYWwg IgogICAgICAgICAgICAgICAgICAgICJTSUQgJXMuXG4iLCBjLT51Lm5hbWUpOwpAQCAtMjAxNSw4 ICsyMDE0LDggQEAgaW50IHBvbGljeWRiX3JlYWQoc3RydWN0IHBvbGljeWRiICpwLCB2b2lkICpm cCkKICAgICAgICAgICAgICAgICByYyA9IG5leHRfZW50cnkoYnVmLCBmcCwgc2l6ZW9mKHUzMikp OwogICAgICAgICAgICAgICAgIGlmICggcmMgPCAwICkKICAgICAgICAgICAgICAgICAgICAgZ290 byBiYWQ7Ci0gICAgICAgICAgICAgICAgYy0+c2lkWzBdID0gbGUzMl90b19jcHUoYnVmWzBdKTsK LSAgICAgICAgICAgICAgICByYyA9IGNvbnRleHRfcmVhZF9hbmRfdmFsaWRhdGUoJmMtPmNvbnRl eHRbMF0sIHAsIGZwKTsKKyAgICAgICAgICAgICAgICBjLT5zaWQgPSBsZTMyX3RvX2NwdShidWZb MF0pOworICAgICAgICAgICAgICAgIHJjID0gY29udGV4dF9yZWFkX2FuZF92YWxpZGF0ZSgmYy0+ Y29udGV4dCwgcCwgZnApOwogICAgICAgICAgICAgICAgIGlmICggcmMgKQogICAgICAgICAgICAg ICAgICAgICBnb3RvIGJhZDsKICAgICAgICAgICAgICAgICBicmVhazsKQEAgLTIwMzEsNyArMjAz MCw3IEBAIGludCBwb2xpY3lkYl9yZWFkKHN0cnVjdCBwb2xpY3lkYiAqcCwgdm9pZCAqZnApCiAg ICAgICAgICAgICAgICAgaWYgKCByYyA8IDAgKQogICAgICAgICAgICAgICAgICAgICBnb3RvIGJh ZDsKICAgICAgICAgICAgICAgICBjLT51LnBpcnEgPSBsZTMyX3RvX2NwdShidWZbMF0pOwotICAg ICAgICAgICAgICAgIHJjID0gY29udGV4dF9yZWFkX2FuZF92YWxpZGF0ZSgmYy0+Y29udGV4dFsw XSwgcCwgZnApOworICAgICAgICAgICAgICAgIHJjID0gY29udGV4dF9yZWFkX2FuZF92YWxpZGF0 ZSgmYy0+Y29udGV4dCwgcCwgZnApOwogICAgICAgICAgICAgICAgIGlmICggcmMgKQogICAgICAg ICAgICAgICAgICAgICBnb3RvIGJhZDsKICAgICAgICAgICAgICAgICBicmVhazsKQEAgLTIwNDcs NyArMjA0Niw3IEBAIGludCBwb2xpY3lkYl9yZWFkKHN0cnVjdCBwb2xpY3lkYiAqcCwgdm9pZCAq ZnApCiAgICAgICAgICAgICAgICAgICAgIGdvdG8gYmFkOwogICAgICAgICAgICAgICAgIGMtPnUu aW9wb3J0Lmxvd19pb3BvcnQgPSBsZTMyX3RvX2NwdShidWZbMF0pOwogICAgICAgICAgICAgICAg IGMtPnUuaW9wb3J0LmhpZ2hfaW9wb3J0ID0gbGUzMl90b19jcHUoYnVmWzFdKTsKLSAgICAgICAg ICAgICAgICByYyA9IGNvbnRleHRfcmVhZF9hbmRfdmFsaWRhdGUoJmMtPmNvbnRleHRbMF0sIHAs IGZwKTsKKyAgICAgICAgICAgICAgICByYyA9IGNvbnRleHRfcmVhZF9hbmRfdmFsaWRhdGUoJmMt PmNvbnRleHQsIHAsIGZwKTsKICAgICAgICAgICAgICAgICBpZiAoIHJjICkKICAgICAgICAgICAg ICAgICAgICAgZ290byBiYWQ7CiAgICAgICAgICAgICAgICAgYnJlYWs7CkBAIC0yMDc1LDcgKzIw NzQsNyBAQCBpbnQgcG9saWN5ZGJfcmVhZChzdHJ1Y3QgcG9saWN5ZGIgKnAsIHZvaWQgKmZwKQog ICAgICAgICAgICAgICAgICAgICBjLT51LmlvbWVtLmxvd19pb21lbSA9IGxlMzJfdG9fY3B1KGJ1 ZlswXSk7CiAgICAgICAgICAgICAgICAgICAgIGMtPnUuaW9tZW0uaGlnaF9pb21lbSA9IGxlMzJf dG9fY3B1KGJ1ZlsxXSk7CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIHJjID0g Y29udGV4dF9yZWFkX2FuZF92YWxpZGF0ZSgmYy0+Y29udGV4dFswXSwgcCwgZnApOworICAgICAg ICAgICAgICAgIHJjID0gY29udGV4dF9yZWFkX2FuZF92YWxpZGF0ZSgmYy0+Y29udGV4dCwgcCwg ZnApOwogICAgICAgICAgICAgICAgIGlmICggcmMgKQogICAgICAgICAgICAgICAgICAgICBnb3Rv IGJhZDsKICAgICAgICAgICAgICAgICBicmVhazsKQEAgLTIwOTAsNyArMjA4OSw3IEBAIGludCBw b2xpY3lkYl9yZWFkKHN0cnVjdCBwb2xpY3lkYiAqcCwgdm9pZCAqZnApCiAgICAgICAgICAgICAg ICAgaWYgKCByYyA8IDAgKQogICAgICAgICAgICAgICAgICAgICBnb3RvIGJhZDsKICAgICAgICAg ICAgICAgICBjLT51LmRldmljZSA9IGxlMzJfdG9fY3B1KGJ1ZlswXSk7Ci0gICAgICAgICAgICAg ICAgcmMgPSBjb250ZXh0X3JlYWRfYW5kX3ZhbGlkYXRlKCZjLT5jb250ZXh0WzBdLCBwLCBmcCk7 CisgICAgICAgICAgICAgICAgcmMgPSBjb250ZXh0X3JlYWRfYW5kX3ZhbGlkYXRlKCZjLT5jb250 ZXh0LCBwLCBmcCk7CiAgICAgICAgICAgICAgICAgaWYgKCByYyApCiAgICAgICAgICAgICAgICAg ICAgIGdvdG8gYmFkOwogICAgICAgICAgICAgICAgIGJyZWFrOwpAQCAtMjExMyw3ICsyMTEyLDcg QEAgaW50IHBvbGljeWRiX3JlYWQoc3RydWN0IHBvbGljeWRiICpwLCB2b2lkICpmcCkKICAgICAg ICAgICAgICAgICBpZiAoIHJjIDwgMCApCiAgICAgICAgICAgICAgICAgICAgIGdvdG8gYmFkOwog ICAgICAgICAgICAgICAgIGMtPnUubmFtZVtsZW5dID0gMDsKLSAgICAgICAgICAgICAgICByYyA9 IGNvbnRleHRfcmVhZF9hbmRfdmFsaWRhdGUoJmMtPmNvbnRleHRbMF0sIHAsIGZwKTsKKyAgICAg ICAgICAgICAgICByYyA9IGNvbnRleHRfcmVhZF9hbmRfdmFsaWRhdGUoJmMtPmNvbnRleHQsIHAs IGZwKTsKICAgICAgICAgICAgICAgICBpZiAoIHJjICkKICAgICAgICAgICAgICAgICAgICAgZ290 byBiYWQ7CiAgICAgICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS94ZW4veHNtL2ZsYXNr L3NzL3BvbGljeWRiLmggYi94ZW4veHNtL2ZsYXNrL3NzL3BvbGljeWRiLmgKaW5kZXggMzBiZTcx YS4uZjE1OGNlMyAxMDA2NDQKLS0tIGEveGVuL3hzbS9mbGFzay9zcy9wb2xpY3lkYi5oCisrKyBi L3hlbi94c20vZmxhc2svc3MvcG9saWN5ZGIuaApAQCAtMTU4LDggKzE1OCw4IEBAIHN0cnVjdCBv Y29udGV4dCB7CiAgICAgICAgICAgICAgICAgdTY0IGhpZ2hfaW9tZW07CiAgICAgICAgIH0gaW9t ZW07CiAgICAgfSB1OwotICAgIHN0cnVjdCBjb250ZXh0IGNvbnRleHRbMl07ICAgIC8qIHNlY3Vy aXR5IGNvbnRleHQocykgKi8KLSAgICB1MzIgc2lkWzJdOyAgICAvKiBTSUQocykgKi8KKyAgICBz dHJ1Y3QgY29udGV4dCBjb250ZXh0OworICAgIHUzMiBzaWQ7CiAgICAgc3RydWN0IG9jb250ZXh0 ICpuZXh0OwogfTsKIApkaWZmIC0tZ2l0IGEveGVuL3hzbS9mbGFzay9zcy9zZXJ2aWNlcy5jIGIv eGVuL3hzbS9mbGFzay9zcy9zZXJ2aWNlcy5jCmluZGV4IDlkYTM1OGIuLmM1OTA0NDAgMTAwNjQ0 Ci0tLSBhL3hlbi94c20vZmxhc2svc3Mvc2VydmljZXMuYworKysgYi94ZW4veHNtL2ZsYXNrL3Nz L3NlcnZpY2VzLmMKQEAgLTE0ODgsMTMgKzE0ODgsMTMgQEAgaW50IHNlY3VyaXR5X2lycV9zaWQo aW50IHBpcnEsIHUzMiAqb3V0X3NpZCkKIAogICAgIGlmICggYyApCiAgICAgewotICAgICAgICBp ZiAoICFjLT5zaWRbMF0gKQorICAgICAgICBpZiAoICFjLT5zaWQgKQogICAgICAgICB7Ci0gICAg ICAgICAgICByYyA9IHNpZHRhYl9jb250ZXh0X3RvX3NpZCgmc2lkdGFiLCAmYy0+Y29udGV4dFsw XSwgJmMtPnNpZFswXSk7CisgICAgICAgICAgICByYyA9IHNpZHRhYl9jb250ZXh0X3RvX3NpZCgm c2lkdGFiLCAmYy0+Y29udGV4dCwgJmMtPnNpZCk7CiAgICAgICAgICAgICBpZiAoIHJjICkKICAg ICAgICAgICAgICAgICBnb3RvIG91dDsKICAgICAgICAgfQotICAgICAgICAqb3V0X3NpZCA9IGMt PnNpZFswXTsKKyAgICAgICAgKm91dF9zaWQgPSBjLT5zaWQ7CiAgICAgfQogICAgIGVsc2UKICAg ICB7CkBAIC0xNTI4LDEzICsxNTI4LDEzIEBAIGludCBzZWN1cml0eV9pb21lbV9zaWQodW5zaWdu ZWQgbG9uZyBtZm4sIHUzMiAqb3V0X3NpZCkKIAogICAgIGlmICggYyApCiAgICAgewotICAgICAg ICBpZiAoICFjLT5zaWRbMF0gKQorICAgICAgICBpZiAoICFjLT5zaWQgKQogICAgICAgICB7Ci0g ICAgICAgICAgICByYyA9IHNpZHRhYl9jb250ZXh0X3RvX3NpZCgmc2lkdGFiLCAmYy0+Y29udGV4 dFswXSwgJmMtPnNpZFswXSk7CisgICAgICAgICAgICByYyA9IHNpZHRhYl9jb250ZXh0X3RvX3Np ZCgmc2lkdGFiLCAmYy0+Y29udGV4dCwgJmMtPnNpZCk7CiAgICAgICAgICAgICBpZiAoIHJjICkK ICAgICAgICAgICAgICAgICBnb3RvIG91dDsKICAgICAgICAgfQotICAgICAgICAqb3V0X3NpZCA9 IGMtPnNpZFswXTsKKyAgICAgICAgKm91dF9zaWQgPSBjLT5zaWQ7CiAgICAgfQogICAgIGVsc2UK ICAgICB7CkBAIC0xNTU5LDkgKzE1NTksOSBAQCBpbnQgc2VjdXJpdHlfaXRlcmF0ZV9pb21lbV9z aWRzKHVuc2lnbmVkIGxvbmcgc3RhcnQsIHVuc2lnbmVkIGxvbmcgZW5kLAogICAgICAgICBjID0g Yy0+bmV4dDsKIAogICAgIHdoaWxlIChjICYmIGMtPnUuaW9tZW0ubG93X2lvbWVtIDw9IGVuZCkg ewotICAgICAgICBpZiAoIWMtPnNpZFswXSkKKyAgICAgICAgaWYgKCFjLT5zaWQpCiAgICAgICAg IHsKLSAgICAgICAgICAgIHJjID0gc2lkdGFiX2NvbnRleHRfdG9fc2lkKCZzaWR0YWIsICZjLT5j b250ZXh0WzBdLCAmYy0+c2lkWzBdKTsKKyAgICAgICAgICAgIHJjID0gc2lkdGFiX2NvbnRleHRf dG9fc2lkKCZzaWR0YWIsICZjLT5jb250ZXh0LCAmYy0+c2lkKTsKICAgICAgICAgICAgIGlmICgg cmMgKQogICAgICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgICAgICB9CkBAIC0xNTc0LDExICsx NTc0LDExIEBAIGludCBzZWN1cml0eV9pdGVyYXRlX2lvbWVtX3NpZHModW5zaWduZWQgbG9uZyBz dGFydCwgdW5zaWduZWQgbG9uZyBlbmQsCiAgICAgICAgIH0KICAgICAgICAgaWYgKGVuZCA8PSBj LT51LmlvbWVtLmhpZ2hfaW9tZW0pIHsKICAgICAgICAgICAgIC8qIGl0ZXJhdGlvbiBlbmRzIGlu IHRoZSBtaWRkbGUgb2YgdGhpcyByYW5nZSAqLwotICAgICAgICAgICAgcmMgPSBmbihkYXRhLCBj LT5zaWRbMF0sIHN0YXJ0LCBlbmQpOworICAgICAgICAgICAgcmMgPSBmbihkYXRhLCBjLT5zaWQs IHN0YXJ0LCBlbmQpOwogICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgICAgIH0KIAotICAgICAg ICByYyA9IGZuKGRhdGEsIGMtPnNpZFswXSwgc3RhcnQsIGMtPnUuaW9tZW0uaGlnaF9pb21lbSk7 CisgICAgICAgIHJjID0gZm4oZGF0YSwgYy0+c2lkLCBzdGFydCwgYy0+dS5pb21lbS5oaWdoX2lv bWVtKTsKICAgICAgICAgaWYgKHJjKQogICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgICAgIHN0 YXJ0ID0gYy0+dS5pb21lbS5oaWdoX2lvbWVtICsgMTsKQEAgLTE2MTYsMTMgKzE2MTYsMTMgQEAg aW50IHNlY3VyaXR5X2lvcG9ydF9zaWQodTMyIGlvcG9ydCwgdTMyICpvdXRfc2lkKQogCiAgICAg aWYgKCBjICkKICAgICB7Ci0gICAgICAgIGlmICggIWMtPnNpZFswXSApCisgICAgICAgIGlmICgg IWMtPnNpZCApCiAgICAgICAgIHsKLSAgICAgICAgICAgIHJjID0gc2lkdGFiX2NvbnRleHRfdG9f c2lkKCZzaWR0YWIsICZjLT5jb250ZXh0WzBdLCAmYy0+c2lkWzBdKTsKKyAgICAgICAgICAgIHJj ID0gc2lkdGFiX2NvbnRleHRfdG9fc2lkKCZzaWR0YWIsICZjLT5jb250ZXh0LCAmYy0+c2lkKTsK ICAgICAgICAgICAgIGlmICggcmMgKQogICAgICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgICAg ICB9Ci0gICAgICAgICpvdXRfc2lkID0gYy0+c2lkWzBdOworICAgICAgICAqb3V0X3NpZCA9IGMt PnNpZDsKICAgICB9CiAgICAgZWxzZQogICAgIHsKQEAgLTE2NDcsOSArMTY0Nyw5IEBAIGludCBz ZWN1cml0eV9pdGVyYXRlX2lvcG9ydF9zaWRzKHUzMiBzdGFydCwgdTMyIGVuZCwKICAgICAgICAg YyA9IGMtPm5leHQ7CiAKICAgICB3aGlsZSAoYyAmJiBjLT51LmlvcG9ydC5sb3dfaW9wb3J0IDw9 IGVuZCkgewotICAgICAgICBpZiAoIWMtPnNpZFswXSkKKyAgICAgICAgaWYgKCFjLT5zaWQpCiAg ICAgICAgIHsKLSAgICAgICAgICAgIHJjID0gc2lkdGFiX2NvbnRleHRfdG9fc2lkKCZzaWR0YWIs ICZjLT5jb250ZXh0WzBdLCAmYy0+c2lkWzBdKTsKKyAgICAgICAgICAgIHJjID0gc2lkdGFiX2Nv bnRleHRfdG9fc2lkKCZzaWR0YWIsICZjLT5jb250ZXh0LCAmYy0+c2lkKTsKICAgICAgICAgICAg IGlmICggcmMgKQogICAgICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgICAgICB9CkBAIC0xNjYy LDExICsxNjYyLDExIEBAIGludCBzZWN1cml0eV9pdGVyYXRlX2lvcG9ydF9zaWRzKHUzMiBzdGFy dCwgdTMyIGVuZCwKICAgICAgICAgfQogICAgICAgICBpZiAoZW5kIDw9IGMtPnUuaW9wb3J0Lmhp Z2hfaW9wb3J0KSB7CiAgICAgICAgICAgICAvKiBpdGVyYXRpb24gZW5kcyBpbiB0aGUgbWlkZGxl IG9mIHRoaXMgcmFuZ2UgKi8KLSAgICAgICAgICAgIHJjID0gZm4oZGF0YSwgYy0+c2lkWzBdLCBz dGFydCwgZW5kKTsKKyAgICAgICAgICAgIHJjID0gZm4oZGF0YSwgYy0+c2lkLCBzdGFydCwgZW5k KTsKICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgICAgICB9CiAKLSAgICAgICAgcmMgPSBmbihk YXRhLCBjLT5zaWRbMF0sIHN0YXJ0LCBjLT51LmlvcG9ydC5oaWdoX2lvcG9ydCk7CisgICAgICAg IHJjID0gZm4oZGF0YSwgYy0+c2lkLCBzdGFydCwgYy0+dS5pb3BvcnQuaGlnaF9pb3BvcnQpOwog ICAgICAgICBpZiAocmMpCiAgICAgICAgICAgICBnb3RvIG91dDsKICAgICAgICAgc3RhcnQgPSBj LT51LmlvcG9ydC5oaWdoX2lvcG9ydCArIDE7CkBAIC0xNzAzLDEzICsxNzAzLDEzIEBAIGludCBz ZWN1cml0eV9kZXZpY2Vfc2lkKHUzMiBkZXZpY2UsIHUzMiAqb3V0X3NpZCkKIAogICAgIGlmICgg YyApCiAgICAgewotICAgICAgICBpZiAoICFjLT5zaWRbMF0gKQorICAgICAgICBpZiAoICFjLT5z aWQgKQogICAgICAgICB7Ci0gICAgICAgICAgICByYyA9IHNpZHRhYl9jb250ZXh0X3RvX3NpZCgm c2lkdGFiLCAmYy0+Y29udGV4dFswXSwgJmMtPnNpZFswXSk7CisgICAgICAgICAgICByYyA9IHNp ZHRhYl9jb250ZXh0X3RvX3NpZCgmc2lkdGFiLCAmYy0+Y29udGV4dCwgJmMtPnNpZCk7CiAgICAg ICAgICAgICBpZiAoIHJjICkKICAgICAgICAgICAgICAgICBnb3RvIG91dDsKICAgICAgICAgfQot ICAgICAgICAqb3V0X3NpZCA9IGMtPnNpZFswXTsKKyAgICAgICAgKm91dF9zaWQgPSBjLT5zaWQ7 CiAgICAgfQogICAgIGVsc2UKICAgICB7CkBAIC0xODQ5LDEzICsxODQ5LDEzIEBAIGludCBzZWN1 cml0eV9kZXZpY2V0cmVlX3NpZChjb25zdCBjaGFyICpwYXRoLCB1MzIgKm91dF9zaWQpCiAKICAg ICBpZiAoIGMgKQogICAgIHsKLSAgICAgICAgaWYgKCAhYy0+c2lkWzBdICkKKyAgICAgICAgaWYg KCAhYy0+c2lkICkKICAgICAgICAgewotICAgICAgICAgICAgcmMgPSBzaWR0YWJfY29udGV4dF90 b19zaWQoJnNpZHRhYiwgJmMtPmNvbnRleHRbMF0sICZjLT5zaWRbMF0pOworICAgICAgICAgICAg cmMgPSBzaWR0YWJfY29udGV4dF90b19zaWQoJnNpZHRhYiwgJmMtPmNvbnRleHQsICZjLT5zaWQp OwogICAgICAgICAgICAgaWYgKCByYyApCiAgICAgICAgICAgICAgICAgZ290byBvdXQ7CiAgICAg ICAgIH0KLSAgICAgICAgKm91dF9zaWQgPSBjLT5zaWRbMF07CisgICAgICAgICpvdXRfc2lkID0g Yy0+c2lkOwogICAgIH0KICAgICBlbHNlCiAgICAgewpAQCAtMjA4MSw3ICsyMDgxLDcgQEAgaW50 IHNlY3VyaXR5X29jb250ZXh0X2FkZCggdTMyIG9jb24sIHVuc2lnbmVkIGxvbmcgbG93LCB1bnNp Z25lZCBsb25nIGhpZ2gKIAogICAgIGlmICggKGFkZCA9IHh6YWxsb2Moc3RydWN0IG9jb250ZXh0 KSkgPT0gTlVMTCApCiAgICAgICAgIHJldHVybiAtRU5PTUVNOwotICAgIGFkZC0+c2lkWzBdID0g c2lkOworICAgIGFkZC0+c2lkID0gc2lkOwogCiAgICAgUE9MSUNZX1dSTE9DSzsKICAgICBzd2l0 Y2goIG9jb24gKQpAQCAtMjA5OSw3ICsyMDk5LDcgQEAgaW50IHNlY3VyaXR5X29jb250ZXh0X2Fk ZCggdTMyIG9jb24sIHVuc2lnbmVkIGxvbmcgbG93LCB1bnNpZ25lZCBsb25nIGhpZ2gKICAgICAg ICAgewogICAgICAgICAgICAgaWYgKCBjLT51LnBpcnEgPT0gYWRkLT51LnBpcnEgKQogICAgICAg ICAgICAgewotICAgICAgICAgICAgICAgIGlmICggYy0+c2lkWzBdID09IHNpZCApCisgICAgICAg ICAgICAgICAgaWYgKCBjLT5zaWQgPT0gc2lkICkKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgICAgICAgICAgcHJpbnRrKCIlczogRHVwbGljYXRlIHBpcnEgJWRcbiIsIF9fRlVO Q1RJT05fXywgYWRkLT51LnBpcnEpOwogICAgICAgICAgICAgICAgIHJldCA9IC1FRVhJU1Q7CkBA IC0yMTMwLDcgKzIxMzAsNyBAQCBpbnQgc2VjdXJpdHlfb2NvbnRleHRfYWRkKCB1MzIgb2Nvbiwg dW5zaWduZWQgbG9uZyBsb3csIHVuc2lnbmVkIGxvbmcgaGlnaAogICAgICAgICBpZiAoYyAmJiBj LT51LmlvcG9ydC5sb3dfaW9wb3J0IDw9IGhpZ2gpCiAgICAgICAgIHsKICAgICAgICAgICAgIGlm IChjLT51LmlvcG9ydC5sb3dfaW9wb3J0ID09IGxvdyAmJgotICAgICAgICAgICAgICAgIGMtPnUu aW9wb3J0LmhpZ2hfaW9wb3J0ID09IGhpZ2ggJiYgYy0+c2lkWzBdID09IHNpZCkKKyAgICAgICAg ICAgICAgICBjLT51LmlvcG9ydC5oaWdoX2lvcG9ydCA9PSBoaWdoICYmIGMtPnNpZCA9PSBzaWQp CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgIHByaW50aygiJXM6IElPIFBv cnQgb3ZlcmxhcCB3aXRoIGVudHJ5ICUjeCAtICUjeFxuIiwKQEAgLTIxNjQsNyArMjE2NCw3IEBA IGludCBzZWN1cml0eV9vY29udGV4dF9hZGQoIHUzMiBvY29uLCB1bnNpZ25lZCBsb25nIGxvdywg dW5zaWduZWQgbG9uZyBoaWdoCiAgICAgICAgIGlmIChjICYmIGMtPnUuaW9tZW0ubG93X2lvbWVt IDw9IGhpZ2gpCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmIChjLT51LmlvbWVtLmxvd19pb21l bSA9PSBsb3cgJiYKLSAgICAgICAgICAgICAgICBjLT51LmlvbWVtLmhpZ2hfaW9tZW0gPT0gaGln aCAmJiBjLT5zaWRbMF0gPT0gc2lkKQorICAgICAgICAgICAgICAgIGMtPnUuaW9tZW0uaGlnaF9p b21lbSA9PSBoaWdoICYmIGMtPnNpZCA9PSBzaWQpCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAK ICAgICAgICAgICAgIHByaW50aygiJXM6IElPIE1lbW9yeSBvdmVybGFwIHdpdGggZW50cnkgJSMi UFJJeDY0IiAtICUjIlBSSXg2NCJcbiIsCkBAIC0yMTk1LDcgKzIxOTUsNyBAQCBpbnQgc2VjdXJp dHlfb2NvbnRleHRfYWRkKCB1MzIgb2NvbiwgdW5zaWduZWQgbG9uZyBsb3csIHVuc2lnbmVkIGxv bmcgaGlnaAogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoIGMtPnUuZGV2aWNlID09IGFkZC0+ dS5kZXZpY2UgKQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIGlmICggYy0+c2lkWzBd ID09IHNpZCApCisgICAgICAgICAgICAgICAgaWYgKCBjLT5zaWQgPT0gc2lkICkKICAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgICAgICBwcmludGsoIiVzOiBEdXBsaWNh dGUgUENJIERldmljZSAlI3hcbiIsIF9fRlVOQ1RJT05fXywKQEAgLTIzNTksNyArMjM1OSw3IEBA IGludCBzZWN1cml0eV9kZXZpY2V0cmVlX3NldGxhYmVsKGNoYXIgKnBhdGgsIHUzMiBzaWQpCiAg ICAgICAgICAgICB4ZnJlZShwYXRoKTsKICAgICAgICAgICAgIHJldHVybiAtRU5PTUVNOwogICAg ICAgICB9Ci0gICAgICAgIGFkZC0+c2lkWzBdID0gc2lkOworICAgICAgICBhZGQtPnNpZCA9IHNp ZDsKICAgICAgICAgYWRkLT51Lm5hbWUgPSBwYXRoOwogICAgIH0KICAgICBlbHNlCi0tIAoyLjcu NAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1k ZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhl bi5vcmcveGVuLWRldmVsCg==