9289 2016-03-17 10:21:55 +0000 lighttpd mod_cgi fails to load with "undefined symbol: chunkqueue_written" 2016-03-21 22:46:26 +0000 1 1 7 Build System, Metadata & Runtime OE-Core core 2.0 All Multiple RESOLVED FIXED Medium+ normal 2.1 M4 1 nick ross.burton meta.mr.watcher meta.watcher --- --- No (bug/feature does not impact docs) oldest_to_newest 60068 0 nick 2016-03-17 10:21:55 +0000 lighttpd fails to load if mod_cgi is configured in at run time. The log error is "dlopen() failed for: /usr/lib/mod_cgi.so /usr/lib/mod_cgi.so: undefined symbol: chunkqueue_written" Reason is that Jethro introduced a new patch "0001-mod_cgi-buffers-data-without-bound.patch" to lighttpd. This patch is aimed at upstream issue #1264, "mod_cgi buffers data without bound (OOM on embedded system)" http://redmine.lighttpd.net/issues/1264 The patch as committed, although textually it applies against lighttpd 1.4.36 (the Jethro version), is logically based on lighttpd 1.4.35 or earlier (Dizzy). It invokes an internal API which was substantially changed in 1.4.36 and the required functions were removed. Quick solution would be to remove this patch. I may try to re-work it once I've finished my board bring-up and can run the test script in the upstream bug to see if it still applies, since that bug is over eight years old in itself. 60074 1 nick 2016-03-17 12:11:39 +0000 Just to note, having tested, the upstream issue (lighttpd working set can grow indefinitely) still applies at least in 1.4.36. 60076 2 ross.burton 2016-03-17 13:00:01 +0000 Oh, great. Can you send a patch with this summarised, removing the broken patch (for master and jethro)? 60089 3 3038 nick 2016-03-17 15:24:57 +0000 Created attachment 3038 Remove the faulty patch Sent to poky@yoctoproject.org, hope that the format is OK as I've not really worked on this sort of workflow before. Patch also attached here for completeness. 60226 4 ross.burton 2016-03-21 22:46:26 +0000 Merged in oe-core 880a346bf1bc4aa6c8569c6319c141433e13e1dd. 3038 2016-03-17 15:24:57 +0000 2016-03-17 15:24:57 +0000 Remove the faulty patch master-0001-lighttpd-fix-usr-lib-mod_cgi.so-undefined-symbol-chu.patch text/plain 14329 nick RnJvbSBjZGU2OTJjNTBkZmM4MjZjNGJhMTY2MzI2N2NmZjQ0YjkxMGE3OGRkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNrIExldmVydG9uIDxuaWNrQGxldmVydG9uLm9yZz4KRGF0 ZTogVGh1LCAxNyBNYXIgMjAxNiAxMzo1Mzo0MiArMDAwMApTdWJqZWN0OiBbUEFUQ0ggMS8xXSBs aWdodHRwZDogZml4IC91c3IvbGliL21vZF9jZ2kuc286IHVuZGVmaW5lZCBzeW1ib2w6CiBjaHVu a3F1ZXVlX3dyaXR0ZW4KCmxpZ2h0dHBkIGZhaWxzIHRvIGxvYWQgd2hlbiBtb2RfY2dpIGlzIGVu YWJsZWQgYXQgcnVuIHRpbWUsIHdpdGggdGhlCm1lc3NhZ2UgImRsb3BlbigpIGZhaWxlZCBmb3I6 IC91c3IvbGliL21vZF9jZ2kuc28gL3Vzci9saWIvbW9kX2NnaS5zbzoKdW5kZWZpbmVkIHN5bWJv bDogY2h1bmtxdWV1ZV93cml0dGVuIi4KClRoaXMgaXMgY2F1c2VkIGJ5IGEgcGF0Y2ggaW50ZW5k ZWQgdG8gcHJldmVudCBtZW1vcnkgZXhoYXVzdGlvbiBieQpuYWl2ZWx5IHN0cmVhbWluZyBDR0lz LCBhaW1lZCBhdCB1cHN0cmVhbSBpc3N1ZQpodHRwOi8vcmVkbWluZS5saWdodHRwZC5uZXQvaXNz dWVzLzEyNjQgLiBUaGUgcGF0Y2ggdXNlcyBpbnRlcm5hbCBBUEkKZnVuY3Rpb25zIGZyb20gb2xk ZXIgdmVyc2lvbnMgb2YgbGlnaHR0cGQgd2hpY2ggZG9uJ3QgZXhpc3QgaW4gdGhpcwp2ZXJzaW9u LiAgUmVtb3ZlIHRoZSBwYXRjaCwgcGVuZGluZyBhIGJldHRlciBmaXguCgpbIFlPQ1RPICM5Mjg5 IF0KClNpZ25lZC1vZmYtYnk6IE5pY2sgTGV2ZXJ0b24gPG5pY2tAbGV2ZXJ0b24ub3JnPgotLS0K IC4uLi8wMDAxLW1vZF9jZ2ktYnVmZmVycy1kYXRhLXdpdGhvdXQtYm91bmQucGF0Y2ggIHwgMzg3 IC0tLS0tLS0tLS0tLS0tLS0tLS0tLQogbWV0YS9yZWNpcGVzLWV4dGVuZGVkL2xpZ2h0dHBkL2xp Z2h0dHBkXzEuNC4zOS5iYiAgfCAgIDEgLQogMiBmaWxlcyBjaGFuZ2VkLCAzODggZGVsZXRpb25z KC0pCiBkZWxldGUgbW9kZSAxMDA2NDQgbWV0YS9yZWNpcGVzLWV4dGVuZGVkL2xpZ2h0dHBkL2xp Z2h0dHBkLzAwMDEtbW9kX2NnaS1idWZmZXJzLWRhdGEtd2l0aG91dC1ib3VuZC5wYXRjaAoKZGlm ZiAtLWdpdCBhL21ldGEvcmVjaXBlcy1leHRlbmRlZC9saWdodHRwZC9saWdodHRwZC8wMDAxLW1v ZF9jZ2ktYnVmZmVycy1kYXRhLXdpdGhvdXQtYm91bmQucGF0Y2ggYi9tZXRhL3JlY2lwZXMtZXh0 ZW5kZWQvbGlnaHR0cGQvbGlnaHR0cGQvMDAwMS1tb2RfY2dpLWJ1ZmZlcnMtZGF0YS13aXRob3V0 LWJvdW5kLnBhdGNoCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBhOWRmMTc0Li4wMDAw MDAwCi0tLSBhL21ldGEvcmVjaXBlcy1leHRlbmRlZC9saWdodHRwZC9saWdodHRwZC8wMDAxLW1v ZF9jZ2ktYnVmZmVycy1kYXRhLXdpdGhvdXQtYm91bmQucGF0Y2gKKysrIC9kZXYvbnVsbApAQCAt MSwzODcgKzAsMCBAQAotRnJvbSBlNmNjYmFiNWQ0MmIxMTBhYzRmNmNlMWY3MmNiMWU5Y2NiZTQ0 MDBhIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQotRnJvbTogTGkgeGluIDxsaXhpbi5mbnN0QGNu LmZ1aml0c3UuY29tPgotRGF0ZTogVHVlLCAxNiBKdW4gMjAxNSAxOTowMjozOCArMDkwMAotU3Vi amVjdDogW1BBVENIXSBtb2RfY2dpIGJ1ZmZlcnMgZGF0YSB3aXRob3V0IGJvdW5kIHNvIGZpeCBp dAotCi1VcHN0cmVhbS1TdGF0dXM6IFN1Ym1pdHRlZCBbaHR0cDovL3JlZG1pbmUubGlnaHR0cGQu bmV0L2lzc3Vlcy8xMjY0XQotCi1TaWduZWQtb2ZmLWJ5OiBMaSBYaW4gPGxpeGluLmZuc3RAY24u ZnVqaXRzdS5jb20+Ci0KLVVwZGF0ZSBjb250ZXh0IGZvciAxLjQuMzYuCi0KLVNpZ25lZC1vZmYt Ynk6IEthaSBLYW5nIDxrYWkua2FuZ0B3aW5kcml2ZXIuY29tPgotLS0tCi0gZG9jL2NvbmZpZy9s aWdodHRwZC5jb25mIHwgICA4ICsrCi0gc3JjL21vZF9jZ2kuYyAgICAgICAgICAgIHwgMTg4ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tCi0gMiBmaWxlcyBj aGFuZ2VkLCAxODcgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKLQotZGlmZiAtLWdpdCBh L2RvYy9jb25maWcvbGlnaHR0cGQuY29uZiBiL2RvYy9jb25maWcvbGlnaHR0cGQuY29uZgotaW5k ZXggNjBiMGFlMS4uOWMxMDFhNyAxMDA2NDQKLS0tLSBhL2RvYy9jb25maWcvbGlnaHR0cGQuY29u ZgotKysrIGIvZG9jL2NvbmZpZy9saWdodHRwZC5jb25mCi1AQCAtMzc1LDYgKzM3NSwxNCBAQCBz ZXJ2ZXIudXBsb2FkLWRpcnMgPSAoICIvdmFyL3RtcCIgKQotICMjCi0gIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMK LSAKLSsjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIwotKyMjCi0rIyMKLSsjIyBtYXhpbXVtIGJ5dGVzIGluIHNlbmRf cmF3IGJlZm9yZSBiYWNraW5nIG9mZiBbS0J5dGVdCi0rIyMgIGNnaS5oaWdoLXdhdGVybGV2ZWwg ICAgICAgID0gMTAyNDAKLSsjIyBtaW5pbXVtIGJ5dGVzIGluIHNlbmRfcmF3IHRvIGRpc2FibGUg YmFja29mZiBbS0J5dGVdCi0rIyMgIGNnaS5sb3ctd2F0ZXJsZXZlbCAgICAgICAgID0gNTEyMAot KyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjCi0gCi0gIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKLSAjIwotZGlmZiAtLWdpdCBhL3Ny Yy9tb2RfY2dpLmMgYi9zcmMvbW9kX2NnaS5jCi1pbmRleCAwMWIxODc3Li43YzY3ZWI1IDEwMDY0 NAotLS0tIGEvc3JjL21vZF9jZ2kuYwotKysrIGIvc3JjL21vZF9jZ2kuYwotQEAgLTM4LDYgKzM4 LDEwIEBACi0gCi0gI2luY2x1ZGUgInZlcnNpb24uaCIKLSAKLSsvKiBmb3Igb3V0cHV0IGxvZ3Mg Ki8KLStjaGFyIG1zZ2J1ZlsyMDQ4XTsKLSsKLSsKLSBlbnVtIHtFT0xfVU5TRVQsIEVPTF9OLCBF T0xfUk59OwotIAotIHR5cGVkZWYgc3RydWN0IHsKLUBAIC01Myw5ICs1NywxOSBAQCB0eXBlZGVm IHN0cnVjdCB7Ci0gCXNpemVfdCBzaXplOwotIH0gYnVmZmVyX3BpZF90OwotIAotK3N0cnVjdCBo YW5kbGVyX2N0eDsKLSsKLSt0eXBlZGVmIHN0cnVjdCB7Ci0rCXN0cnVjdCBoYW5kbGVyX2N0eCAq KmhjdHg7Ci0rCXNpemVfdCB1c2VkOwotKwlzaXplX3Qgc2l6ZTsKLSt9IGJ1ZmZlcl9jdHhfdDsK LSsKLSB0eXBlZGVmIHN0cnVjdCB7Ci0gCWFycmF5ICpjZ2k7Ci0gCXVuc2lnbmVkIHNob3J0IGV4 ZWN1dGVfeF9vbmx5OwotKwl1bnNpZ25lZCBpbnQgaGlnaF93YXRlcmxldmVsOyAvKiBtYXhpbXVt IGJ5dGVzIGluIHNlbmRfcmF3IGJlZm9yZSBiYWNraW5nIG9mZiAqLwotKwl1bnNpZ25lZCBpbnQg bG93X3dhdGVybGV2ZWw7ICAvKiBtaW5pbXVtIGJ5dGVzIGluIHNlbmRfcmF3IHRvIGRpc2FibGUg YmFja29mZiAqLwotIH0gcGx1Z2luX2NvbmZpZzsKLSAKLSB0eXBlZGVmIHN0cnVjdCB7Ci1AQCAt NjgsOSArODIsMTEgQEAgdHlwZWRlZiBzdHJ1Y3QgewotIAlwbHVnaW5fY29uZmlnICoqY29uZmln X3N0b3JhZ2U7Ci0gCi0gCXBsdWdpbl9jb25maWcgY29uZjsKLSsKLSsJYnVmZmVyX2N0eF90IGNn aV9jdHg7Ci0gfSBwbHVnaW5fZGF0YTsKLSAKLS10eXBlZGVmIHN0cnVjdCB7Ci0rdHlwZWRlZiBz dHJ1Y3QgaGFuZGxlcl9jdHggewotIAlwaWRfdCBwaWQ7Ci0gCWludCBmZDsKLSAJaW50IGZkZV9u ZHg7IC8qIGluZGV4IGludG8gdGhlIGZkLWV2ZW50IGJ1ZmZlciAqLwotQEAgLTc4LDExICs5NCwx NiBAQCB0eXBlZGVmIHN0cnVjdCB7Ci0gCWNvbm5lY3Rpb24gKnJlbW90ZV9jb25uOyAgLyogZHVt YiBwb2ludGVyICovCi0gCXBsdWdpbl9kYXRhICpwbHVnaW5fZGF0YTsgLyogZHVtYiBwb2ludGVy ICovCi0gCi0rCWludCB0aHJvdHRsaW5nOyAgICAgICAgLyogMT13YWl0aW5nIGZvciBzZW5kX3Jh dyBidWZmZXIgdG8gZHJhaW4gKi8KLSsJb2ZmX3QgaGlnaF93YXRlcmxldmVsOyAvKiBtYXhpbXVt IGJ5dGVzIGluIHNlbmRfcmF3IGJlZm9yZSBiYWNraW5nIG9mZiAqLwotKwlvZmZfdCBsb3dfd2F0 ZXJsZXZlbDsgIC8qIG1pbmltdW0gYnl0ZXMgaW4gc2VuZF9yYXcgdG8gZGlzYWJsZSBiYWNrb2Zm ICovCi0rCW9mZl90IGJ5dGVzX2luX2J1ZmZlcjsKLSsKLSAJYnVmZmVyICpyZXNwb25zZTsKLSAJ YnVmZmVyICpyZXNwb25zZV9oZWFkZXI7Ci0gfSBoYW5kbGVyX2N0eDsKLSAKLS1zdGF0aWMgaGFu ZGxlcl9jdHggKiBjZ2lfaGFuZGxlcl9jdHhfaW5pdCh2b2lkKSB7Ci0rc3RhdGljIGhhbmRsZXJf Y3R4ICogY2dpX2hhbmRsZXJfY3R4X2luaXQocGx1Z2luX2RhdGEgKnApIHsKLSAJaGFuZGxlcl9j dHggKmhjdHggPSBjYWxsb2MoMSwgc2l6ZW9mKCpoY3R4KSk7Ci0gCi0gCWZvcmNlX2Fzc2VydCho Y3R4KTsKLUBAIC05MCwxMyArMTExLDI2IEBAIHN0YXRpYyBoYW5kbGVyX2N0eCAqIGNnaV9oYW5k bGVyX2N0eF9pbml0KHZvaWQpIHsKLSAJaGN0eC0+cmVzcG9uc2UgPSBidWZmZXJfaW5pdCgpOwot IAloY3R4LT5yZXNwb25zZV9oZWFkZXIgPSBidWZmZXJfaW5pdCgpOwotIAotKwloY3R4LT50aHJv dHRsaW5nID0gMDsKLSsJaGN0eC0+aGlnaF93YXRlcmxldmVsID0gKG9mZl90KXAtPmNvbmYuaGln aF93YXRlcmxldmVsICogMTAyNDsKLSsJaGN0eC0+bG93X3dhdGVybGV2ZWwgID0gKG9mZl90KXAt PmNvbmYubG93X3dhdGVybGV2ZWwgICogMTAyNDsKLSsJaWYgKGhjdHgtPmxvd193YXRlcmxldmVs ID49IGhjdHgtPmhpZ2hfd2F0ZXJsZXZlbCkgewotKwkgICAgaGN0eC0+bG93X3dhdGVybGV2ZWwg PSBoY3R4LT5oaWdoX3dhdGVybGV2ZWwgKiAzIC8gNDsgLyogNzUlICovCi0rCX0KLSsJaGN0eC0+ Ynl0ZXNfaW5fYnVmZmVyID0gMDsKLSsKLSAJcmV0dXJuIGhjdHg7Ci0gfQotIAotLXN0YXRpYyB2 b2lkIGNnaV9oYW5kbGVyX2N0eF9mcmVlKGhhbmRsZXJfY3R4ICpoY3R4KSB7Ci0rc3RhdGljIHZv aWQgY2dpX2hhbmRsZXJfY3R4X2ZyZWUoc2VydmVyICpzcnYsIGhhbmRsZXJfY3R4ICpoY3R4KSB7 Ci0gCWJ1ZmZlcl9mcmVlKGhjdHgtPnJlc3BvbnNlKTsKLSAJYnVmZmVyX2ZyZWUoaGN0eC0+cmVz cG9uc2VfaGVhZGVyKTsKLSAKLSsJLyogdG8gYXZvaWQgY29uZnVzaW9uICovCi0rCWlmIChoY3R4 LT50aHJvdHRsaW5nKSB7Ci0rCSAgICBsb2dfZXJyb3Jfd3JpdGUoc3J2LCBfX0ZJTEVfXywgX19M SU5FX18sICJzIiwgInVudGhyb3R0bGVkIik7Ci0rCX0KLSsKLSAJZnJlZShoY3R4KTsKLSB9Ci0g Ci1AQCAtMTU0LDYgKzE4OCw4IEBAIFNFVERFRkFVTFRTX0ZVTkMobW9kX2Zhc3RjZ2lfc2V0X2Rl ZmF1bHRzKSB7Ci0gCWNvbmZpZ192YWx1ZXNfdCBjdltdID0gewotIAkJeyAiY2dpLmFzc2lnbiIs ICAgICAgICAgICAgICAgICAgTlVMTCwgVF9DT05GSUdfQVJSQVksIFRfQ09ORklHX1NDT1BFX0NP Tk5FQ1RJT04gfSwgICAgICAgLyogMCAqLwotIAkJeyAiY2dpLmV4ZWN1dGUteC1vbmx5IiwgICAg ICAgICAgTlVMTCwgVF9DT05GSUdfQk9PTEVBTiwgVF9DT05GSUdfU0NPUEVfQ09OTkVDVElPTiB9 LCAgICAgLyogMSAqLwotKwkJeyAiY2dpLmhpZ2gtd2F0ZXJsZXZlbCIsICAgICAgICAgTlVMTCwg VF9DT05GSUdfSU5ULCAgIFRfQ09ORklHX1NDT1BFX0NPTk5FQ1RJT04gfSwgICAgICAgLyogMiAq LwotKwkJeyAiY2dpLmxvdy13YXRlcmxldmVsIiwgICAgICAgICAgTlVMTCwgVF9DT05GSUdfSU5U LCAgIFRfQ09ORklHX1NDT1BFX0NPTk5FQ1RJT04gfSwgICAgICAgLyogMyAqLwotIAkJeyBOVUxM LCAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCwgVF9DT05GSUdfVU5TRVQsIFRfQ09ORklH X1NDT1BFX1VOU0VUfQotIAl9OwotIAotQEAgLTE2OSw5ICsyMDUsMTMgQEAgU0VUREVGQVVMVFNf RlVOQyhtb2RfZmFzdGNnaV9zZXRfZGVmYXVsdHMpIHsKLSAKLSAJCXMtPmNnaSAgICA9IGFycmF5 X2luaXQoKTsKLSAJCXMtPmV4ZWN1dGVfeF9vbmx5ID0gMDsKLSsJCXMtPmhpZ2hfd2F0ZXJsZXZl bCA9IDA7IC8qIDAgPT0gZGlzYWJsZWQgKi8KLSsJCXMtPmxvd193YXRlcmxldmVsICA9IDA7Ci0g Ci0gCQljdlswXS5kZXN0aW5hdGlvbiA9IHMtPmNnaTsKLSAJCWN2WzFdLmRlc3RpbmF0aW9uID0g JihzLT5leGVjdXRlX3hfb25seSk7Ci0rCQljdlsyXS5kZXN0aW5hdGlvbiA9ICYocy0+aGlnaF93 YXRlcmxldmVsKTsKLSsJCWN2WzNdLmRlc3RpbmF0aW9uID0gJihzLT5sb3dfd2F0ZXJsZXZlbCk7 Ci0gCi0gCQlwLT5jb25maWdfc3RvcmFnZVtpXSA9IHM7Ci0gCi1AQCAtMTg0LDYgKzIyNCw1MSBA QCBTRVRERUZBVUxUU19GVU5DKG1vZF9mYXN0Y2dpX3NldF9kZWZhdWx0cykgewotIH0KLSAKLSAK LStzdGF0aWMgdm9pZCBjZ2lfcmVjb3VudF9ieXRlc19pbl9idWZmZXIoaGFuZGxlcl9jdHggKmhj dHgpCi0rewotKwljaHVua3F1ZXVlICpjcSA9IGhjdHgtPnJlbW90ZV9jb25uLT53cml0ZV9xdWV1 ZTsKLSsJaGN0eC0+Ynl0ZXNfaW5fYnVmZmVyID0gY2h1bmtxdWV1ZV9sZW5ndGgoY3EpIC0gY2h1 bmtxdWV1ZV93cml0dGVuKGNxKTsKLSt9Ci0rCi0rCi0rc3RhdGljIHZvaWQgY2dpX3Rocm90dGxp bmdfY29udHJvbChzZXJ2ZXIgKnNydiwgaGFuZGxlcl9jdHggKmhjdHgpCi0rewotKwljZ2lfcmVj b3VudF9ieXRlc19pbl9idWZmZXIoaGN0eCk7Ci0rCi0rI2lmZGVmIERFQlVHCi0rCXNwcmludGYo bXNnYnVmLCAidGhyb3R0bGluZz0lZCwgY2hhcnM9JWxsdSwgaGlnaD0lbGx1LCBsb3c9JWxsdSIs Ci0rCQloY3R4LT50aHJvdHRsaW5nLCBoY3R4LT5ieXRlc19pbl9idWZmZXIsCi0rCQloY3R4LT5o aWdoX3dhdGVybGV2ZWwsIGhjdHgtPmxvd193YXRlcmxldmVsKTsKLSsJbG9nX2Vycm9yX3dyaXRl KHNydiwgX19GSUxFX18sIF9fTElORV9fLCAic3MiLAotKwkJCSIoZGVidWcpIHRocm90dGxpbmcg Y29udHJvbCwiLCBtc2didWYpOwotKyNlbmRpZgotKwotKwlpZiAoaGN0eC0+dGhyb3R0bGluZykg ewotKwkJc3ByaW50Zihtc2didWYsICJ0aHJvdHRsaW5nOyBjaGFycyBpbiBxdWV1ZT0lbGx1LCIK LSsJCQkiIGxvdy13YXRlcmxldmVsPSVsbHUsIGhpZ2gtd2F0ZXJsZXZlbD0lbGx1IiwKLSsJCQlo Y3R4LT5ieXRlc19pbl9idWZmZXIsCi0rCQkJaGN0eC0+bG93X3dhdGVybGV2ZWwsIGhjdHgtPmhp Z2hfd2F0ZXJsZXZlbCk7Ci0rCQlsb2dfZXJyb3Jfd3JpdGUoc3J2LCBfX0ZJTEVfXywgX19MSU5F X18sICJzIiwgbXNnYnVmKTsKLSsJCWlmIChoY3R4LT5ieXRlc19pbl9idWZmZXIgPD0gaGN0eC0+ bG93X3dhdGVybGV2ZWwpIHsKLSsJCQlmZGV2ZW50X2V2ZW50X3NldChzcnYtPmV2LCAmKGhjdHgt PmZkZV9uZHgpLCBoY3R4LT5mZCwgRkRFVkVOVF9JTik7Ci0rCQkJaGN0eC0+dGhyb3R0bGluZyA9 IDA7Ci0rCQkJbG9nX2Vycm9yX3dyaXRlKHNydiwgX19GSUxFX18sIF9fTElORV9fLCAicyIsICJ1 bnRocm90dGxlZCIpOwotKwkJfQotKwl9IGVsc2UgewotKwkJaWYgKGhjdHgtPmhpZ2hfd2F0ZXJs ZXZlbCAhPSAwICYmCi0rCQkJaGN0eC0+aGlnaF93YXRlcmxldmVsIDw9IGhjdHgtPmJ5dGVzX2lu X2J1ZmZlcikgewotKwkJCWZkZXZlbnRfZXZlbnRfZGVsKHNydi0+ZXYsICYoaGN0eC0+ZmRlX25k eCksIGhjdHgtPmZkKTsKLSsJCQloY3R4LT50aHJvdHRsaW5nID0gMTsKLSsJCQlzcHJpbnRmKG1z Z2J1ZiwgInRocm90dGxlZDsgY2hhcnMgaW4gcXVldWU9JWxsdSwiCi0rCQkJCSIgbG93LXdhdGVy bGV2ZWw9JWxsdSwgaGlnaC13YXRlcmxldmVsPSVsbHUiLAotKwkJCQloY3R4LT5ieXRlc19pbl9i dWZmZXIsCi0rCQkJCWhjdHgtPmxvd193YXRlcmxldmVsLCBoY3R4LT5oaWdoX3dhdGVybGV2ZWwp OwotKwkJCWxvZ19lcnJvcl93cml0ZShzcnYsIF9fRklMRV9fLCBfX0xJTkVfXywgInMiLCBtc2di dWYpOwotKwkJfQotKwl9Ci0rfQotKwotKwotIHN0YXRpYyBpbnQgY2dpX3BpZF9hZGQoc2VydmVy ICpzcnYsIHBsdWdpbl9kYXRhICpwLCBwaWRfdCBwaWQpIHsKLSAJaW50IG0gPSAtMTsKLSAJc2l6 ZV90IGk7Ci1AQCAtMjMwLDYgKzMxNSwzOSBAQCBzdGF0aWMgaW50IGNnaV9waWRfZGVsKHNlcnZl ciAqc3J2LCBwbHVnaW5fZGF0YSAqcCwgcGlkX3QgcGlkKSB7Ci0gCXJldHVybiAwOwotIH0KLSAK LSsKLStzdGF0aWMgdm9pZCBjZ2lfY3R4X2FkZChwbHVnaW5fZGF0YSAqcCwgaGFuZGxlcl9jdHgg KmhjdHgpIHsKLSsJYnVmZmVyX2N0eF90ICpyID0gJihwLT5jZ2lfY3R4KTsKLSsKLSsJaWYgKHIt PnNpemUgPT0gMCkgewotKwkJci0+c2l6ZSA9IDE2OwotKwkJci0+aGN0eCA9IG1hbGxvYyhzaXpl b2YoKnItPmhjdHgpICogci0+c2l6ZSk7Ci0rCX0gZWxzZSBpZiAoci0+dXNlZCA9PSByLT5zaXpl KSB7Ci0rCQlyLT5zaXplICs9IDE2OwotKwkJci0+aGN0eCA9IHJlYWxsb2Moci0+aGN0eCwgc2l6 ZW9mKCpyLT5oY3R4KSAqIHItPnNpemUpOwotKwl9Ci0rCi0rCXItPmhjdHhbci0+dXNlZCsrXSA9 IGhjdHg7Ci0rfQotKwotK3N0YXRpYyB2b2lkIGNnaV9jdHhfZGVsKHBsdWdpbl9kYXRhICpwLCBo YW5kbGVyX2N0eCAqaGN0eCkgewotKwlzaXplX3QgaTsKLSsJYnVmZmVyX2N0eF90ICpyID0gJihw LT5jZ2lfY3R4KTsKLSsKLSsJZm9yIChpID0gMDsgaSA8IHItPnVzZWQ7IGkrKykgewotKwkJaWYg KHItPmhjdHhbaV0gPT0gaGN0eCkgYnJlYWs7Ci0rCX0KLSsKLSsJaWYgKGkgIT0gci0+dXNlZCkg ewotKwkJLyogZm91bmQgKi8KLSsKLSsJCWlmIChpICE9IHItPnVzZWQgLSAxKSB7Ci0rCQkJci0+ aGN0eFtpXSA9IHItPmhjdHhbci0+dXNlZCAtIDFdOwotKwkJfQotKwkJci0+dXNlZC0tOwotKwl9 Ci0rfQotKwotIHN0YXRpYyBpbnQgY2dpX3Jlc3BvbnNlX3BhcnNlKHNlcnZlciAqc3J2LCBjb25u ZWN0aW9uICpjb24sIHBsdWdpbl9kYXRhICpwLCBidWZmZXIgKmluKSB7Ci0gCWNoYXIgKm5zOwot IAljb25zdCBjaGFyICpzOwotQEAgLTM4MCw2ICs0OTgsMTQgQEAgc3RhdGljIGludCBjZ2lfZGVt dXhfcmVzcG9uc2Uoc2VydmVyICpzcnYsIGhhbmRsZXJfY3R4ICpoY3R4KSB7Ci0gCi0gCQlidWZm ZXJfY29tbWl0KGhjdHgtPnJlc3BvbnNlLCBuKTsKLSAKLSsjaWZkZWYgREVCVUcKLSsJCXNwcmlu dGYobXNnYnVmLCAibj0lZCwgYnl0ZXNfb3V0PSVsbHUsIGJ5dGVzX2luPSVsbHUiLCBuLAotKwkJ CSh1bnNpZ25lZCBsb25nIGxvbmcpY29uLT53cml0ZV9xdWV1ZS0+Ynl0ZXNfb3V0LAotKwkJCSh1 bnNpZ25lZCBsb25nIGxvbmcpY29uLT53cml0ZV9xdWV1ZS0+Ynl0ZXNfaW4pOwotKwkJbG9nX2Vy cm9yX3dyaXRlKHNydiwgX19GSUxFX18sIF9fTElORV9fLCAic3MiLAotKwkJCQkiKGRlYnVnKSBy ZWFkLCIsIG1zZ2J1Zik7Ci0rI2VuZGlmCi0rCi0gCQkvKiBzcGxpdCBoZWFkZXIgZnJvbSBib2R5 ICovCi0gCi0gCQlpZiAoY29uLT5maWxlX3N0YXJ0ZWQgPT0gMCkgewotQEAgLTUwMyw3ICs2Mjks MjAgQEAgc3RhdGljIGludCBjZ2lfZGVtdXhfcmVzcG9uc2Uoc2VydmVyICpzcnYsIGhhbmRsZXJf Y3R4ICpoY3R4KSB7Ci0gCQkJfQotIAkJfSBlbHNlIHsKLSAJCQlodHRwX2NodW5rX2FwcGVuZF9i dWZmZXIoc3J2LCBjb24sIGhjdHgtPnJlc3BvbnNlKTsKLSsjaWZkZWYgREVCVUcKLSsJCQlzcHJp bnRmKG1zZ2J1ZiwgIm49JWQsIGJ5dGVzX291dD0lbGx1LCBieXRlc19pbj0lbGx1LCBsaW1pdD0l bGx1IiwgbiwKLSsJCQkJKHVuc2lnbmVkIGxvbmcgbG9uZyljb24tPndyaXRlX3F1ZXVlLT5ieXRl c19vdXQsCi0rCQkJCSh1bnNpZ25lZCBsb25nIGxvbmcpY29uLT53cml0ZV9xdWV1ZS0+Ynl0ZXNf aW4sCi0rCQkJCSh1bnNpZ25lZCBsb25nIGxvbmcpaGN0eC0+aGlnaF93YXRlcmxldmVsKTsKLSsJ CQlsb2dfZXJyb3Jfd3JpdGUoc3J2LCBfX0ZJTEVfXywgX19MSU5FX18sCi0rCQkJCQkic3MiLCAi KGRlYnVnKSBhcHBlbmQsIiwgbXNnYnVmKTsKLSsjZW5kaWYKLSAJCQlqb2JsaXN0X2FwcGVuZChz cnYsIGNvbik7Ci0rCi0rCQkJY2dpX3Rocm90dGxpbmdfY29udHJvbChzcnYsIGhjdHgpOwotKwkJ CWlmIChoY3R4LT50aHJvdHRsaW5nKSB7Ci0rCQkJCXJldHVybiBGREVWRU5UX0hBTkRMRURfTk9U X0ZJTklTSEVEOwotKwkJCX0KLSAJCX0KLSAKLSAjaWYgMAotQEAgLTU1Myw4ICs2OTIsOSBAQCBz dGF0aWMgaGFuZGxlcl90IGNnaV9jb25uZWN0aW9uX2Nsb3NlKHNlcnZlciAqc3J2LCBoYW5kbGVy X2N0eCAqaGN0eCkgewotIAljb24tPnBsdWdpbl9jdHhbcC0+aWRdID0gTlVMTDsKLSAKLSAJLyog aXMgdGhpcyBhIGdvb2QgaWRlYSA/ICovCi0tCWNnaV9oYW5kbGVyX2N0eF9mcmVlKGhjdHgpOwot LQotKwljZ2lfY3R4X2RlbChwLCBoY3R4KTsKLSsJY2dpX2hhbmRsZXJfY3R4X2ZyZWUoc3J2LCBo Y3R4KTsKLSsJCi0gCS8qIGlmIHdhaXRwaWQgaGFzbid0IGJlZW4gY2FsbGVkIGJ5IHJlc3BvbnNl LmMgeWV0LCBkbyBpdCBoZXJlICovCi0gCWlmIChwaWQpIHsKLSAJCS8qIGNoZWNrIGlmIHRoZSBD R0ktc2NyaXB0IGlzIGFscmVhZHkgZ29uZSAqLwotQEAgLTExMDUsNyArMTI0NSw4IEBAIHN0YXRp YyBpbnQgY2dpX2NyZWF0ZV9lbnYoc2VydmVyICpzcnYsIGNvbm5lY3Rpb24gKmNvbiwgcGx1Z2lu X2RhdGEgKnAsIGJ1ZmZlciAqCi0gCQljb24tPm1vZGUgPSBwLT5pZDsKLSAJCWJ1ZmZlcl9yZXNl dChjb24tPnBoeXNpY2FsLnBhdGgpOwotIAotLQkJaGN0eCA9IGNnaV9oYW5kbGVyX2N0eF9pbml0 KCk7Ci0rCQloY3R4ID0gY2dpX2hhbmRsZXJfY3R4X2luaXQocCk7Ci0rCQljZ2lfY3R4X2FkZChw LCBoY3R4KTsKLSAKLSAJCWhjdHgtPnJlbW90ZV9jb25uID0gY29uOwotIAkJaGN0eC0+cGx1Z2lu X2RhdGEgPSBwOwotQEAgLTExMTQsNiArMTI1NSwxMSBAQCBzdGF0aWMgaW50IGNnaV9jcmVhdGVf ZW52KHNlcnZlciAqc3J2LCBjb25uZWN0aW9uICpjb24sIHBsdWdpbl9kYXRhICpwLCBidWZmZXIg KgotIAkJaGN0eC0+ZmRlX25keCA9IC0xOwotIAotIAkJY29uLT5wbHVnaW5fY3R4W3AtPmlkXSA9 IGhjdHg7Ci0rI2lmZGVmIERFQlVHCi0rCQlzcHJpbnRmKG1zZ2J1ZiwgImhjdHg9JXAsIGNvbj0l cCIsICh2b2lkKiloY3R4LCAodm9pZCopY29uKTsKLSsJCWxvZ19lcnJvcl93cml0ZShzcnYsIF9f RklMRV9fLCBfX0xJTkVfXywgInNzIiwKLSsJCQkJIihkZWJ1ZykgaGN0eCBnZW5lcmF0ZWQsICIs IG1zZ2J1Zik7Ci0rI2VuZGlmCi0gCi0gCQlmZGV2ZW50X3JlZ2lzdGVyKHNydi0+ZXYsIGhjdHgt PmZkLCBjZ2lfaGFuZGxlX2ZkZXZlbnQsIGhjdHgpOwotIAkJZmRldmVudF9ldmVudF9zZXQoc3J2 LT5ldiwgJihoY3R4LT5mZGVfbmR4KSwgaGN0eC0+ZmQsIEZERVZFTlRfSU4pOwotQEAgLTExMjgs NyArMTI3NCw4IEBAIHN0YXRpYyBpbnQgY2dpX2NyZWF0ZV9lbnYoc2VydmVyICpzcnYsIGNvbm5l Y3Rpb24gKmNvbiwgcGx1Z2luX2RhdGEgKnAsIGJ1ZmZlciAqCi0gCi0gCQkJY2xvc2UoaGN0eC0+ ZmQpOwotIAotLQkJCWNnaV9oYW5kbGVyX2N0eF9mcmVlKGhjdHgpOwotKwkJCWNnaV9jdHhfZGVs KHAsIGhjdHgpOwotKwkJCWNnaV9oYW5kbGVyX2N0eF9mcmVlKHNydiwgaGN0eCk7Ci0gCi0gCQkJ Y29uLT5wbHVnaW5fY3R4W3AtPmlkXSA9IE5VTEw7Ci0gCi1AQCAtMTE1Myw2ICsxMzAwLDggQEAg c3RhdGljIGludCBtb2RfY2dpX3BhdGNoX2Nvbm5lY3Rpb24oc2VydmVyICpzcnYsIGNvbm5lY3Rp b24gKmNvbiwgcGx1Z2luX2RhdGEgKnAKLSAKLSAJUEFUQ0goY2dpKTsKLSAJUEFUQ0goZXhlY3V0 ZV94X29ubHkpOwotKwlQQVRDSChoaWdoX3dhdGVybGV2ZWwpOwotKwlQQVRDSChsb3dfd2F0ZXJs ZXZlbCk7Ci0gCi0gCS8qIHNraXAgdGhlIGZpcnN0LCB0aGUgZ2xvYmFsIGNvbnRleHQgKi8KLSAJ Zm9yIChpID0gMTsgaSA8IHNydi0+Y29uZmlnX2NvbnRleHQtPnVzZWQ7IGkrKykgewotQEAgLTEx NzAsNiArMTMxOSwxMCBAQCBzdGF0aWMgaW50IG1vZF9jZ2lfcGF0Y2hfY29ubmVjdGlvbihzZXJ2 ZXIgKnNydiwgY29ubmVjdGlvbiAqY29uLCBwbHVnaW5fZGF0YSAqcAotIAkJCQlQQVRDSChjZ2kp OwotIAkJCX0gZWxzZSBpZiAoYnVmZmVyX2lzX2VxdWFsX3N0cmluZyhkdS0+a2V5LCBDT05TVF9T VFJfTEVOKCJjZ2kuZXhlY3V0ZS14LW9ubHkiKSkpIHsKLSAJCQkJUEFUQ0goZXhlY3V0ZV94X29u bHkpOwotKwkJCX0gZWxzZSBpZiAoYnVmZmVyX2lzX2VxdWFsX3N0cmluZyhkdS0+a2V5LCBDT05T VF9TVFJfTEVOKCJjZ2kuaGlnaC13YXRlcmxldmVsIikpKSB7Ci0rCQkJCVBBVENIKGhpZ2hfd2F0 ZXJsZXZlbCk7Ci0rCQkJfSBlbHNlIGlmIChidWZmZXJfaXNfZXF1YWxfc3RyaW5nKGR1LT5rZXks IENPTlNUX1NUUl9MRU4oImNnaS5sb3ctd2F0ZXJsZXZlbCIpKSkgewotKwkJCQlQQVRDSChsb3df d2F0ZXJsZXZlbCk7Ci0gCQkJfQotIAkJfQotIAl9Ci1AQCAtMTIyMiw2ICsxMzc1LDIxIEBAIFVS SUhBTkRMRVJfRlVOQyhjZ2lfaXNfaGFuZGxlZCkgewotIFRSSUdHRVJfRlVOQyhjZ2lfdHJpZ2dl cikgewotIAlwbHVnaW5fZGF0YSAqcCA9IHBfZDsKLSAJc2l6ZV90IG5keDsKLSsKLSsJZm9yIChu ZHggPSAwOyBuZHggPCBwLT5jZ2lfY3R4LnVzZWQ7IG5keCsrKSB7Ci0rCQloYW5kbGVyX2N0eCAq aGN0eCA9IHAtPmNnaV9jdHguaGN0eFtuZHhdOwotKyNpZmRlZiBERUJVRwotKwkJY29ubmVjdGlv biAqY29uID0gaGN0eC0+cmVtb3RlX2Nvbm47Ci0rCQotKwkJc3ByaW50Zihtc2didWYsICJoY3R4 PSVwLCBjb249JXAsIGJ5dGVzX2luX2J1ZmZlcj0lbGx1IiwKLSsJCQkodm9pZCopaGN0eCwgKHZv aWQqKWNvbiwKLSsJCQkodW5zaWduZWQgbG9uZyBsb25nKWhjdHgtPmJ5dGVzX2luX2J1ZmZlcik7 Ci0rCQlsb2dfZXJyb3Jfd3JpdGUoc3J2LCBfX0ZJTEVfXywgX19MSU5FX18sICJzcyIsCi0rCQkJ CSIoZGVidWcpIGZvdW5kIHVzaW5nIGN0eCwiLCBtc2didWYpOwotKyNlbmRpZgotKwkJY2dpX3Ro cm90dGxpbmdfY29udHJvbChzcnYsIGhjdHgpOwotKwl9Ci0rCi0gCS8qIHRoZSB0cmlnZ2VyIGhh bmRsZSBvbmx5IGNhcmVzIGFib3V0IGxvbmVseSBQSUQgd2hpY2ggd2UgaGF2ZSB0byB3YWl0IGZv ciAqLwotICNpZm5kZWYgX19XSU4zMgotIAotQEAgLTEzMzAsNyArMTQ5OCw4IEBAIFNVQlJFUVVF U1RfRlVOQyhtb2RfY2dpX2hhbmRsZV9zdWJyZXF1ZXN0KSB7Ci0gCQkJbG9nX2Vycm9yX3dyaXRl KHNydiwgX19GSUxFX18sIF9fTElORV9fLCAic2RzIiwgImNnaSBjbG9zZSBmYWlsZWQgIiwgaGN0 eC0+ZmQsIHN0cmVycm9yKGVycm5vKSk7Ci0gCQl9Ci0gCi0tCQljZ2lfaGFuZGxlcl9jdHhfZnJl ZShoY3R4KTsKLSsJCWNnaV9jdHhfZGVsKHAsIGhjdHgpOwotKwkJY2dpX2hhbmRsZXJfY3R4X2Zy ZWUoc3J2LCBoY3R4KTsKLSAKLSAJCWNvbi0+cGx1Z2luX2N0eFtwLT5pZF0gPSBOVUxMOwotIAot QEAgLTEzNjIsNyArMTUzMSw4IEBAIFNVQlJFUVVFU1RfRlVOQyhtb2RfY2dpX2hhbmRsZV9zdWJy ZXF1ZXN0KSB7Ci0gCQkJbG9nX2Vycm9yX3dyaXRlKHNydiwgX19GSUxFX18sIF9fTElORV9fLCAi c2RzIiwgImNnaSBjbG9zZSBmYWlsZWQgIiwgaGN0eC0+ZmQsIHN0cmVycm9yKGVycm5vKSk7Ci0g CQl9Ci0gCi0tCQljZ2lfaGFuZGxlcl9jdHhfZnJlZShoY3R4KTsKLSsJCWNnaV9jdHhfZGVsKHAs IGhjdHgpOwotKwkJY2dpX2hhbmRsZXJfY3R4X2ZyZWUoc3J2LCBoY3R4KTsKLSAKLSAJCWNvbi0+ cGx1Z2luX2N0eFtwLT5pZF0gPSBOVUxMOwotIAkJcmV0dXJuIEhBTkRMRVJfRklOSVNIRUQ7CmRp ZmYgLS1naXQgYS9tZXRhL3JlY2lwZXMtZXh0ZW5kZWQvbGlnaHR0cGQvbGlnaHR0cGRfMS40LjM5 LmJiIGIvbWV0YS9yZWNpcGVzLWV4dGVuZGVkL2xpZ2h0dHBkL2xpZ2h0dHBkXzEuNC4zOS5iYgpp bmRleCBhNDA3ZDAzLi4zNzhhY2NiIDEwMDY0NAotLS0gYS9tZXRhL3JlY2lwZXMtZXh0ZW5kZWQv bGlnaHR0cGQvbGlnaHR0cGRfMS40LjM5LmJiCisrKyBiL21ldGEvcmVjaXBlcy1leHRlbmRlZC9s aWdodHRwZC9saWdodHRwZF8xLjQuMzkuYmIKQEAgLTIxLDcgKzIxLDYgQEAgU1JDX1VSSSA9ICJo dHRwOi8vZG93bmxvYWQubGlnaHR0cGQubmV0L2xpZ2h0dHBkL3JlbGVhc2VzLTEuNC54L2xpZ2h0 dHBkLSR7UFZ9LnQKICAgICAgICAgZmlsZTovL2xpZ2h0dHBkIFwKICAgICAgICAgZmlsZTovL2xp Z2h0dHBkLnNlcnZpY2UgXAogICAgICAgICBmaWxlOi8vcGtnY29uZmlnLnBhdGNoIFwKLSAgICAg ICAgZmlsZTovLzAwMDEtbW9kX2NnaS1idWZmZXJzLWRhdGEtd2l0aG91dC1ib3VuZC5wYXRjaCBc CiAgICAgICAgICIKIAogU1JDX1VSSVttZDVzdW1dID0gIjYzYzc1NjNiZTFjN2E3YTk4MTlhNTFm MDdmMWFmOGIyIgotLSAKMi4xLjQKCg==