46345 2023-06-01 07:47:06 +0300 nss: ошибка сборки с GCC 13 2023-06-12 22:47:03 +0300 1 1 4 Development Sisyphus nss unstable all Linux CLOSED FIXED P5 normal --- 45802 1 asheplyakov legion asheplyakov iv legion nir rauty sin qa-sisyphus oldest_to_newest 226835 0 asheplyakov 2023-06-01 07:47:06 +0300 [1382/1456] CC obj/cmd/ecperf/ecperf.ecperf.o FAILED: obj/cmd/ecperf/ecperf.ecperf.o gcc -MMD -MF obj/cmd/ecperf/ecperf.ecperf.o.d -DNSS_USE_STATIC_LIBS -DNSS_FIPS_DISABLED -DNSS_NO_INIT_SUPPORT -DNSS_USE _64 -DUSE_UTIL_DIRECTLY -DNO_NSPR_10_SUPPORT -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES -DLINUX2_1 -DLINUX -Dlinux -D_ DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DSDB_MEASURE_USE_TEMP_DIR -DHAVE_STRERROR -DXP_UNIX -D_REENTRANT -DNDEBUG -I../../lib/softoken -I/usr/include/nspr -I/usr/src/RPM/BUILD/nss-3.89.0/dist/private/nss -I/usr/src/RPM/BUILD/nss-3.8 9.0/dist/public/dbm -I/usr/src/RPM/BUILD/nss-3.89.0/dist/public/nss -fPIC -pipe -ffunction-sections -fdata-sections -We rror -Wall -Wshadow -O2 -std=c99 -c ../../cmd/ecperf/ecperf.c -o obj/cmd/ecperf/ecperf.ecperf.o ../../cmd/ecperf/ecperf.c: In function 'genericThread': ../../cmd/ecperf/ecperf.c:99:24: error: storing the address of local variable 'sig' in '*threadData.p2' [-Werror=dangli ng-pointer=] 99 | threadData->p2 = (void *)&sig; | ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ ../../cmd/ecperf/ecperf.c:91:13: note: 'sig' declared here 91 | SECItem sig; | ^~~ ../../cmd/ecperf/ecperf.c:86:21: note: 'data' declared here 86 | genericThread(void *data) | ~~~~~~^~~~ ../../cmd/ecperf/ecperf.c: In function 'PKCS11Thread': ../../cmd/ecperf/ecperf.c:71:24: error: storing the address of local variable 'sig' in '*threadData.p2' [-Werror=dangli ng-pointer=] 71 | threadData->p2 = (void *)&sig; | ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ ../../cmd/ecperf/ecperf.c:53:13: note: 'sig' declared here 53 | SECItem sig; | ^~~ ../../cmd/ecperf/ecperf.c:47:20: note: 'data' declared here 47 | PKCS11Thread(void *data) | ~~~~~~^~~~ cc1: all warnings being treated as errors 226836 1 13353 asheplyakov 2023-06-01 07:58:47 +0300 Created attachment 13353 патч для исправления ошибки 226901 2 legion 2023-06-01 19:50:26 +0300 (Ответ для Alexey Sheplyakov на комментарий #1) > Создано вложение 13353 [подробности] > патч для исправления ошибки Это не исправление ошибки, а игнорирование. Но спасибо за патч. 226903 3 asheplyakov 2023-06-01 20:34:21 +0300 (Ответ для Alexey Gladkov на комментарий #2) > (Ответ для Alexey Sheplyakov на комментарий #1) > > Создано вложение 13353 [подробности] > > патч для исправления ошибки > > Это не исправление ошибки, а игнорирование. Нет. threadData->p2 действительно содержит адрес локальной переменной. Но threadData->p2 читает только поток, входной точкой которого является функция genericThread (для того, чтобы вызвать нужную функцию в данном потоке). А основной поток читает только threadData->count. Но компилятор об этом знать не может (он вообще про потоки не знает), так что ему надо помочь. Можно было переписать код примерно так: 46 void 47 PKCS11Thread(void *data) 48 { 49 ThreadData *threadData = (ThreadData *)data; 50 pk11_op_func op = (pk11_op_func)threadData->op; 51 int iters = threadData->iters; 52 unsigned char sigData[256]; 53 SECItem sig; 54 CK_SESSION_HANDLE session; 55 CK_RV crv; 56 void *p2 = threadData->p2; 57 58 threadData->status = SECSuccess; 59 threadData->count = 0; 60 61 /* get our thread's session */ 62 PR_Lock(threadData->lock); 63 crv = NSC_OpenSession(1, CKF_SERIAL_SESSION, NULL, 0, &session); 64 PR_Unlock(threadData->lock); 65 if (crv != CKR_OK) { 66 return; 67 } 68 69 if (threadData->isSign) { 70 sig.data = sigData; 71 sig.len = sizeof(sigData); 72 p2 = (void *)&sig; 73 } 74 75 while (iters--) { 76 threadData->status = (*op)(session, threadData->p1, 77 p2, threadData->p3); 78 if (threadData->status != SECSuccess) { 79 break; 80 } 81 threadData->count++; 82 } 83 return; 84 } Но не хочется делать это только ради того, чтобы ублажить компилятор. И при беглом взгляде возникает вопрос - а зачем эта возня с p2, почему нельзя просто threadData->p2 использовать? Технически значение thre > Но спасибо за патч. 226904 4 13363 asheplyakov 2023-06-01 21:03:44 +0300 Created attachment 13363 ещё один вариант исправления 226905 5 asheplyakov 2023-06-01 21:05:24 +0300 (Ответ для Alexey Sheplyakov на комментарий #4) > Создано вложение 13363 [подробности] > ещё один вариант исправления Собственно взял и переписал, как рассказал в предыдущем комментарии. А кому существование p2 покажется странным наверное сможет посмотреть в git blame. 227439 6 legion 2023-06-12 22:47:03 +0300 gcc13 в сизифе нет, но я верю, что в nss 3.90.0-alt1 всё исправлено. 13353 2023-06-01 07:58:47 +0300 2023-06-01 21:03:44 +0300 патч для исправления ошибки 0001-Fixed-build-error-with-GCC-13.patch text/plain 3415 asheplyakov RnJvbSBiOTg0Y2I2ZDgwZDhkYWEwNGMzNTkxNWVlODg4NTNlNjYxZWI0ZmIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4ZXkgU2hlcGx5YWtvdiA8YXNoZXBseWFrb3ZAYmFzZWFs dC5ydT4KRGF0ZTogVGh1LCAxIEp1biAyMDIzIDA0OjUwOjMyICswMDAwClN1YmplY3Q6IFtQQVRD SF0gRml4ZWQgYnVpbGQgZXJyb3Igd2l0aCBHQ0MgMTMKCkZvciBub3cgZGlzYWJsZSAtV2Rhbmds aW5nLXBvaW50ZXIgaW4gdGhlIHByb2JsZW1hdGljIGNvZGUuCgpbMTM4Mi8xNDU2XSBDQyBvYmov Y21kL2VjcGVyZi9lY3BlcmYuZWNwZXJmLm8KRkFJTEVEOiBvYmovY21kL2VjcGVyZi9lY3BlcmYu ZWNwZXJmLm8KZ2NjIC1NTUQgLU1GIG9iai9jbWQvZWNwZXJmL2VjcGVyZi5lY3BlcmYuby5kIC1E TlNTX1VTRV9TVEFUSUNfTElCUyAtRE5TU19GSVBTX0RJU0FCTEVEIC1ETlNTX05PX0lOSVRfU1VQ UE9SVCAtRE5TU19VU0UKXzY0IC1EVVNFX1VUSUxfRElSRUNUTFkgLUROT19OU1BSXzEwX1NVUFBP UlQgLURTU0xfRElTQUJMRV9ERVBSRUNBVEVEX0NJUEhFUl9TVUlURV9OQU1FUyAtRExJTlVYMl8x IC1ETElOVVggLURsaW51eCAtRF8KREVGQVVMVF9TT1VSQ0UgLURfQlNEX1NPVVJDRSAtRF9QT1NJ WF9TT1VSQ0UgLURTREJfTUVBU1VSRV9VU0VfVEVNUF9ESVIgLURIQVZFX1NUUkVSUk9SIC1EWFBf VU5JWCAtRF9SRUVOVFJBTlQgLUROREVCVUcKIC1JLi4vLi4vbGliL3NvZnRva2VuIC1JL3Vzci9p bmNsdWRlL25zcHIgLUkvdXNyL3NyYy9SUE0vQlVJTEQvbnNzLTMuODkuMC9kaXN0L3ByaXZhdGUv bnNzIC1JL3Vzci9zcmMvUlBNL0JVSUxEL25zcy0zLjgKOS4wL2Rpc3QvcHVibGljL2RibSAtSS91 c3Ivc3JjL1JQTS9CVUlMRC9uc3MtMy44OS4wL2Rpc3QvcHVibGljL25zcyAtZlBJQyAtcGlwZSAt ZmZ1bmN0aW9uLXNlY3Rpb25zIC1mZGF0YS1zZWN0aW9ucyAtV2UKcnJvciAtV2FsbCAtV3NoYWRv dyAtTzIgLXN0ZD1jOTkgIC1jIC4uLy4uL2NtZC9lY3BlcmYvZWNwZXJmLmMgLW8gb2JqL2NtZC9l Y3BlcmYvZWNwZXJmLmVjcGVyZi5vCi4uLy4uL2NtZC9lY3BlcmYvZWNwZXJmLmM6IEluIGZ1bmN0 aW9uICdnZW5lcmljVGhyZWFkJzoKLi4vLi4vY21kL2VjcGVyZi9lY3BlcmYuYzo5OToyNDogZXJy b3I6IHN0b3JpbmcgdGhlIGFkZHJlc3Mgb2YgbG9jYWwgdmFyaWFibGUgJ3NpZycgaW4gJyp0aHJl YWREYXRhLnAyJyBbLVdlcnJvcj1kYW5nbGkKbmctcG9pbnRlcj1dCiAgIDk5IHwgICAgICAgICB0 aHJlYWREYXRhLT5wMiA9ICh2b2lkICopJnNpZzsKICAgICAgfCAgICAgICAgIH5+fn5+fn5+fn5+ fn5+fl5+fn5+fn5+fn5+fn5+Ci4uLy4uL2NtZC9lY3BlcmYvZWNwZXJmLmM6OTE6MTM6IG5vdGU6 ICdzaWcnIGRlY2xhcmVkIGhlcmUKICAgOTEgfCAgICAgU0VDSXRlbSBzaWc7CiAgICAgIHwgICAg ICAgICAgICAgXn5+Ci4uLy4uL2NtZC9lY3BlcmYvZWNwZXJmLmM6ODY6MjE6IG5vdGU6ICdkYXRh JyBkZWNsYXJlZCBoZXJlCiAgIDg2IHwgZ2VuZXJpY1RocmVhZCh2b2lkICpkYXRhKQogICAgICB8 ICAgICAgICAgICAgICAgfn5+fn5+Xn5+fgouLi8uLi9jbWQvZWNwZXJmL2VjcGVyZi5jOiBJbiBm dW5jdGlvbiAnUEtDUzExVGhyZWFkJzoKLi4vLi4vY21kL2VjcGVyZi9lY3BlcmYuYzo3MToyNDog ZXJyb3I6IHN0b3JpbmcgdGhlIGFkZHJlc3Mgb2YgbG9jYWwgdmFyaWFibGUgJ3NpZycgaW4gJyp0 aHJlYWREYXRhLnAyJyBbLVdlcnJvcj1kYW5nbGkKbmctcG9pbnRlcj1dCiAgIDcxIHwgICAgICAg ICB0aHJlYWREYXRhLT5wMiA9ICh2b2lkICopJnNpZzsKICAgICAgfCAgICAgICAgIH5+fn5+fn5+ fn5+fn5+fl5+fn5+fn5+fn5+fn5+Ci4uLy4uL2NtZC9lY3BlcmYvZWNwZXJmLmM6NTM6MTM6IG5v dGU6ICdzaWcnIGRlY2xhcmVkIGhlcmUKICAgNTMgfCAgICAgU0VDSXRlbSBzaWc7CiAgICAgIHwg ICAgICAgICAgICAgXn5+Ci4uLy4uL2NtZC9lY3BlcmYvZWNwZXJmLmM6NDc6MjA6IG5vdGU6ICdk YXRhJyBkZWNsYXJlZCBoZXJlCiAgIDQ3IHwgUEtDUzExVGhyZWFkKHZvaWQgKmRhdGEpCiAgICAg IHwgICAgICAgICAgICAgIH5+fn5+fl5+fn4KY2MxOiBhbGwgd2FybmluZ3MgYmVpbmcgdHJlYXRl ZCBhcyBlcnJvcnMKLS0tCiBjbWQvZWNwZXJmL2VjcGVyZi5jIHwgMTQgKysrKysrKysrKysrKysK IDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvY21kL2VjcGVy Zi9lY3BlcmYuYyBiL2NtZC9lY3BlcmYvZWNwZXJmLmMKaW5kZXggNzA1ZDY4ZjMuLmZkOThiOWE5 IDEwMDY0NAotLS0gYS9jbWQvZWNwZXJmL2VjcGVyZi5jCisrKyBiL2NtZC9lY3BlcmYvZWNwZXJm LmMKQEAgLTY1LDExICs2NSwxOCBAQCBQS0NTMTFUaHJlYWQodm9pZCAqZGF0YSkKICAgICAgICAg cmV0dXJuOwogICAgIH0KIAorI2lmIGRlZmluZWQoX19HTlVDX18pICYmIF9fR05VQ19fID49IDEz CisjcHJhZ21hIEdDQyBkaWFnbm9zdGljIHB1c2gKKyNwcmFnbWEgR0NDIGRpYWdub3N0aWMgaWdu b3JlZCAiLVdkYW5nbGluZy1wb2ludGVyIgorI2VuZGlmCiAgICAgaWYgKHRocmVhZERhdGEtPmlz U2lnbikgewogICAgICAgICBzaWcuZGF0YSA9IHNpZ0RhdGE7CiAgICAgICAgIHNpZy5sZW4gPSBz aXplb2Yoc2lnRGF0YSk7CiAgICAgICAgIHRocmVhZERhdGEtPnAyID0gKHZvaWQgKikmc2lnOwog ICAgIH0KKyNpZiBkZWZpbmVkKF9fR05VQ19fKSAmJiBfX0dOVUNfXyA+PSAxMworI3ByYWdtYSBH Q0MgZGlhZ25vc3RpYyBwb3AKKyNlbmRpZgogCiAgICAgd2hpbGUgKGl0ZXJzLS0pIHsKICAgICAg ICAgdGhyZWFkRGF0YS0+c3RhdHVzID0gKCpvcCkoc2Vzc2lvbiwgdGhyZWFkRGF0YS0+cDEsCkBA IC05MywxMSArMTAwLDE4IEBAIGdlbmVyaWNUaHJlYWQodm9pZCAqZGF0YSkKICAgICB0aHJlYWRE YXRhLT5zdGF0dXMgPSBTRUNTdWNjZXNzOwogICAgIHRocmVhZERhdGEtPmNvdW50ID0gMDsKIAor I2lmIGRlZmluZWQoX19HTlVDX18pICYmIF9fR05VQ19fID49IDEzCisjcHJhZ21hIEdDQyBkaWFn bm9zdGljIHB1c2gKKyNwcmFnbWEgR0NDIGRpYWdub3N0aWMgaWdub3JlZCAiLVdkYW5nbGluZy1w b2ludGVyIgorI2VuZGlmCiAgICAgaWYgKHRocmVhZERhdGEtPmlzU2lnbikgewogICAgICAgICBz aWcuZGF0YSA9IHNpZ0RhdGE7CiAgICAgICAgIHNpZy5sZW4gPSBzaXplb2Yoc2lnRGF0YSk7CiAg ICAgICAgIHRocmVhZERhdGEtPnAyID0gKHZvaWQgKikmc2lnOwogICAgIH0KKyNpZiBkZWZpbmVk KF9fR05VQ19fKSAmJiBfX0dOVUNfXyA+PSAxMworI3ByYWdtYSBHQ0MgZGlhZ25vc3RpYyBwb3AK KyNlbmRpZgogCiAgICAgd2hpbGUgKGl0ZXJzLS0pIHsKICAgICAgICAgdGhyZWFkRGF0YS0+c3Rh dHVzID0gKCp0aHJlYWREYXRhLT5vcCkodGhyZWFkRGF0YS0+cDEsCi0tIAoyLjMzLjMKCg== 13363 2023-06-01 21:03:44 +0300 2023-06-01 21:03:44 +0300 ещё один вариант исправления 0001-Fixed-build-error-with-GCC-13.patch text/plain 4305 asheplyakov RnJvbSBkNzY2MjMzYTEyMzBmZjRhM2JkMjhlZjI4NzlmMWQ2NWFlOWZjM2I1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4ZXkgU2hlcGx5YWtvdiA8YXNoZXBseWFrb3ZAYmFzZWFs dC5ydT4KRGF0ZTogVGh1LCAxIEp1biAyMDIzIDA0OjUwOjMyICswMDAwClN1YmplY3Q6IFtQQVRD SF0gRml4ZWQgYnVpbGQgZXJyb3Igd2l0aCBHQ0MgMTMKCkdDQyAxMyBjb21wbGFpbnM6CgpbMTM4 Mi8xNDU2XSBDQyBvYmovY21kL2VjcGVyZi9lY3BlcmYuZWNwZXJmLm8KRkFJTEVEOiBvYmovY21k L2VjcGVyZi9lY3BlcmYuZWNwZXJmLm8KZ2NjIC1NTUQgLU1GIG9iai9jbWQvZWNwZXJmL2VjcGVy Zi5lY3BlcmYuby5kIC1ETlNTX1VTRV9TVEFUSUNfTElCUyAtRE5TU19GSVBTX0RJU0FCTEVEIC1E TlNTX05PX0lOSVRfU1VQUE9SVCAtRE5TU19VU0UKXzY0IC1EVVNFX1VUSUxfRElSRUNUTFkgLURO T19OU1BSXzEwX1NVUFBPUlQgLURTU0xfRElTQUJMRV9ERVBSRUNBVEVEX0NJUEhFUl9TVUlURV9O QU1FUyAtRExJTlVYMl8xIC1ETElOVVggLURsaW51eCAtRF8KREVGQVVMVF9TT1VSQ0UgLURfQlNE X1NPVVJDRSAtRF9QT1NJWF9TT1VSQ0UgLURTREJfTUVBU1VSRV9VU0VfVEVNUF9ESVIgLURIQVZF X1NUUkVSUk9SIC1EWFBfVU5JWCAtRF9SRUVOVFJBTlQgLUROREVCVUcKIC1JLi4vLi4vbGliL3Nv ZnRva2VuIC1JL3Vzci9pbmNsdWRlL25zcHIgLUkvdXNyL3NyYy9SUE0vQlVJTEQvbnNzLTMuODku MC9kaXN0L3ByaXZhdGUvbnNzIC1JL3Vzci9zcmMvUlBNL0JVSUxEL25zcy0zLjgKOS4wL2Rpc3Qv cHVibGljL2RibSAtSS91c3Ivc3JjL1JQTS9CVUlMRC9uc3MtMy44OS4wL2Rpc3QvcHVibGljL25z cyAtZlBJQyAtcGlwZSAtZmZ1bmN0aW9uLXNlY3Rpb25zIC1mZGF0YS1zZWN0aW9ucyAtV2UKcnJv ciAtV2FsbCAtV3NoYWRvdyAtTzIgLXN0ZD1jOTkgIC1jIC4uLy4uL2NtZC9lY3BlcmYvZWNwZXJm LmMgLW8gb2JqL2NtZC9lY3BlcmYvZWNwZXJmLmVjcGVyZi5vCi4uLy4uL2NtZC9lY3BlcmYvZWNw ZXJmLmM6IEluIGZ1bmN0aW9uICdnZW5lcmljVGhyZWFkJzoKLi4vLi4vY21kL2VjcGVyZi9lY3Bl cmYuYzo5OToyNDogZXJyb3I6IHN0b3JpbmcgdGhlIGFkZHJlc3Mgb2YgbG9jYWwgdmFyaWFibGUg J3NpZycgaW4gJyp0aHJlYWREYXRhLnAyJyBbLVdlcnJvcj1kYW5nbGkKbmctcG9pbnRlcj1dCiAg IDk5IHwgICAgICAgICB0aHJlYWREYXRhLT5wMiA9ICh2b2lkICopJnNpZzsKICAgICAgfCAgICAg ICAgIH5+fn5+fn5+fn5+fn5+fl5+fn5+fn5+fn5+fn5+Ci4uLy4uL2NtZC9lY3BlcmYvZWNwZXJm LmM6OTE6MTM6IG5vdGU6ICdzaWcnIGRlY2xhcmVkIGhlcmUKICAgOTEgfCAgICAgU0VDSXRlbSBz aWc7CiAgICAgIHwgICAgICAgICAgICAgXn5+Ci4uLy4uL2NtZC9lY3BlcmYvZWNwZXJmLmM6ODY6 MjE6IG5vdGU6ICdkYXRhJyBkZWNsYXJlZCBoZXJlCiAgIDg2IHwgZ2VuZXJpY1RocmVhZCh2b2lk ICpkYXRhKQogICAgICB8ICAgICAgICAgICAgICAgfn5+fn5+Xn5+fgouLi8uLi9jbWQvZWNwZXJm L2VjcGVyZi5jOiBJbiBmdW5jdGlvbiAnUEtDUzExVGhyZWFkJzoKLi4vLi4vY21kL2VjcGVyZi9l Y3BlcmYuYzo3MToyNDogZXJyb3I6IHN0b3JpbmcgdGhlIGFkZHJlc3Mgb2YgbG9jYWwgdmFyaWFi bGUgJ3NpZycgaW4gJyp0aHJlYWREYXRhLnAyJyBbLVdlcnJvcj1kYW5nbGkKbmctcG9pbnRlcj1d CiAgIDcxIHwgICAgICAgICB0aHJlYWREYXRhLT5wMiA9ICh2b2lkICopJnNpZzsKICAgICAgfCAg ICAgICAgIH5+fn5+fn5+fn5+fn5+fl5+fn5+fn5+fn5+fn5+Ci4uLy4uL2NtZC9lY3BlcmYvZWNw ZXJmLmM6NTM6MTM6IG5vdGU6ICdzaWcnIGRlY2xhcmVkIGhlcmUKICAgNTMgfCAgICAgU0VDSXRl bSBzaWc7CiAgICAgIHwgICAgICAgICAgICAgXn5+Ci4uLy4uL2NtZC9lY3BlcmYvZWNwZXJmLmM6 NDc6MjA6IG5vdGU6ICdkYXRhJyBkZWNsYXJlZCBoZXJlCiAgIDQ3IHwgUEtDUzExVGhyZWFkKHZv aWQgKmRhdGEpCiAgICAgIHwgICAgICAgICAgICAgIH5+fn5+fl5+fn4KY2MxOiBhbGwgd2Fybmlu Z3MgYmVpbmcgdHJlYXRlZCBhcyBlcnJvcnMKCkluZGVlZCBnZW5lcmljVGhyZWFkIChhbmQgUEtD UzExVGhyZWFkKSBkbyBzdG9yZSB0aGUgYWRkcmVzcyBvZiB0aGUgbG9jYWwKdmFyaWFibGUsIGFu ZCB0aGF0IGFkZHJlc3MgaXMgcmVhY2hhYmxlIGFmdGVyIGdlbmVyaWNUaHJlYWQgZnVuY3Rpb24g cmV0dXJucy4KSG93ZXZlciB0aGUgbWFpbiB0aHJlYWQgbmV2ZXIgcmVhZHMgdGhyZWFkRGF0YS0+ cDIsIGJ1dCBHQ0MgaXMgdW5hYmxlIHRvCmd1ZXNzIGl0LCBhbmQgZ2l2ZXMgdGhlIGFib3ZlIHdh cm5pbmcgKHdoaWNoIGlzIGFuIGVycm9yIHdpdGggLVdlcnJvcikuCgpVc2UgYSBsb2NhbCB2YXJp YWJsZSBmb3IgcGFzc2luZyB0aGUgcGFyYW1ldGVyIHRvICgqb3ApIHRvIGF2b2lkIHRoZSBwcm9i bGVtLgotLS0KIGNtZC9lY3BlcmYvZWNwZXJmLmMgfCAxMyArKysrKysrKystLS0tCiAxIGZpbGUg Y2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Nt ZC9lY3BlcmYvZWNwZXJmLmMgYi9jbWQvZWNwZXJmL2VjcGVyZi5jCmluZGV4IDcwNWQ2OGYzLi5l ZTcyMjViNiAxMDA2NDQKLS0tIGEvY21kL2VjcGVyZi9lY3BlcmYuYworKysgYi9jbWQvZWNwZXJm L2VjcGVyZi5jCkBAIC01Myw2ICs1Myw4IEBAIFBLQ1MxMVRocmVhZCh2b2lkICpkYXRhKQogICAg IFNFQ0l0ZW0gc2lnOwogICAgIENLX1NFU1NJT05fSEFORExFIHNlc3Npb247CiAgICAgQ0tfUlYg Y3J2OworICAgIC8qIFhYWDogYXZvaWQgc3RvcmluZyB0aGUgYWRkcmVzcyBvZiB0aGUgbG9jYWwg dmFyaWFibGUgaW50byB0aHJlYWREYXRhICovCisgICAgdm9pZCAqcDIgPSB0aHJlYWREYXRhLT5w MjsKIAogICAgIHRocmVhZERhdGEtPnN0YXR1cyA9IFNFQ1N1Y2Nlc3M7CiAgICAgdGhyZWFkRGF0 YS0+Y291bnQgPSAwOwpAQCAtNjgsMTIgKzcwLDEyIEBAIFBLQ1MxMVRocmVhZCh2b2lkICpkYXRh KQogICAgIGlmICh0aHJlYWREYXRhLT5pc1NpZ24pIHsKICAgICAgICAgc2lnLmRhdGEgPSBzaWdE YXRhOwogICAgICAgICBzaWcubGVuID0gc2l6ZW9mKHNpZ0RhdGEpOwotICAgICAgICB0aHJlYWRE YXRhLT5wMiA9ICh2b2lkICopJnNpZzsKKyAgICAgICAgcDIgPSAodm9pZCAqKSZzaWc7CiAgICAg fQogCiAgICAgd2hpbGUgKGl0ZXJzLS0pIHsKICAgICAgICAgdGhyZWFkRGF0YS0+c3RhdHVzID0g KCpvcCkoc2Vzc2lvbiwgdGhyZWFkRGF0YS0+cDEsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRocmVhZERhdGEtPnAyLCB0aHJlYWREYXRhLT5wMyk7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHAyLCB0aHJlYWREYXRhLT5wMyk7CiAgICAgICAgIGlmICh0 aHJlYWREYXRhLT5zdGF0dXMgIT0gU0VDU3VjY2VzcykgewogICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIH0KQEAgLTg5LDE5ICs5MSwyMiBAQCBnZW5lcmljVGhyZWFkKHZvaWQgKmRhdGEpCiAg ICAgaW50IGl0ZXJzID0gdGhyZWFkRGF0YS0+aXRlcnM7CiAgICAgdW5zaWduZWQgY2hhciBzaWdE YXRhWzI1Nl07CiAgICAgU0VDSXRlbSBzaWc7CisgICAgLyogWFhYOiBhdm9pZCBzdG9yaW5nIHRo ZSBhZGRyZXNzIG9mIHRoZSBsb2NhbCB2YXJpYWJsZSBpbnRvIHRocmVhZERhdGEgKi8KKyAgICB2 b2lkICpwMiA9IHRocmVhZERhdGEtPnAyOwogCiAgICAgdGhyZWFkRGF0YS0+c3RhdHVzID0gU0VD U3VjY2VzczsKICAgICB0aHJlYWREYXRhLT5jb3VudCA9IDA7CiAKICAgICBpZiAodGhyZWFkRGF0 YS0+aXNTaWduKSB7CisKICAgICAgICAgc2lnLmRhdGEgPSBzaWdEYXRhOwogICAgICAgICBzaWcu bGVuID0gc2l6ZW9mKHNpZ0RhdGEpOwotICAgICAgICB0aHJlYWREYXRhLT5wMiA9ICh2b2lkICop JnNpZzsKKyAgICAgICAgcDIgPSAodm9pZCAqKSZzaWc7CiAgICAgfQogCiAgICAgd2hpbGUgKGl0 ZXJzLS0pIHsKICAgICAgICAgdGhyZWFkRGF0YS0+c3RhdHVzID0gKCp0aHJlYWREYXRhLT5vcCko dGhyZWFkRGF0YS0+cDEsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHRocmVhZERhdGEtPnAyLCB0aHJlYWREYXRhLT5wMyk7CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAyLCB0aHJlYWREYXRhLT5wMyk7CiAgICAg ICAgIGlmICh0aHJlYWREYXRhLT5zdGF0dXMgIT0gU0VDU3VjY2VzcykgewogICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIH0KLS0gCjIuMzMuMwoK