From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============8948797273510130146==" MIME-Version: 1.0 From: Kurt Roeckx To: elfutils-devel@lists.fedorahosted.org Subject: Re: MIPS and -msym32 Date: Fri, 15 Aug 2014 18:42:24 +0200 Message-ID: <20140815164224.GA12437@roeckx.be> In-Reply-To: 20140815152456.GA9271@roeckx.be --===============8948797273510130146== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable On Fri, Aug 15, 2014 at 05:24:56PM +0200, Kurt Roeckx wrote: > = > There is an other mips related patch in Debian. I have code for > that, it was mailed to this list, I needed to make some changes, > I think I've done that but I didn't really finish them so it was > never send. I can send what I currently have if that's useful. So the patch currently in Debian is: Index: elfutils-0.153/src/readelf.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- elfutils-0.153.orig/src/readelf.c 2012-08-10 22:01:55.000000000 +0200 +++ elfutils-0.153/src/readelf.c 2012-09-18 21:46:27.000000000 +0200 @@ -7364,7 +7364,8 @@ GElf_Shdr shdr_mem; GElf_Shdr *shdr =3D gelf_getshdr (scn, &shdr_mem); - if (shdr !=3D NULL && shdr->sh_type =3D=3D SHT_PROGBITS) + if (shdr !=3D NULL && ( + (shdr->sh_type =3D=3D SHT_PROGBITS) || (shdr->sh_type =3D=3D SHT_M= IPS_DWARF))) { static const struct { I think the patch in attachment is supposed to replace that, together with the proper implementation of the hook in the mips backend. Kurt --===============8948797273510130146== Content-Type: text/x-diff MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="check_debug_section.patch" ZGlmZiAtLWdpdCBhL2JhY2tlbmRzL2kzODZfc3ltYm9sLmMgYi9iYWNrZW5kcy9pMzg2X3N5bWJv bC5jCmluZGV4IDdkYmY4OTkuLmMwOTExOWQgMTAwNjQ0Ci0tLSBhL2JhY2tlbmRzL2kzODZfc3lt Ym9sLmMKKysrIGIvYmFja2VuZHMvaTM4Nl9zeW1ib2wuYwpAQCAtNjUsMTEgKzY1LDE2IEBAIGkz ODZfcmVsb2Nfc2ltcGxlX3R5cGUgKEVibCAqZWJsIF9fYXR0cmlidXRlX18gKCh1bnVzZWQpKSwg aW50IHR5cGUpCiB9CiAKIC8qIENoZWNrIHNlY3Rpb24gbmFtZSBmb3IgYmVpbmcgdGhhdCBvZiBh IGRlYnVnIGluZm9ybWF0aW9uIHNlY3Rpb24uICAqLwotYm9vbCAoKmdlbmVyaWNfZGVidWdzY25f cCkgKGNvbnN0IGNoYXIgKik7Citib29sICgqZ2VuZXJpY19kZWJ1Z3Njbl9wKSAoY29uc3QgR0Vs Zl9TaGRyICpzaGRyLCBjb25zdCBjaGFyICopOwogYm9vbAotaTM4Nl9kZWJ1Z3Njbl9wIChjb25z dCBjaGFyICpuYW1lKQoraTM4Nl9kZWJ1Z3Njbl9wIChjb25zdCBHRWxmX1NoZHIgKnNoZHIsIGNv bnN0IGNoYXIgKm5hbWUpCiB7Ci0gIHJldHVybiAoZ2VuZXJpY19kZWJ1Z3Njbl9wIChuYW1lKQor ICBpZiAoc2hkciAmJiBzaGRyLT5zaF90eXBlICE9IFNIVF9QUk9HQklUUykKKyAgICByZXR1cm4g ZmFsc2U7CisgIGlmICghbmFtZSkKKyAgICByZXR1cm4gZmFsc2U7CisKKyAgcmV0dXJuIChnZW5l cmljX2RlYnVnc2NuX3AgKHNoZHIsIG5hbWUpCiAJICB8fCBzdHJjbXAgKG5hbWUsICIuc3RhYiIp ID09IDAKIAkgIHx8IHN0cmNtcCAobmFtZSwgIi5zdGFic3RyIikgPT0gMCk7CiB9CmRpZmYgLS1n aXQgYS9iYWNrZW5kcy9saWJlYmxfQ1BVLmggYi9iYWNrZW5kcy9saWJlYmxfQ1BVLmgKaW5kZXgg MzZiM2E0YS4uYmRiNGFmMSAxMDA2NDQKLS0tIGEvYmFja2VuZHMvbGliZWJsX0NQVS5oCisrKyBi L2JhY2tlbmRzL2xpYmVibF9DUFUuaApAQCAtNDMsNyArNDMsNyBAQCBleHRlcm4gY29uc3QgY2hh ciAqRUJMSE9PSyhpbml0KSAoRWxmICplbGYsIEdFbGZfSGFsZiBtYWNoaW5lLAogCiAjZGVmaW5l IEhPT0soZWgsIG5hbWUpCWVoLT5uYW1lID0gRUJMSE9PSyhuYW1lKQogCi1leHRlcm4gYm9vbCAo KmdlbmVyaWNfZGVidWdzY25fcCkgKGNvbnN0IGNoYXIgKikgYXR0cmlidXRlX2hpZGRlbjsKK2V4 dGVybiBib29sICgqZ2VuZXJpY19kZWJ1Z3Njbl9wKSAoY29uc3QgR0VsZl9TaGRyICpzaGRyLCBj b25zdCBjaGFyICopIGF0dHJpYnV0ZV9oaWRkZW47CiAKIAogI2VuZGlmCS8qIGxpYmVibF9DUFUu aCAqLwpkaWZmIC0tZ2l0IGEvbGliZHdmbC9yZWxvY2F0ZS5jIGIvbGliZHdmbC9yZWxvY2F0ZS5j CmluZGV4IDJjMjRiZDUuLmE0YjQ1OTQgMTAwNjQ0Ci0tLSBhL2xpYmR3ZmwvcmVsb2NhdGUuYwor KysgYi9saWJkd2ZsL3JlbG9jYXRlLmMKQEAgLTI4OCw3ICsyODgsNyBAQCByZWxvY2F0ZV9zZWN0 aW9uIChEd2ZsX01vZHVsZSAqbW9kLCBFbGYgKnJlbG9jYXRlZCwgY29uc3QgR0VsZl9FaGRyICpl aGRyLAogICAgIC8qIE5vIGNvbnRlbnRzIHRvIHJlbG9jYXRlLiAgKi8KICAgICByZXR1cm4gRFdG TF9FX05PRVJST1I7CiAKLSAgaWYgKGRlYnVnc2NuICYmICEgZWJsX2RlYnVnc2NuX3AgKG1vZC0+ ZWJsLCB0bmFtZSkpCisgIGlmIChkZWJ1Z3NjbiAmJiAhIGVibF9kZWJ1Z3Njbl9wIChtb2QtPmVi bCwgdHNoZHIsIHRuYW1lKSkKICAgICAvKiBUaGlzIHJlbG9jYXRpb24gc2VjdGlvbiBpcyBub3Qg Zm9yIGEgZGVidWdnaW5nIHNlY3Rpb24uCiAgICAgICAgTm90aGluZyB0byBkbyBoZXJlLiAgKi8K ICAgICByZXR1cm4gRFdGTF9FX05PRVJST1I7CmRpZmYgLS1naXQgYS9saWJlYmwvZWJsLWhvb2tz LmggYi9saWJlYmwvZWJsLWhvb2tzLmgKaW5kZXggZDNjZjNlNi4uYmI3ZmIyMiAxMDA2NDQKLS0t IGEvbGliZWJsL2VibC1ob29rcy5oCisrKyBiL2xpYmVibC9lYmwtaG9va3MuaApAQCAtMTA4LDgg KzEwOCw4IEBAIGJvb2wgRUJMSE9PSyhjaGVja19vYmplY3RfYXR0cmlidXRlKSAoRWJsICosIGNv bnN0IGNoYXIgKiwgaW50LCB1aW50NjRfdCwKIC8qIERlc2NyaWJlIGF1eHYgZWxlbWVudCB0eXBl LiAgKi8KIGludCBFQkxIT09LKGF1eHZfaW5mbykgKEdFbGZfWHdvcmQsIGNvbnN0IGNoYXIgKios IGNvbnN0IGNoYXIgKiopOwogCi0vKiBDaGVjayBzZWN0aW9uIG5hbWUgZm9yIGJlaW5nIHRoYXQg b2YgYSBkZWJ1ZyBpbmZvcm1hdGlubyBzZWN0aW9uLiAgKi8KLWJvb2wgRUJMSE9PSyhkZWJ1Z3Nj bl9wKSAoY29uc3QgY2hhciAqKTsKKy8qIENoZWNrIHNlY3Rpb24gZm9yIGJlaW5nIHRoYXQgb2Yg YSBkZWJ1ZyBpbmZvcm1hdGlvbiBzZWN0aW9uLiAgKi8KK2Jvb2wgRUJMSE9PSyhkZWJ1Z3Njbl9w KSAoY29uc3QgR0VsZl9TaGRyICosIGNvbnN0IGNoYXIgKik7CiAKIC8qIENoZWNrIHdoZXRoZXIg Z2l2ZW4gcmVsb2NhdGlvbiBpcyBhIGNvcHkgcmVsb2NhdGlvbi4gICovCiBib29sIEVCTEhPT0so Y29weV9yZWxvY19wKSAoaW50KTsKZGlmZiAtLWdpdCBhL2xpYmVibC9lYmxkZWJ1Z3NjbnAuYyBi L2xpYmVibC9lYmxkZWJ1Z3NjbnAuYwppbmRleCBmMjM1MWUyLi42ODE3ZjI2IDEwMDY0NAotLS0g YS9saWJlYmwvZWJsZGVidWdzY25wLmMKKysrIGIvbGliZWJsL2VibGRlYnVnc2NucC5jCkBAIC0x LDQgKzEsNCBAQAotLyogQ2hlY2sgc2VjdGlvbiBuYW1lIGZvciBiZWluZyB0aGF0IG9mIGEgZGVi dWcgaW5mb3JtYXRpbm8gc2VjdGlvbi4KKy8qIENoZWNrIHNlY3Rpb24gZm9yIGJlaW5nIHRoYXQg b2YgYSBkZWJ1ZyBpbmZvcm1hdGlvbiBzZWN0aW9uLgogICAgQ29weXJpZ2h0IChDKSAyMDAyIFJl ZCBIYXQsIEluYy4KICAgIFRoaXMgZmlsZSBpcyBwYXJ0IG9mIGVsZnV0aWxzLgogICAgV3JpdHRl biBieSBVbHJpY2ggRHJlcHBlciA8ZHJlcHBlckByZWRoYXQuY29tPiwgMjAwMi4KQEAgLTM2LDkg KzM2LDcgQEAKIAogCiBib29sCi1lYmxfZGVidWdzY25fcCAoZWJsLCBuYW1lKQotICAgICBFYmwg KmVibDsKLSAgICAgY29uc3QgY2hhciAqbmFtZTsKK2VibF9kZWJ1Z3Njbl9wIChFYmwgKmVibCwg Y29uc3QgR0VsZl9TaGRyICpzaGRyLCBjb25zdCBjaGFyICpuYW1lKQogewotICByZXR1cm4gZWJs LT5kZWJ1Z3Njbl9wIChuYW1lKTsKKyAgcmV0dXJuIGVibC0+ZGVidWdzY25fcCAoc2hkciwgbmFt ZSk7CiB9CmRpZmYgLS1naXQgYS9saWJlYmwvZWJsb3BlbmJhY2tlbmQuYyBiL2xpYmVibC9lYmxv cGVuYmFja2VuZC5jCmluZGV4IGVkMGMwZmYuLmI0OGFiMGMgMTAwNjQ0Ci0tLSBhL2xpYmVibC9l YmxvcGVuYmFja2VuZC5jCisrKyBiL2xpYmVibC9lYmxvcGVuYmFja2VuZC5jCkBAIC0xNzQsNyAr MTc0LDcgQEAgc3RhdGljIGludCBkZWZhdWx0X2F1eHZfaW5mbyAoR0VsZl9Yd29yZCBhX3R5cGUs CiAJCQkgICAgICBjb25zdCBjaGFyICoqbmFtZSwgY29uc3QgY2hhciAqKmZvcm1hdCk7CiBzdGF0 aWMgYm9vbCBkZWZhdWx0X29iamVjdF9ub3RlIChjb25zdCBjaGFyICpuYW1lLCB1aW50MzJfdCB0 eXBlLAogCQkJCSB1aW50MzJfdCBkZXNjc3osIGNvbnN0IGNoYXIgKmRlc2MpOwotc3RhdGljIGJv b2wgZGVmYXVsdF9kZWJ1Z3Njbl9wIChjb25zdCBjaGFyICpuYW1lKTsKK3N0YXRpYyBib29sIGRl ZmF1bHRfZGVidWdzY25fcCAoY29uc3QgR0VsZl9TaGRyICpzaGRyLCBjb25zdCBjaGFyICpuYW1l KTsKIHN0YXRpYyBib29sIGRlZmF1bHRfY29weV9yZWxvY19wIChpbnQgcmVsb2MpOwogc3RhdGlj IGJvb2wgZGVmYXVsdF9ub25lX3JlbG9jX3AgKGludCByZWxvYyk7CiBzdGF0aWMgYm9vbCBkZWZh dWx0X3JlbGF0aXZlX3JlbG9jX3AgKGludCByZWxvYyk7CkBAIC02MTcsNyArNjE3LDcgQEAgZGVm YXVsdF9vYmplY3Rfbm90ZSAoY29uc3QgY2hhciAqbmFtZSBfX2F0dHJpYnV0ZV9fICgodW51c2Vk KSksCiB9CiAKIHN0YXRpYyBib29sCi1kZWZhdWx0X2RlYnVnc2NuX3AgKGNvbnN0IGNoYXIgKm5h bWUpCitkZWZhdWx0X2RlYnVnc2NuX3AgKGNvbnN0IEdFbGZfU2hkciAqc2hkciwgY29uc3QgY2hh ciAqbmFtZSkKIHsKICAgLyogV2Uga25vdyBieSBkZWZhdWx0IG9ubHkgYWJvdXQgdGhlIERXQVJG IGRlYnVnIHNlY3Rpb25zIHdoaWNoIGhhdmUKICAgICAgZml4ZWQgbmFtZXMuICAqLwpAQCAtNjU3 LDYgKzY1NywxMiBAQCBkZWZhdWx0X2RlYnVnc2NuX3AgKGNvbnN0IGNoYXIgKm5hbWUpCiAgICAg fTsKICAgY29uc3Qgc2l6ZV90IG5kd2FyZl9zY25fbmFtZXMgPSAoc2l6ZW9mIChkd2FyZl9zY25f bmFtZXMpCiAJCQkJICAgLyBzaXplb2YgKGR3YXJmX3Njbl9uYW1lc1swXSkpOworCisgIGlmIChz aGRyICYmIHNoZHItPnNoX3R5cGUgIT0gU0hUX1BST0dCSVRTKQorICAgIHJldHVybiBmYWxzZTsK KyAgaWYgKCFuYW1lKQorICAgIHJldHVybiBmYWxzZTsKKwogICBmb3IgKHNpemVfdCBjbnQgPSAw OyBjbnQgPCBuZHdhcmZfc2NuX25hbWVzOyArK2NudCkKICAgICBpZiAoc3RyY21wIChuYW1lLCBk d2FyZl9zY25fbmFtZXNbY250XSkgPT0gMCkKICAgICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0 IGEvbGliZWJsL2VibHNlY3Rpb25zdHJpcHAuYyBiL2xpYmVibC9lYmxzZWN0aW9uc3RyaXBwLmMK aW5kZXggOTQ5NzA2OC4uZWNlNDNkYyAxMDA2NDQKLS0tIGEvbGliZWJsL2VibHNlY3Rpb25zdHJp cHAuYworKysgYi9saWJlYmwvZWJsc2VjdGlvbnN0cmlwcC5jCkBAIC00Myw3ICs0Myw3IEBAIGVi bF9zZWN0aW9uX3N0cmlwX3AgKEVibCAqZWJsLCBjb25zdCBHRWxmX0VoZHIgKmVoZHIsIGNvbnN0 IEdFbGZfU2hkciAqc2hkciwKICAgICAgaXMgdW5mb3J0dW5hdGVseSBubyBvdGhlciB3YXkuICAq LwogICBpZiAodW5saWtlbHkgKG9ubHlfcmVtb3ZlX2RlYnVnKSkKICAgICB7Ci0gICAgICBpZiAo ZWJsX2RlYnVnc2NuX3AgKGVibCwgbmFtZSkpCisgICAgICBpZiAoZWJsX2RlYnVnc2NuX3AgKGVi bCwgc2hkciwgbmFtZSkpCiAJcmV0dXJuIHRydWU7CiAKICAgICAgIGlmIChzaGRyLT5zaF90eXBl ID09IFNIVF9SRUxBIHx8IHNoZHItPnNoX3R5cGUgPT0gU0hUX1JFTCkKQEAgLTU1LDcgKzU1LDcg QEAgZWJsX3NlY3Rpb25fc3RyaXBfcCAoRWJsICplYmwsIGNvbnN0IEdFbGZfRWhkciAqZWhkciwg Y29uc3QgR0VsZl9TaGRyICpzaGRyLAogCSAgICB7CiAJICAgICAgY29uc3QgY2hhciAqc19sID0g ZWxmX3N0cnB0ciAoZWJsLT5lbGYsIGVoZHItPmVfc2hzdHJuZHgsCiAJCQkJCSAgICBzaGRyX2wt PnNoX25hbWUpOwotCSAgICAgIGlmIChzX2wgIT0gTlVMTCAmJiBlYmxfZGVidWdzY25fcCAoZWJs LCBzX2wpKQorCSAgICAgIGlmIChzX2wgIT0gTlVMTCAmJiBlYmxfZGVidWdzY25fcCAoZWJsLCBz aGRyX2wsIHNfbCkpCiAJCXJldHVybiB0cnVlOwogCSAgICB9CiAJfQpkaWZmIC0tZ2l0IGEvbGli ZWJsL2xpYmVibC5oIGIvbGliZWJsL2xpYmVibC5oCmluZGV4IGNhZTMxYzkuLmQ4MWIyMWUgMTAw NjQ0Ci0tLSBhL2xpYmVibC9saWJlYmwuaAorKysgYi9saWJlYmwvbGliZWJsLmgKQEAgLTE4MCw4 ICsxODAsOCBAQCBleHRlcm4gYm9vbCBlYmxfY2hlY2tfb2JqZWN0X2F0dHJpYnV0ZSAoRWJsICpl YmwsIGNvbnN0IGNoYXIgKnZlbmRvciwKIAkJCQkJY29uc3QgY2hhciAqKnZhbHVlX25hbWUpOwog CiAKLS8qIENoZWNrIHNlY3Rpb24gbmFtZSBmb3IgYmVpbmcgdGhhdCBvZiBhIGRlYnVnIGluZm9y bWF0aW5vIHNlY3Rpb24uICAqLwotZXh0ZXJuIGJvb2wgZWJsX2RlYnVnc2NuX3AgKEVibCAqZWJs LCBjb25zdCBjaGFyICpuYW1lKTsKKy8qIENoZWNrIHNlY3Rpb24gZm9yIGJlaW5nIHRoYXQgb2Yg YSBkZWJ1ZyBpbmZvcm1hdGlvbiBzZWN0aW9uLiAgKi8KK2V4dGVybiBib29sIGVibF9kZWJ1Z3Nj bl9wIChFYmwgKmVibCwgY29uc3QgR0VsZl9TaGRyICpzaGRyLCBjb25zdCBjaGFyICpuYW1lKTsK IAogLyogQ2hlY2sgd2hldGhlciBnaXZlbiByZWxvY2F0aW9uIGlzIGEgY29weSByZWxvY2F0aW9u LiAgKi8KIGV4dGVybiBib29sIGVibF9jb3B5X3JlbG9jX3AgKEVibCAqZWJsLCBpbnQgcmVsb2Mp OwpkaWZmIC0tZ2l0IGEvc3JjL2xkZ2VuZXJpYy5jIGIvc3JjL2xkZ2VuZXJpYy5jCmluZGV4IDFi NWQwZjkuLmIyMDk2MjIgMTAwNjQ0Ci0tLSBhL3NyYy9sZGdlbmVyaWMuYworKysgYi9zcmMvbGRn ZW5lcmljLmMKQEAgLTg3OSwxMiArODc5LDEzIEBAIG1hcmtfc2VjdGlvbl9ncm91cCAoc3RydWN0 IHVzZWRmaWxlcyAqZmlsZWluZm8sIEVsZjMyX1dvcmQgc2huZHgsCiAKICAgICAgIGlmIChsZF9z dGF0ZS5zdHJpcCA9PSBzdHJpcF9ub25lCiAJICAvKiBJZiB3ZSBhcmUgc3RyaXBwaW5nLCByZW1v dmUgZGVidWcgc2VjdGlvbnMuICAqLwotCSAgfHwgKCFlYmxfZGVidWdzY25fcCAobGRfc3RhdGUu ZWJsLAorCSAgfHwgKCFlYmxfZGVidWdzY25fcCAobGRfc3RhdGUuZWJsLCBzaGRyLAogCQkJICAg ICAgIGVsZl9zdHJwdHIgKGZpbGVpbmZvLT5lbGYsIGZpbGVpbmZvLT5zaHN0cm5keCwKIAkJCQkJ ICAgc2hkci0+c2hfbmFtZSkpCiAJICAgICAgLyogQW5kIHRoZSByZWxvY2F0aW9uIHNlY3Rpb25z IGZvciB0aGUgZGVidWcgc2VjdGlvbnMuICAqLwogCSAgICAgICYmICgoc2hkci0+c2hfdHlwZSAh PSBTSFRfUkVMQSAmJiBzaGRyLT5zaF90eXBlICE9IFNIVF9SRUwpCiAJCSAgfHwgIWVibF9kZWJ1 Z3Njbl9wIChsZF9zdGF0ZS5lYmwsCisJCQkJICAgICAgJlNDTklORk9fU0hEUiAoZmlsZWluZm8t PnNjbmluZm9bc2hkci0+c2hfaW5mb10uc2hkciksCiAJCQkJICAgICAgZWxmX3N0cnB0ciAoZmls ZWluZm8tPmVsZiwKIAkJCQkJCSAgZmlsZWluZm8tPnNoc3RybmR4LAogCQkJCQkJICBTQ05JTkZP X1NIRFIgKGZpbGVpbmZvLT5zY25pbmZvW3NoZHItPnNoX2luZm9dLnNoZHIpLnNoX25hbWUpKSkp KQpkaWZmIC0tZ2l0IGEvc3JjL2xkc2NyaXB0LnkgYi9zcmMvbGRzY3JpcHQueQppbmRleCBlYzU4 ZTIxLi42YWNiZTUzIDEwMDY0NAotLS0gYS9zcmMvbGRzY3JpcHQueQorKysgYi9zcmMvbGRzY3Jp cHQueQpAQCAtMjEyLDcgKzIxMiw3IEBAIG91dHB1dHNlY3Rpb246CSAgYXNzaWdubWVudCAnOycK IAkJICAgICAgJCQtPnZhbC5zZWN0aW9uLm5hbWUgPSAkMTsKIAkJICAgICAgJCQtPnZhbC5zZWN0 aW9uLmlucHV0ID0gJDMtPm5leHQ7CiAJCSAgICAgIGlmIChsZF9zdGF0ZS5zdHJpcCA9PSBzdHJp cF9kZWJ1ZwotCQkJICAmJiBlYmxfZGVidWdzY25fcCAobGRfc3RhdGUuZWJsLCAkMSkpCisJCQkg ICYmIGVibF9kZWJ1Z3Njbl9wIChsZF9zdGF0ZS5lYmwsIE5VTEwsICQxKSkKIAkJCSQkLT52YWwu c2VjdGlvbi5pZ25vcmVkID0gdHJ1ZTsKIAkJICAgICAgZWxzZQogCQkJJCQtPnZhbC5zZWN0aW9u Lmlnbm9yZWQgPSBmYWxzZTsKQEAgLTIzNSw3ICsyMzUsNyBAQCBvdXRwdXRzZWN0aW9uOgkgIGFz c2lnbm1lbnQgJzsnCiAJCQluZXdfaW5wdXRfc2VjdGlvbl9uYW1lICgkMSwgZmFsc2UpOwogCQkg ICAgICAkJC0+dmFsLnNlY3Rpb24uaW5wdXQtPnZhbC5zZWN0aW9uLT5rZWVwX2ZsYWcgPSBmYWxz ZTsKIAkJICAgICAgaWYgKGxkX3N0YXRlLnN0cmlwID09IHN0cmlwX2RlYnVnCi0JCQkgICYmIGVi bF9kZWJ1Z3Njbl9wIChsZF9zdGF0ZS5lYmwsICQxKSkKKwkJCSAgJiYgZWJsX2RlYnVnc2NuX3Ag KGxkX3N0YXRlLmVibCwgTlVMTCwgJDEpKQogCQkJJCQtPnZhbC5zZWN0aW9uLmlnbm9yZWQgPSB0 cnVlOwogCQkgICAgICBlbHNlCiAJCQkkJC0+dmFsLnNlY3Rpb24uaWdub3JlZCA9IGZhbHNlOwpk aWZmIC0tZ2l0IGEvc3JjL3N0cmlwLmMgYi9zcmMvc3RyaXAuYwppbmRleCA1ZTljODgzLi45MjVl NTA1IDEwMDY0NAotLS0gYS9zcmMvc3RyaXAuYworKysgYi9zcmMvc3RyaXAuYwpAQCAtMTY0OCw3 ICsxNjQ4LDcgQEAgaGFuZGxlX2VsZiAoaW50IGZkLCBFbGYgKmVsZiwgY29uc3QgY2hhciAqcHJl Zml4LCBjb25zdCBjaGFyICpmbmFtZSwKIAogCSAgICAgIGNvbnN0IGNoYXIgKnRuYW1lID0gIGVs Zl9zdHJwdHIgKGRlYnVnZWxmLCBzaHN0cm5keCwKIAkJCQkJICAgICAgIHRzaGRyLT5zaF9uYW1l KTsKLQkgICAgICBpZiAoISB0bmFtZSB8fCAhIGVibF9kZWJ1Z3Njbl9wIChlYmwsIHRuYW1lKSkK KwkgICAgICBpZiAoISBlYmxfZGVidWdzY25fcCAoZWJsLCB0c2hkciwgdG5hbWUpKQogCQljb250 aW51ZTsKIAogCSAgICAgIC8qIE9LLCBsZXRzIHJlbG9jYXRlIGFsbCB0cml2aWFsIGNyb3NzIGRl YnVnIHNlY3Rpb24KQEAgLTE2OTgsNyArMTY5OCw4IEBAIGhhbmRsZV9lbGYgKGludCBmZCwgRWxm ICplbGYsIGNvbnN0IGNoYXIgKnByZWZpeCwgY29uc3QgY2hhciAqZm5hbWUsCiAJCQkJCQkgICZ4 bmR4KTsKIAkJRWxmMzJfV29yZCBzZWMgPSAoc3ltLT5zdF9zaG5keCA9PSBTSE5fWElOREVYCiAJ CQkJICA/IHhuZHggOiBzeW0tPnN0X3NobmR4KTsKLQkJaWYgKGVibF9kZWJ1Z3Njbl9wIChlYmws IHNoZHJfaW5mb1tzZWNdLm5hbWUpKQorCQlpZiAoZWJsX2RlYnVnc2NuX3AgKGVibCwgJnNoZHJf aW5mb1tzZWNdLnNoZHIsCisJCQkJICAgIHNoZHJfaW5mb1tzZWNdLm5hbWUpKQogCQkgIHsKIAkJ ICAgIHNpemVfdCBzaXplOwogCg== --===============8948797273510130146==--