209941 2020-04-02 16:53:01 -0700 Filter some capture device names 2020-04-03 11:22:10 -0700 1 1 1 Unclassified WebKit WebRTC Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1637155 0 eric.carlson 2020-04-02 16:53:01 -0700 Filter some capture device names 1637156 1 eric.carlson 2020-04-02 16:53:40 -0700 <rdar://problem/59141886> 1637162 2 395327 eric.carlson 2020-04-02 17:06:48 -0700 Created attachment 395327 Patch 1637274 3 395327 youennf 2020-04-03 01:29:41 -0700 Comment on attachment 395327 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395327&action=review > Source/WebCore/platform/mediastream/CaptureDevice.h:50 > + static NeverDestroyed<String> airPods(MAKE_STATIC_STRING_IMPL("AirPods")); This seems ok to special case AirPods name, I would restrict this to Microphone DeviceType. Maybe we should move that method to a CPP file as well. Also we do not protect other device names. We could sanitize all bluetooth microphone devices, by checking kAudioDevicePropertyTransportType in CoreAudioCaptureDevice.cpp. We would then continue special casing AirPods but would rename other BT microphones to "Bluetooth Microphone" or "Bluetooth Microphone: xxx" with the first letters of the real names. 1637430 4 395393 eric.carlson 2020-04-03 10:31:27 -0700 Created attachment 395393 Patch for landing 1637444 5 395327 eric.carlson 2020-04-03 10:56:16 -0700 Comment on attachment 395327 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395327&action=review >> Source/WebCore/platform/mediastream/CaptureDevice.h:50 >> + static NeverDestroyed<String> airPods(MAKE_STATIC_STRING_IMPL("AirPods")); > > This seems ok to special case AirPods name, I would restrict this to Microphone DeviceType. > Maybe we should move that method to a CPP file as well. > > Also we do not protect other device names. > We could sanitize all bluetooth microphone devices, by checking kAudioDevicePropertyTransportType in CoreAudioCaptureDevice.cpp. > We would then continue special casing AirPods but would rename other BT microphones to "Bluetooth Microphone" or "Bluetooth Microphone: xxx" with the first letters of the real names. I agree that we should look at sanitizing other device names. I'll land this after updating to only change the name if the device is a microphone, and we can figure out a more cohesive strategy for the future. 1637462 6 ews-feeder 2020-04-03 11:22:09 -0700 Committed r259477: <https://trac.webkit.org/changeset/259477> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395393. 395327 2020-04-02 17:06:48 -0700 2020-04-03 10:31:26 -0700 Patch bug-209941-20200402170647.patch text/plain 5026 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmJiYjIxNzcyYTM2ZDUw ZWM4NjIwN2FjZWM1NTVkMjlhYTJkOTVhMC4uNWFmMWM4ZjU0ZGM5ZTRiOTRkNmM2M2ZkYTU5ZDk4 YjFjY2RmODhiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA0LTAyICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEZpbHRlciBzb21l IGNhcHR1cmUgZGV2aWNlIG5hbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDk5NDEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU5MTQxODg2Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZh c3QvbWVkaWFzdHJlYW0vYW5vbnltaXplLWRldmljZS1uYW1lLmh0bWwKKworICAgICAgICAqIHBs YXRmb3JtL21lZGlhc3RyZWFtL0NhcHR1cmVEZXZpY2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNh cHR1cmVEZXZpY2U6OmxhYmVsIGNvbnN0KToKKwogMjAyMC0wNC0wMSAgQ2hyaXMgRHVtZXogIDxj ZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIGh0dHAvdGVzdHMvbmF2aWdhdGlvbi9wYWdlLWNh Y2hlLWZvbnRmYWNlc2V0Lmh0bWwgaXMgZmxha3kgY3Jhc2hpbmcKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL0NhcHR1cmVEZXZpY2UuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL0NhcHR1cmVEZXZpY2UuaAppbmRleCAxOGE5ZjA2 ZjIzYWMzZWExMjcxMDMyMjQ5YzlkYzRhMzBiOTY5OTE4Li4wYmY2NjFmNzYxYWU5OTJjMTczNzQ0 NmRlNjczZGQ3NWEyZTkwOTk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9DYXB0dXJlRGV2aWNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vQ2FwdHVyZURldmljZS5oCkBAIC00NSw3ICs0NSwxNSBAQCBwdWJsaWM6CiAK ICAgICBjb25zdCBTdHJpbmcmIHBlcnNpc3RlbnRJZCgpIGNvbnN0IHsgcmV0dXJuIG1fcGVyc2lz dGVudElkOyB9CiAKLSAgICBjb25zdCBTdHJpbmcmIGxhYmVsKCkgY29uc3QgeyByZXR1cm4gbV9s YWJlbDsgfQorICAgIGNvbnN0IFN0cmluZyYgbGFiZWwoKSBjb25zdAorICAgIHsKKyAgICAgICAg c3RhdGljIE5ldmVyRGVzdHJveWVkPFN0cmluZz4gYWlyUG9kcyhNQUtFX1NUQVRJQ19TVFJJTkdf SU1QTCgiQWlyUG9kcyIpKTsKKworICAgICAgICBpZiAobV9sYWJlbC5jb250YWlucyhhaXJQb2Rz KSkKKyAgICAgICAgICAgIHJldHVybiBhaXJQb2RzOworCisgICAgICAgIHJldHVybiBtX2xhYmVs OworICAgIH0KIAogICAgIGNvbnN0IFN0cmluZyYgZ3JvdXBJZCgpIGNvbnN0IHsgcmV0dXJuIG1f Z3JvdXBJZDsgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKaW5kZXggNGZhYWFhMmM4MDMyM2RmM2MzM2QyOGQ1NDE2MjliMDQyMzFi MTFlMy4uN2YzZmY4NTE3MzYxNzRlYmI5NWM0NzMwN2Q3MWRiZTYwY2MzZTk1OSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDIwLTA0LTAyICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBw bGUuY29tPgorCisgICAgICAgIEZpbHRlciBzb21lIGNhcHR1cmUgZGV2aWNlIG5hbWVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk5NDEKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzU5MTQxODg2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9tZWRpYXN0cmVhbS9hbm9ueW1pemUtZGV2aWNl LW5hbWUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L21lZGlhc3RyZWFtL2Fu b255bWl6ZS1kZXZpY2UtbmFtZS5odG1sOiBBZGRlZC4KKwogMjAyMC0wNC0wMSAgUm9zcyBLaXJz bGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAgSW50bC5OdW1iZXJGb3Jt YXQucHJvdG90eXBlLmZvcm1hdCBtdXN0IHByZXNlcnZlIHNpZ24gb2YgLTAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vYW5vbnltaXplLWRldmljZS1uYW1lLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vYW5vbnltaXplLWRldmljZS1u YW1lLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wY2FmZGZkMzMzNzVjZDM4NWI2NDJlMDVkMjY1 ZTEwNWM3NzM2OTViCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0 cmVhbS9hbm9ueW1pemUtZGV2aWNlLW5hbWUtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMyBAQAor CitQQVNTIGVudW1lcmF0ZURldmljZXMoKSBhbm9ueW1pemVzIG1pY3JvcGhvbmUgYW5kIHRyYWNr IGxhYmVscyBjb3JyZWN0bHkgCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFz dHJlYW0vYW5vbnltaXplLWRldmljZS1uYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlh c3RyZWFtL2Fub255bWl6ZS1kZXZpY2UtbmFtZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmNiMmQ0NjAwM2Vh MzEwM2QzNzU5OGRlMzUzNjdhNTI1YWVhMmJiZmMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9mYXN0L21lZGlhc3RyZWFtL2Fub255bWl6ZS1kZXZpY2UtbmFtZS5odG1sCkBAIC0wLDAg KzEsNDkgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8bWV0YSBjaGFy c2V0PSJ1dGYtOCI+CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy90ZXN0aGFybmVz cy5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy90ZXN0aGFy bmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAgICAKKyAgICBwcm9taXNl X3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsKKyAgICAgICAgCisgICAgICAgIGNvbnN0IG9yaWdpbmFs TGFiZWwgPSAiV2ViS2l0J3MgQWlyUG9kcyI7CisgICAgICAgIGNvbnN0IGFub255bWl6ZWRMYWJl bCA9ICJBaXJQb2RzIjsKKworICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAg ICAgICAgIHRlc3RSdW5uZXIuc2V0VXNlck1lZGlhUGVybWlzc2lvbih0cnVlKTsKKyAgICAgICAg ICAgIHRlc3RSdW5uZXIuYWRkTW9ja01pY3JvcGhvbmVEZXZpY2UoImlkLTEiLCBvcmlnaW5hbExh YmVsKTsKKyAgICAgICAgfQorCisgICAgICAgIGxldCBkZXZpY2VzID0gYXdhaXQgbmF2aWdhdG9y Lm1lZGlhRGV2aWNlcy5lbnVtZXJhdGVEZXZpY2VzKCk7CisgICAgICAgIGZvciAoY29uc3QgZGV2 aWNlIG9mIGRldmljZXMpCisgICAgICAgICAgICBhc3NlcnRfZmFsc2UoISFkZXZpY2UubGFiZWwu bGVuZ3RoLCAibmF2aWdhdG9yLm1lZGlhRGV2aWNlcyByZXZlYWxlZCBkZXZpY2UgbmFtZSBiZWZv cmUgZ2V0VXNlck1lZGlhKCkiKTsKKworICAgICAgICBsZXQgc3RyZWFtID0gYXdhaXQgbmF2aWdh dG9yLm1lZGlhRGV2aWNlcy5nZXRVc2VyTWVkaWEoeyBhdWRpbzp0cnVlLCB2aWRlbzp0cnVlIH0p CisKKyAgICAgICAgZm9yIChjb25zdCB0cmFjayBvZiBzdHJlYW0uZ2V0QXVkaW9UcmFja3MoKSkg eworICAgICAgICAgICAgYXNzZXJ0X2ZhbHNlKHRyYWNrLmxhYmVsID09IG9yaWdpbmFsTGFiZWws ICJuYXZpZ2F0b3IubWVkaWFEZXZpY2VzIGRpZCBub3QgYW5vbnltaXplIGF1ZGlvIHRyYWNrIGxh YmVsIGF0IGFsbCIpOworICAgICAgICAgICAgaWYgKHRyYWNrLmxhYmVsLmluZGV4T2YoIkFpclBv ZHMiKSAhPSAtMSkKKyAgICAgICAgICAgICAgICBhc3NlcnRfdHJ1ZSh0cmFjay5sYWJlbCA9PSBh bm9ueW1pemVkTGFiZWwsICJuYXZpZ2F0b3IubWVkaWFEZXZpY2VzIGRpZCBub3QgYW5vbnltaXpl IGF1ZGlvIHRyYWNrIGxhYmVsIGNvcnJlY3RseSIpOworICAgICAgICB9CisKKyAgICAgICAgZGV2 aWNlcyA9IGF3YWl0IG5hdmlnYXRvci5tZWRpYURldmljZXMuZW51bWVyYXRlRGV2aWNlcygpOwor ICAgICAgICBjb25zdCBtaWNyb3Bob25lcyA9IGRldmljZXMuZmlsdGVyKCh7a2luZH0pID0+IGtp bmQgPT0gImF1ZGlvaW5wdXQiKTsKKyAgICAgICAgZm9yIChjb25zdCBtaWNyb3Bob25lIG9mIG1p Y3JvcGhvbmVzKSB7CisgICAgICAgICAgICBjb25zdCB7IGtpbmQsIGxhYmVsLCBkZXZpY2VJZCB9 ID0gbWljcm9waG9uZTsKKyAgICAgICAgICAgIGlmIChraW5kICE9ICJhdWRpb2lucHV0IikKKyAg ICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgYXNzZXJ0X2ZhbHNlKGxhYmVs ID09IG9yaWdpbmFsTGFiZWwsICJuYXZpZ2F0b3IubWVkaWFEZXZpY2VzIGRpZCBub3QgYW5vbnlt aXplIG1pY3JvcGhvbmUgbGFiZWwgYXQgYWxsIik7CisgICAgICAgICAgICBpZiAobGFiZWwuaW5k ZXhPZigiQWlyUG9kcyIpICE9IC0xKQorICAgICAgICAgICAgICAgIGFzc2VydF90cnVlKGxhYmVs ID09IGFub255bWl6ZWRMYWJlbCwgIm5hdmlnYXRvci5tZWRpYURldmljZXMgZGlkIG5vdCBhbm9u eW1pemUgbWljcm9waG9uZSBsYWJlbCBjb3JyZWN0bHkiKTsKKyAgICAgICAgfQorCisgICAgfSwg ImVudW1lcmF0ZURldmljZXMoKSBhbm9ueW1pemVzIG1pY3JvcGhvbmUgYW5kIHRyYWNrIGxhYmVs cyBjb3JyZWN0bHkiKTsKKworICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8L2JvZHk+ Cis8L2h0bWw+Cg== 395393 2020-04-03 10:31:27 -0700 2020-04-03 11:22:09 -0700 Patch for landing bug-209941-20200403103126.patch text/plain 5050 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTVmMDEyZGJhOTFkOTZm NTlmNDVlNDdjMjNiZDlkOGRkNjA1OWRjNy4uZDE0MTZjZDBkMGE3MmIyYzExMzY5YmEyZGU5YzA3 ZDEwOGI0NzQ4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA0LTAzICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEZpbHRlciBzb21l IGNhcHR1cmUgZGV2aWNlIG5hbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDk5NDEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU5MTQxODg2Pgor CisgICAgICAgIFJldmlld2VkIGJ5IFlvdWVubiBGYWJsZXQuCisKKyAgICAgICAgVGVzdDogZmFz dC9tZWRpYXN0cmVhbS9hbm9ueW1pemUtZGV2aWNlLW5hbWUuaHRtbAorCisgICAgICAgICogcGxh dGZvcm0vbWVkaWFzdHJlYW0vQ2FwdHVyZURldmljZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q2Fw dHVyZURldmljZTo6bGFiZWwgY29uc3QpOgorCiAyMDIwLTA0LTAzICBTaWh1aSBMaXUgIDxzaWh1 aV9saXVAYXBwbGUuY29tPgogCiAgICAgICAgIEFTU0VSVElPTiBGQUlMRUQ6IG1fZGVsZWdhdGUg aW4gSURCQ29ubmVjdGlvblRvQ2xpZW50OjppZGVudGlmaWVyKCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL0NhcHR1cmVEZXZpY2UuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL0NhcHR1cmVEZXZpY2UuaAppbmRleCAxOGE5ZjA2 ZjIzYWMzZWExMjcxMDMyMjQ5YzlkYzRhMzBiOTY5OTE4Li5mYWQxMGQ2NTU4YTA1ZDliOTQ4NDFi Y2FmNDcxYzExNjQyY2UzYjhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9DYXB0dXJlRGV2aWNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vQ2FwdHVyZURldmljZS5oCkBAIC00NSw3ICs0NSwxNSBAQCBwdWJsaWM6CiAK ICAgICBjb25zdCBTdHJpbmcmIHBlcnNpc3RlbnRJZCgpIGNvbnN0IHsgcmV0dXJuIG1fcGVyc2lz dGVudElkOyB9CiAKLSAgICBjb25zdCBTdHJpbmcmIGxhYmVsKCkgY29uc3QgeyByZXR1cm4gbV9s YWJlbDsgfQorICAgIGNvbnN0IFN0cmluZyYgbGFiZWwoKSBjb25zdAorICAgIHsKKyAgICAgICAg c3RhdGljIE5ldmVyRGVzdHJveWVkPFN0cmluZz4gYWlyUG9kcyhNQUtFX1NUQVRJQ19TVFJJTkdf SU1QTCgiQWlyUG9kcyIpKTsKKworICAgICAgICBpZiAobV90eXBlID09IERldmljZVR5cGU6Ok1p Y3JvcGhvbmUgJiYgbV9sYWJlbC5jb250YWlucyhhaXJQb2RzKSkKKyAgICAgICAgICAgIHJldHVy biBhaXJQb2RzOworCisgICAgICAgIHJldHVybiBtX2xhYmVsOworICAgIH0KIAogICAgIGNvbnN0 IFN0cmluZyYgZ3JvdXBJZCgpIGNvbnN0IHsgcmV0dXJuIG1fZ3JvdXBJZDsgfQogCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg ZTg0NzIzYTI4ZTJjYTQ1NTExNWEwMjNlMDQ3YzE0YzExYTA5Y2NkYi4uNWM5NzZlYWNjODRjZDA1 MjY1ODQ5NWI4YjBjOWY5YTExYzk0ZTU4OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA0 LTAzICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEZp bHRlciBzb21lIGNhcHR1cmUgZGV2aWNlIG5hbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk5NDEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU5 MTQxODg2PgorCisgICAgICAgIFJldmlld2VkIGJ5IFlvdWVubiBGYWJsZXQuCisKKyAgICAgICAg KiBmYXN0L21lZGlhc3RyZWFtL2Fub255bWl6ZS1kZXZpY2UtbmFtZS1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0vYW5vbnltaXplLWRldmljZS1uYW1lLmh0 bWw6IEFkZGVkLgorCiAyMDIwLTA0LTAzICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29t PgogCiAgICAgICAgIEZsYWt5IFRlc3Q6IHN0b3JhZ2UvaW5kZXhlZGRiL2N1cnNvci1yZXF1ZXN0 LWN5Y2xlLmh0bWwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vYW5v bnltaXplLWRldmljZS1uYW1lLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFz dHJlYW0vYW5vbnltaXplLWRldmljZS1uYW1lLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wY2Fm ZGZkMzMzNzVjZDM4NWI2NDJlMDVkMjY1ZTEwNWM3NzM2OTViCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9hbm9ueW1pemUtZGV2aWNlLW5hbWUtZXhwZWN0 ZWQudHh0CkBAIC0wLDAgKzEsMyBAQAorCitQQVNTIGVudW1lcmF0ZURldmljZXMoKSBhbm9ueW1p emVzIG1pY3JvcGhvbmUgYW5kIHRyYWNrIGxhYmVscyBjb3JyZWN0bHkgCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vYW5vbnltaXplLWRldmljZS1uYW1lLmh0bWwg Yi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL2Fub255bWl6ZS1kZXZpY2UtbmFtZS5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmNiMmQ0NjAwM2VhMzEwM2QzNzU5OGRlMzUzNjdhNTI1YWVhMmJiZmMKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL2Fub255bWl6ZS1k ZXZpY2UtbmFtZS5odG1sCkBAIC0wLDAgKzEsNDkgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+ Cis8aGVhZD4KKyAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CisgICAgPHNjcmlwdCBzcmM9Ii4u Ly4uL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9 Ii4uLy4uL3Jlc291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+CisgICAgPHNj cmlwdD4KKyAgICAKKyAgICBwcm9taXNlX3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsKKyAgICAgICAg CisgICAgICAgIGNvbnN0IG9yaWdpbmFsTGFiZWwgPSAiV2ViS2l0J3MgQWlyUG9kcyI7CisgICAg ICAgIGNvbnN0IGFub255bWl6ZWRMYWJlbCA9ICJBaXJQb2RzIjsKKworICAgICAgICBpZiAod2lu ZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIuc2V0VXNlck1lZGlhUGVy bWlzc2lvbih0cnVlKTsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIuYWRkTW9ja01pY3JvcGhvbmVE ZXZpY2UoImlkLTEiLCBvcmlnaW5hbExhYmVsKTsKKyAgICAgICAgfQorCisgICAgICAgIGxldCBk ZXZpY2VzID0gYXdhaXQgbmF2aWdhdG9yLm1lZGlhRGV2aWNlcy5lbnVtZXJhdGVEZXZpY2VzKCk7 CisgICAgICAgIGZvciAoY29uc3QgZGV2aWNlIG9mIGRldmljZXMpCisgICAgICAgICAgICBhc3Nl cnRfZmFsc2UoISFkZXZpY2UubGFiZWwubGVuZ3RoLCAibmF2aWdhdG9yLm1lZGlhRGV2aWNlcyBy ZXZlYWxlZCBkZXZpY2UgbmFtZSBiZWZvcmUgZ2V0VXNlck1lZGlhKCkiKTsKKworICAgICAgICBs ZXQgc3RyZWFtID0gYXdhaXQgbmF2aWdhdG9yLm1lZGlhRGV2aWNlcy5nZXRVc2VyTWVkaWEoeyBh dWRpbzp0cnVlLCB2aWRlbzp0cnVlIH0pCisKKyAgICAgICAgZm9yIChjb25zdCB0cmFjayBvZiBz dHJlYW0uZ2V0QXVkaW9UcmFja3MoKSkgeworICAgICAgICAgICAgYXNzZXJ0X2ZhbHNlKHRyYWNr LmxhYmVsID09IG9yaWdpbmFsTGFiZWwsICJuYXZpZ2F0b3IubWVkaWFEZXZpY2VzIGRpZCBub3Qg YW5vbnltaXplIGF1ZGlvIHRyYWNrIGxhYmVsIGF0IGFsbCIpOworICAgICAgICAgICAgaWYgKHRy YWNrLmxhYmVsLmluZGV4T2YoIkFpclBvZHMiKSAhPSAtMSkKKyAgICAgICAgICAgICAgICBhc3Nl cnRfdHJ1ZSh0cmFjay5sYWJlbCA9PSBhbm9ueW1pemVkTGFiZWwsICJuYXZpZ2F0b3IubWVkaWFE ZXZpY2VzIGRpZCBub3QgYW5vbnltaXplIGF1ZGlvIHRyYWNrIGxhYmVsIGNvcnJlY3RseSIpOwor ICAgICAgICB9CisKKyAgICAgICAgZGV2aWNlcyA9IGF3YWl0IG5hdmlnYXRvci5tZWRpYURldmlj ZXMuZW51bWVyYXRlRGV2aWNlcygpOworICAgICAgICBjb25zdCBtaWNyb3Bob25lcyA9IGRldmlj ZXMuZmlsdGVyKCh7a2luZH0pID0+IGtpbmQgPT0gImF1ZGlvaW5wdXQiKTsKKyAgICAgICAgZm9y IChjb25zdCBtaWNyb3Bob25lIG9mIG1pY3JvcGhvbmVzKSB7CisgICAgICAgICAgICBjb25zdCB7 IGtpbmQsIGxhYmVsLCBkZXZpY2VJZCB9ID0gbWljcm9waG9uZTsKKyAgICAgICAgICAgIGlmIChr aW5kICE9ICJhdWRpb2lucHV0IikKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAg ICAgICAgYXNzZXJ0X2ZhbHNlKGxhYmVsID09IG9yaWdpbmFsTGFiZWwsICJuYXZpZ2F0b3IubWVk aWFEZXZpY2VzIGRpZCBub3QgYW5vbnltaXplIG1pY3JvcGhvbmUgbGFiZWwgYXQgYWxsIik7Cisg ICAgICAgICAgICBpZiAobGFiZWwuaW5kZXhPZigiQWlyUG9kcyIpICE9IC0xKQorICAgICAgICAg ICAgICAgIGFzc2VydF90cnVlKGxhYmVsID09IGFub255bWl6ZWRMYWJlbCwgIm5hdmlnYXRvci5t ZWRpYURldmljZXMgZGlkIG5vdCBhbm9ueW1pemUgbWljcm9waG9uZSBsYWJlbCBjb3JyZWN0bHki KTsKKyAgICAgICAgfQorCisgICAgfSwgImVudW1lcmF0ZURldmljZXMoKSBhbm9ueW1pemVzIG1p Y3JvcGhvbmUgYW5kIHRyYWNrIGxhYmVscyBjb3JyZWN0bHkiKTsKKworICAgIDwvc2NyaXB0Pgor PC9oZWFkPgorPGJvZHk+Cis8L2JvZHk+Cis8L2h0bWw+Cg==