65404 2004-09-26 06:57 0000 gdb-6.2.1 fails to find include file in relative directory with dwarf2 2004-11-09 18:19:03 0000 1 1 1 Unclassified Gentoo Linux Core system unspecified All Linux RESOLVED FIXED P2 blocker --- 1 garrison@mail.ru toolchain@gentoo.org garrison@mail.ru 2004-09-26 06:57:14 0000 gcc may emit relative directory name for some included files. While debugging programs which have dwarf2 debug information and are not in the build hierarchy (i.e. installed to other location) gdb fails to find such included files though all needed information (source directory et al) is available. Reproducible: Always Steps to Reproduce: 1. Build a package which uses relative include paths and install resulting binary somewhere outside build directory. 2. Start a gdb session, then try to single-step into function which is implemented in #included file. Actual Results: gdb say "No such file or directory" for such a file. Expected Results: Included file should be correctly located. This problem is addressed in a message thread resulting in a patch by Bryce McKinlay, see http://sources.redhat.com/ml/gdb-patches/2004-07/msg00456.html for details. So this probably would be in the next released gdb, but it is not yet available in current gdb CVS. garrison@mail.ru 2004-09-26 07:07:35 0000 Created an attachment (id=40447) A patch by Bryce McKinlay rediffed against gdb-6.2.1 A patch by Bryce McKinlay mentioned in desc, rediffed against gdb-6.2.1 I successively use gdb-6.2.1 with this patch and do not see this problem. garrison@mail.ru 2004-09-26 07:22:49 0000 Created an attachment (id=40448) test case to verify this bug To check please unpack a test case, then cd to gdb-relative-test and do export WANT_AUTOMAKE=1.8 autoreconf -i ./configure -v --prefix=`/bin/pwd`/inst make install then execute gdb as follows: LD_LIBRARY_PATH=`/bin/pwd`/inst/lib gdb inst/bin/hello then at gdb prompt do break main run step step here you either see "9 aa.hh: No such file or directory" which means gdb fails to find included file, or you do not see the error and "list" command would display the correct source code lines from included file garrison@mail.ru 2004-09-29 17:25:36 0000 Created an attachment (id=40738) Alternative patch with relation to compilation directory As I'm reading dwarf standard, relative paths should be handled in relation to compilation directory. This alternative patch does exactly this everywhere relative path entry is found in dwarf directory table. This patch makes some gdb testsuite failures. Now I strongly believe testsuite should be somewhat fixed in relative paths handling :) vapier@gentoo.org 2004-11-09 18:19:03 0000 added patch to 6.2.1-r1, thanks 40447 2004-09-26 07:07 0000 A patch by Bryce McKinlay rediffed against gdb-6.2.1 gdb-6.2.1-dwarf2read-relative.patch text/plain LS0tIGdkYi02LjIuMS1vcmlnL2dkYi9kd2FyZjJyZWFkLmMJMjAwNC0wNy0wNiAyMzoyOTozMC4w MDAwMDAwMDAgKzA0MDAKKysrIGdkYi02LjIuMS9nZGIvZHdhcmYycmVhZC5jCTIwMDQtMDktMjYg MTc6Mzk6MjEuMTIwNzc2NzUyICswNDAwCkBAIC03NjIsNyArNzYyLDcgQEAKIHN0YXRpYyB2b2lk IGR3YXJmX2RlY29kZV9saW5lcyAoc3RydWN0IGxpbmVfaGVhZGVyICosIGNoYXIgKiwgYmZkICos CiAJCQkJc3RydWN0IGR3YXJmMl9jdSAqLCBzdHJ1Y3QgcGFydGlhbF9zeW10YWIgKik7CiAKLXN0 YXRpYyB2b2lkIGR3YXJmMl9zdGFydF9zdWJmaWxlIChjaGFyICosIGNoYXIgKik7CitzdGF0aWMg dm9pZCBkd2FyZjJfc3RhcnRfc3ViZmlsZSAoY2hhciAqLCBjaGFyICosIGNoYXIgKik7CiAKIHN0 YXRpYyBzdHJ1Y3Qgc3ltYm9sICpuZXdfc3ltYm9sIChzdHJ1Y3QgZGllX2luZm8gKiwgc3RydWN0 IHR5cGUgKiwKIAkJCQkgIHN0cnVjdCBkd2FyZjJfY3UgKik7CkBAIC01OTUxLDEyICs1OTUxLDEw IEBACiAJICAgICBkaXJlY3RvcnkgYW5kIGZpbGUgbmFtZSBudW1iZXJzIGluIHRoZSBzdGF0ZW1l bnQgcHJvZ3JhbQogCSAgICAgYXJlIDEtYmFzZWQuICAqLwogICAgICAgICAgIHN0cnVjdCBmaWxl X2VudHJ5ICpmZSA9ICZsaC0+ZmlsZV9uYW1lc1tmaWxlIC0gMV07Ci0gICAgICAgICAgY2hhciAq ZGlyOworICAgICAgICAgIGNoYXIgKmRpciA9IE5VTEw7CiAgICAgICAgICAgaWYgKGZlLT5kaXJf aW5kZXgpCiAgICAgICAgICAgICBkaXIgPSBsaC0+aW5jbHVkZV9kaXJzW2ZlLT5kaXJfaW5kZXgg LSAxXTsKLSAgICAgICAgICBlbHNlCi0gICAgICAgICAgICBkaXIgPSBjb21wX2RpcjsKLQkgIGR3 YXJmMl9zdGFydF9zdWJmaWxlIChmZS0+bmFtZSwgZGlyKTsKKwkgIGR3YXJmMl9zdGFydF9zdWJm aWxlIChmZS0+bmFtZSwgZGlyLCBjb21wX2Rpcik7CiAJfQogCiAgICAgICAvKiBEZWNvZGUgdGhl IHRhYmxlLiAqLwpAQCAtNjA0NCwxNyArNjA0MiwxNSBAQAogICAgICAgICAgICAgICAgICAgIGJ1 dCB0aGUgZGlyZWN0b3J5IGFuZCBmaWxlIG5hbWUgbnVtYmVycyBpbiB0aGUKICAgICAgICAgICAg ICAgICAgICBzdGF0ZW1lbnQgcHJvZ3JhbSBhcmUgMS1iYXNlZC4gICovCiAgICAgICAgICAgICAg ICAgc3RydWN0IGZpbGVfZW50cnkgKmZlOwotICAgICAgICAgICAgICAgIGNoYXIgKmRpcjsKKyAg ICAgICAgICAgICAgICBjaGFyICpkaXIgPSBOVUxMOwogICAgICAgICAgICAgICAgIGZpbGUgPSBy ZWFkX3Vuc2lnbmVkX2xlYjEyOCAoYWJmZCwgbGluZV9wdHIsICZieXRlc19yZWFkKTsKICAgICAg ICAgICAgICAgICBsaW5lX3B0ciArPSBieXRlc19yZWFkOwogICAgICAgICAgICAgICAgIGZlID0g JmxoLT5maWxlX25hbWVzW2ZpbGUgLSAxXTsKICAgICAgICAgICAgICAgICBmZS0+aW5jbHVkZWRf cCA9IDE7CiAgICAgICAgICAgICAgICAgaWYgKGZlLT5kaXJfaW5kZXgpCiAgICAgICAgICAgICAg ICAgICBkaXIgPSBsaC0+aW5jbHVkZV9kaXJzW2ZlLT5kaXJfaW5kZXggLSAxXTsKLSAgICAgICAg ICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICBkaXIgPSBjb21wX2RpcjsKICAgICAgICAg ICAgICAgICBpZiAoIWRlY29kZV9mb3JfcHN0X3ApCi0gICAgICAgICAgICAgICAgICBkd2FyZjJf c3RhcnRfc3ViZmlsZSAoZmUtPm5hbWUsIGRpcik7CisgICAgICAgICAgICAgICAgICBkd2FyZjJf c3RhcnRfc3ViZmlsZSAoZmUtPm5hbWUsIGRpciwgY29tcF9kaXIpOwogICAgICAgICAgICAgICB9 CiAJICAgICAgYnJlYWs7CiAJICAgIGNhc2UgRFdfTE5TX3NldF9jb2x1bW46CkBAIC02MTEyLDcg KzYxMDgsOCBAQAogCiAvKiBTdGFydCBhIHN1YmZpbGUgZm9yIERXQVJGLiAgRklMRU5BTUUgaXMg dGhlIG5hbWUgb2YgdGhlIGZpbGUgYW5kCiAgICBESVJOQU1FIHRoZSBuYW1lIG9mIHRoZSBzb3Vy Y2UgZGlyZWN0b3J5IHdoaWNoIGNvbnRhaW5zIEZJTEVOQU1FCi0gICBvciBOVUxMIGlmIG5vdCBr bm93bi4KKyAgIG9yIE5VTEwgaWYgbm90IGtub3duLiAgQ09NUF9ESVIgaXMgdGhlIHZhbHVlIG9m IERXX0FUX2NvbXBfZGlyLiAgSWYKKyAgIERJUk5BTUUgc3BlY2lmaWVzIGEgcmVsYXRpdmUgcGF0 aCwgaXQgaXMgYXBwZW5kZWQgdG8gQ09NUF9ESVIuCiAgICBUaGlzIHJvdXRpbmUgdHJpZXMgdG8g a2VlcCBsaW5lIG51bWJlcnMgZnJvbSBpZGVudGljYWwgYWJzb2x1dGUgYW5kCiAgICByZWxhdGl2 ZSBmaWxlIG5hbWVzIGluIGEgY29tbW9uIHN1YmZpbGUuCiAKQEAgLTYxMzEsOCArNjEyOCwxOSBA QAogICAgc3ViZmlsZSwgc28gdGhhdCBgYnJlYWsgL3NyY2Rpci9saXN0MC5jOjEnIHdvcmtzIGFz IGV4cGVjdGVkLiAgKi8KIAogc3RhdGljIHZvaWQKLWR3YXJmMl9zdGFydF9zdWJmaWxlIChjaGFy ICpmaWxlbmFtZSwgY2hhciAqZGlybmFtZSkKK2R3YXJmMl9zdGFydF9zdWJmaWxlIChjaGFyICpm aWxlbmFtZSwgY2hhciAqZGlybmFtZSwgY2hhciAqY29tcF9kaXIpCiB7CisgIHN0cnVjdCBjbGVh bnVwICpiYWNrX3RvID0gbWFrZV9jbGVhbnVwIChudWxsX2NsZWFudXAsIDApOworCisgIC8qIElm IHdlIGhhdmUgYSByZWxhdGl2ZSBkaXJuYW1lLCBhcHBlbmQgaXQgdG8gY29tcF9kaXIuICAqLwor ICBpZiAoZGlybmFtZSAhPSBOVUxMICYmICFJU19BQlNPTFVURV9QQVRIIChkaXJuYW1lKSAmJiBj b21wX2RpciAhPSBOVUxMKQorICAgIHsKKyAgICAgIGRpcm5hbWUgPSBjb25jYXQgKGNvbXBfZGly LCAiLyIsIGRpcm5hbWUsIE5VTEwpOworICAgICAgbWFrZV9jbGVhbnVwICh4ZnJlZSwgZGlybmFt ZSk7CisgICAgfQorICBlbHNlIGlmIChkaXJuYW1lID09IE5VTEwpCisgICAgZGlybmFtZSA9IGNv bXBfZGlyOworCiAgIC8qIElmIHRoZSBmaWxlbmFtZSBpc24ndCBhYnNvbHV0ZSwgdHJ5IHRvIG1h dGNoIGFuIGV4aXN0aW5nIHN1YmZpbGUKICAgICAgd2l0aCB0aGUgZnVsbCBwYXRobmFtZS4gICov CiAKQEAgLTYxNDAsMTkgKzYxNDgsMjAgQEAKICAgICB7CiAgICAgICBzdHJ1Y3Qgc3ViZmlsZSAq c3ViZmlsZTsKICAgICAgIGNoYXIgKmZ1bGxuYW1lID0gY29uY2F0IChkaXJuYW1lLCAiLyIsIGZp bGVuYW1lLCBOVUxMKTsKKyAgICAgIG1ha2VfY2xlYW51cCAoeGZyZWUsIGZ1bGxuYW1lKTsKIAog ICAgICAgZm9yIChzdWJmaWxlID0gc3ViZmlsZXM7IHN1YmZpbGU7IHN1YmZpbGUgPSBzdWJmaWxl LT5uZXh0KQogCXsKIAkgIGlmIChGSUxFTkFNRV9DTVAgKHN1YmZpbGUtPm5hbWUsIGZ1bGxuYW1l KSA9PSAwKQogCSAgICB7CiAJICAgICAgY3VycmVudF9zdWJmaWxlID0gc3ViZmlsZTsKLQkgICAg ICB4ZnJlZSAoZnVsbG5hbWUpOworCSAgICAgIGRvX2NsZWFudXBzIChiYWNrX3RvKTsKIAkgICAg ICByZXR1cm47CiAJICAgIH0KIAl9Ci0gICAgICB4ZnJlZSAoZnVsbG5hbWUpOwogICAgIH0KICAg c3RhcnRfc3ViZmlsZSAoZmlsZW5hbWUsIGRpcm5hbWUpOworICBkb19jbGVhbnVwcyAoYmFja190 byk7CiB9CiAKIHN0YXRpYyB2b2lkCg== 40448 2004-09-26 07:22 0000 test case to verify this bug gdb-relative-test.tar.bz2 application/x-bzip QlpoOTFBWSZTWVnbfPIABBv/1c6QBIB+f/+fP+/eav/v38sCAAQAAACAAIAIUAPe6rG0W4YaDhKI Kam0TJkaeUYEAGh6mT1AYgABoaGhoJU0k8hqeKjQNqGgANABoZGgAA09IABIiJpEgwQeoaHpMjIA NMIyaAyYBNMgxw0MmmhpkaGmRkGRkaGQGJoyaAMmRiGEUiZIaGhNCNBpkAGgaNGg0ADIBo0HxE+Y n+OE9ZEfCfMeau0zMQmWUJAxcKodHbxu17ZjuogKLAIgRUsMo7Dic+tDMTEXsEg1iFCECIBhBkIy ID0/r2efanf1x7R4qm28eG7Fw1OpdkVmC5+jnxOIUOCZvVYdIJqL3Mh/yEIiUWQxEg3S0dUE1QQ+ 4kKJVU4uI4eIjWcvpsjWpBORGO4Jbrh6Q8mLGVaJ4JiXAr0VCK5ZXOx78OZEx5QcKrVYt5tqm+Kk NayrdJrErFpRRglMrRqKtTmDomeW5gaTM2hhaPS3I2Ow80ZWJT08vdaz3EKIh3tPqsNAt62+VqFQ 7/ivkJYwd8AyCUsuOua5H3iRYCtZyAVzCdfe2Y1J7vDpLQT1iQJkMgkANmyZJ8fLiJIgbbGybq7N hFpyjLYh2qIcvNIPm1LVowElJwU+nVo8NqiHFqxfkUMMXiLkBBMBe7RVJiKIuiFZOzVXMkDo0QqX NtiUgurMKCTWCywisVrSCTFUYe+mDoGuSBxsjgkvD20ig8dq3AniIM6iidzj6/HDFW2m8Esqho73 SB6WmCTV1QgQW1KWBqFls05ZWoaKiwhIxi5CxevTUoPeJK4cw7hwPpgAhOJKD1UNKo/A9VSkIj6r AGKfQsqMvghauIEcgaTkAW6InGPlQJF38SgjXB7AaWEghIDjKrA6aYMaR6VI4JCK8dVZTAu3co6M 1b5b++SMbSllIp4aYYaU5zsmObyhOq1SHYrHtN/qXjycjBY8B5xOAS4HwCfsAyZIg7Nw72aGo4wo awacG9faF5eJjDj49a4tM4S0GGNQT6SYLOQak1I9yt1/EJiEw2mG417fdKw0AfudcwhkuyHZn+uR 2SaVEsT69dmwllBUekQiGsEEyrWwxKiakI0CZdgjXPQbTzxNkTEDjzO49MvE1RjToiITLBKToGxX SraFyV0ibGK8hOnCYSCtSSYVc4dES41qErdWC9MomXSY/KJaZhKFRLxLmwTIUEmJQoJMSt2Entpg FK4hMAkzE2FzwDnDHm0UP6J/hL65jOJJ0TOZk2J8JWc9y0KJoY2ydORC6RdyRThQkFnbfPI= 40738 2004-09-29 17:25 0000 Alternative patch with relation to compilation directory gdb-6.2.1-dwarf2read-relative-v3.patch text/plain LS0tIGdkYi02LjIuMS1vcmlnL2dkYi9kd2FyZjJyZWFkLmMJMjAwNC0wOS0yOCAwNDoxNTo1NC4w OTQ3NjYyMzIgKzA0MDAKKysrIGdkYi02LjIuMS9nZGIvZHdhcmYycmVhZC5jCTIwMDQtMDktMjgg MDQ6MTc6MTguMzcwOTU0MzA0ICswNDAwCkBAIC03NTcsNyArNzU3LDcgQEAKIAogc3RhdGljIHN0 cnVjdCBsaW5lX2hlYWRlciAqKGR3YXJmX2RlY29kZV9saW5lX2hlYWRlcgogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICh1bnNpZ25lZCBpbnQgb2Zmc2V0LAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBiZmQgKmFiZmQsIHN0cnVjdCBkd2FyZjJfY3UgKmN1KSk7CisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGJmZCAqYWJmZCwgc3RydWN0IGR3YXJmMl9jdSAqY3UsIGNvbnN0 IGNoYXIqIGNvbXBfZGlyKSk7CiAKIHN0YXRpYyB2b2lkIGR3YXJmX2RlY29kZV9saW5lcyAoc3Ry dWN0IGxpbmVfaGVhZGVyICosIGNoYXIgKiwgYmZkICosCiAJCQkJc3RydWN0IGR3YXJmMl9jdSAq LCBzdHJ1Y3QgcGFydGlhbF9zeW10YWIgKik7CkBAIC0xMjYyLDcgKzEyNjIsNyBAQAogICBiZmQg KmFiZmQgPSBvYmpmaWxlLT5vYmZkOwogICBzdHJ1Y3QgbGluZV9oZWFkZXIgKmxoOwogCi0gIGxo ID0gZHdhcmZfZGVjb2RlX2xpbmVfaGVhZGVyIChwZGktPmxpbmVfb2Zmc2V0LCBhYmZkLCBjdSk7 CisgIGxoID0gZHdhcmZfZGVjb2RlX2xpbmVfaGVhZGVyIChwZGktPmxpbmVfb2Zmc2V0LCBhYmZk LCBjdSwgcHN0LT5kaXJuYW1lKTsKICAgaWYgKGxoID09IE5VTEwpCiAgICAgcmV0dXJuOyAgLyog Tm8gbGluZXRhYmxlLCBzbyBubyBpbmNsdWRlcy4gICovCiAKQEAgLTIzOTcsNyArMjM5Nyw3IEBA CiAgIGlmIChhdHRyKQogICAgIHsKICAgICAgIHVuc2lnbmVkIGludCBsaW5lX29mZnNldCA9IERX X1VOU05EIChhdHRyKTsKLSAgICAgIGxpbmVfaGVhZGVyID0gZHdhcmZfZGVjb2RlX2xpbmVfaGVh ZGVyIChsaW5lX29mZnNldCwgYWJmZCwgY3UpOworICAgICAgbGluZV9oZWFkZXIgPSBkd2FyZl9k ZWNvZGVfbGluZV9oZWFkZXIgKGxpbmVfb2Zmc2V0LCBhYmZkLCBjdSwgY29tcF9kaXIpOwogICAg ICAgaWYgKGxpbmVfaGVhZGVyKQogICAgICAgICB7CiAgICAgICAgICAgbWFrZV9jbGVhbnVwICgo bWFrZV9jbGVhbnVwX2Z0eXBlICopIGZyZWVfbGluZV9oZWFkZXIsCkBAIC01NjY1LDYgKzU2NjUs MjMgQEAKICAgICByZXR1cm4gZm9sbG93X2RpZV9yZWYgKGR3YXJmMl9nZXRfcmVmX2RpZV9vZmZz ZXQgKHNwZWNfYXR0ciwgY3UpKTsKIH0KIAorLyogQ3JlYXRlIGZ1bGwgcGF0aCBuYW1lIGZyb20g YWJzb2x1dGUgYW5kIHJlbGF0aXZlIHBhcnRzLgorICAgVGhlIHJlc3VsdCBzdHJpbmcgc2hvdWxk IGJlIGZyZWVkIGJ5IGNhbGxlciB3aGVuIG5lY2Vzc2FyeS4gKi8KK3N0YXRpYyBjaGFyKgorbWFr ZV9mdWxsX3BhdGggKGNvbnN0IGNoYXIgKmZ1bGxfcGFydCwgY29uc3QgY2hhciAqcmVsX3BhcnQp Cit7CisgIGNoYXIgKnJlc3VsdDsKKworICBpbnQgZGlyX2xlbiA9IHN0cmxlbihmdWxsX3BhcnQp OworCisgIHJlc3VsdCA9IHhtYWxsb2MoZGlyX2xlbiArIDEgKyBzdHJsZW4ocmVsX3BhcnQpICsg MSk7CisgIHN0cmNweSAocmVzdWx0LCBmdWxsX3BhcnQpOworICByZXN1bHRbZGlyX2xlbl0gPSAn Lyc7CisgIHN0cmNweSAocmVzdWx0ICsgZGlyX2xlbiArIDEsIHJlbF9wYXJ0KTsKKworICByZXR1 cm4gcmVzdWx0OworfQorCiAvKiBGcmVlIHRoZSBsaW5lX2hlYWRlciBzdHJ1Y3R1cmUgKkxILCBh bmQgYW55IGFycmF5cyBhbmQgc3RyaW5ncyBpdAogICAgcmVmZXJzIHRvLiAgKi8KIHN0YXRpYyB2 b2lkCkBAIC01Njc4LDcgKzU2OTUsNyBAQAogICBpZiAobGgtPmZpbGVfbmFtZXMpCiAgICAgeGZy ZWUgKGxoLT5maWxlX25hbWVzKTsKIAotICAvKiBTaW1pbGFybHkgZm9yIHRoZSBpbmNsdWRlIGRp cmVjdG9yeSBuYW1lcy4gICovCisgIC8qIFNpbWlsYXJseSBmb3IgdGhlIGluY2x1ZGUgZGlyZWN0 b3J5IG5hbWVzIC0gdGhleSB3aWxsIGJlIGZyZWVkIGluZGVwZW5kZW50bHkuICAqLwogICBpZiAo bGgtPmluY2x1ZGVfZGlycykKICAgICB4ZnJlZSAobGgtPmluY2x1ZGVfZGlycyk7CiAKQEAgLTU2 ODUsMTEgKzU3MDIsMTIgQEAKICAgeGZyZWUgKGxoKTsKIH0KIAotCiAvKiBBZGQgYW4gZW50cnkg dG8gTEgncyBpbmNsdWRlIGRpcmVjdG9yeSB0YWJsZS4gICovCiBzdGF0aWMgdm9pZAotYWRkX2lu Y2x1ZGVfZGlyIChzdHJ1Y3QgbGluZV9oZWFkZXIgKmxoLCBjaGFyICppbmNsdWRlX2RpcikKK2Fk ZF9pbmNsdWRlX2RpciAoc3RydWN0IGxpbmVfaGVhZGVyICpsaCwgY2hhciAqaW5jbHVkZV9kaXIs IGNvbnN0IGNoYXIgKmNvbXBfZGlyKQogeworICBjaGFyKiByZWFsX2RpcjsKKwogICAvKiBHcm93 IHRoZSBhcnJheSBpZiBuZWNlc3NhcnkuICAqLwogICBpZiAobGgtPmluY2x1ZGVfZGlyc19zaXpl ID09IDApCiAgICAgewpAQCAtNTcwNSw3ICs1NzIzLDE3IEBACiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAqIHNpemVvZiAoKmxoLT5pbmNsdWRlX2RpcnMpKSk7CiAgICAgfQog Ci0gIGxoLT5pbmNsdWRlX2RpcnNbbGgtPm51bV9pbmNsdWRlX2RpcnMrK10gPSBpbmNsdWRlX2Rp cjsKKyAgaWYgKCFJU19BQlNPTFVURV9QQVRIKGluY2x1ZGVfZGlyKSAmJiBjb21wX2RpciAhPSBO VUxMKQorICAgIHsKKyAgICAgIHJlYWxfZGlyID0gbWFrZV9mdWxsX3BhdGgoY29tcF9kaXIsIGlu Y2x1ZGVfZGlyKTsKKyAgICAgIG1ha2VfY2xlYW51cCh4ZnJlZSwgcmVhbF9kaXIpOworICAgIH0K KyAgZWxzZQorICAgIHsKKyAgICAgIHJlYWxfZGlyID0gaW5jbHVkZV9kaXI7CisgICAgfQorCisg IGxoLT5pbmNsdWRlX2RpcnNbbGgtPm51bV9pbmNsdWRlX2RpcnMrK10gPSByZWFsX2RpcjsKIH0K ICAKIApAQCAtNTc1Miw3ICs1NzgwLDcgQEAKICAgIGZyZWVkLiAgKi8KIHN0YXRpYyBzdHJ1Y3Qg bGluZV9oZWFkZXIgKgogZHdhcmZfZGVjb2RlX2xpbmVfaGVhZGVyICh1bnNpZ25lZCBpbnQgb2Zm c2V0LCBiZmQgKmFiZmQsCi0JCQkgIHN0cnVjdCBkd2FyZjJfY3UgKmN1KQorCQkJICBzdHJ1Y3Qg ZHdhcmYyX2N1ICpjdSwgY29uc3QgY2hhciogY29tcF9kaXIpCiB7CiAgIHN0cnVjdCBjbGVhbnVw ICpiYWNrX3RvOwogICBzdHJ1Y3QgbGluZV9oZWFkZXIgKmxoOwpAQCAtNTgyMCw3ICs1ODQ4LDcg QEAKICAgd2hpbGUgKChjdXJfZGlyID0gcmVhZF9zdHJpbmcgKGFiZmQsIGxpbmVfcHRyLCAmYnl0 ZXNfcmVhZCkpICE9IE5VTEwpCiAgICAgewogICAgICAgbGluZV9wdHIgKz0gYnl0ZXNfcmVhZDsK LSAgICAgIGFkZF9pbmNsdWRlX2RpciAobGgsIGN1cl9kaXIpOworICAgICAgYWRkX2luY2x1ZGVf ZGlyIChsaCwgY3VyX2RpciwgY29tcF9kaXIpOwogICAgIH0KICAgbGluZV9wdHIgKz0gYnl0ZXNf cmVhZDsKIApAQCAtODI5MiwxMiArODMyMCw3IEBACiAKICAgICAgIGlmIChkaXIpCiAgICAgICAg IHsKLSAgICAgICAgICBkaXJfbGVuID0gc3RybGVuIChkaXIpOwotICAgICAgICAgIGZ1bGxfbmFt ZSA9IHhtYWxsb2MgKGRpcl9sZW4gKyAxICsgc3RybGVuIChmZS0+bmFtZSkgKyAxKTsKLSAgICAg ICAgICBzdHJjcHkgKGZ1bGxfbmFtZSwgZGlyKTsKLSAgICAgICAgICBmdWxsX25hbWVbZGlyX2xl bl0gPSAnLyc7Ci0gICAgICAgICAgc3RyY3B5IChmdWxsX25hbWUgKyBkaXJfbGVuICsgMSwgZmUt Pm5hbWUpOwotICAgICAgICAgIHJldHVybiBmdWxsX25hbWU7CisgICAgICAgICAgcmV0dXJuIG1h a2VfZnVsbF9wYXRoKGRpciwgZmUtPm5hbWUpOwogICAgICAgICB9CiAgICAgICBlbHNlCiAgICAg ICAgIHJldHVybiB4c3RyZHVwIChmZS0+bmFtZSk7Cg==