<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>236607</bug_id>
          
          <creation_ts>2022-02-14 13:14:42 -0800</creation_ts>
          <short_desc>[GTK][WPE] Use drm render nodes in GbmDevice and make the fd global to the process</short_desc>
          <delta_ts>2022-03-09 04:25:57 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>ANGLE</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>237649</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Alejandro G. Castro">alex</reporter>
          <assigned_to name="Alejandro G. Castro">alex</assigned_to>
          <cc>clord</cc>
    
    <cc>dino</cc>
    
    <cc>kbr</cc>
    
    <cc>kkinnunen</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>zan</cc>
    
    <cc>zdobersek</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1841384</commentid>
    <comment_count>0</comment_count>
    <who name="Alejandro G. Castro">alex</who>
    <bug_when>2022-02-14 13:14:42 -0800</bug_when>
    <thetext>We just need to use render nodes from the library, we do not need the other apis of the primary device file.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841388</commentid>
    <comment_count>1</comment_count>
      <attachid>451937</attachid>
    <who name="Alejandro G. Castro">alex</who>
    <bug_when>2022-02-14 13:22:02 -0800</bug_when>
    <thetext>Created attachment 451937
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841585</commentid>
    <comment_count>2</comment_count>
      <attachid>451937</attachid>
    <who name="Zan Dobersek">zan</who>
    <bug_when>2022-02-14 23:23:38 -0800</bug_when>
    <thetext>Comment on attachment 451937
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=451937&amp;action=review

&gt; Source/WebCore/platform/graphics/gbm/GBMDevice.cpp:61
&gt; +    if (globalFd == -1)
&gt; +        getDeviceFd();

This is now open to cross-thread race conditions.

&gt; Source/WebCore/platform/graphics/gbm/GBMDevice.cpp:75
&gt; -int GBMDevice::getDeviceFd()
&gt; +void GBMDevice::getDeviceFd()

This should be moved out into a standalone static function that internally uses std::call_once() to protect against separate threads racing to open the render node.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841587</commentid>
    <comment_count>3</comment_count>
      <attachid>451937</attachid>
    <who name="Zan Dobersek">zan</who>
    <bug_when>2022-02-14 23:32:49 -0800</bug_when>
    <thetext>Comment on attachment 451937
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=451937&amp;action=review

&gt; Source/WebCore/platform/graphics/gbm/GBMDevice.cpp:81
&gt;      if (numDevices &lt;=0)

Poor spacing.

&gt; Source/WebCore/platform/graphics/gbm/GBMDevice.cpp:89
&gt; +        globalFd = open(device-&gt;nodes[DRM_NODE_RENDER], O_RDWR);

O_CLOEXEC should also be used.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841601</commentid>
    <comment_count>4</comment_count>
    <who name="Alejandro G. Castro">alex</who>
    <bug_when>2022-02-15 00:31:56 -0800</bug_when>
    <thetext>(In reply to Zan Dobersek from comment #2)
&gt; Comment on attachment 451937 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=451937&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/platform/graphics/gbm/GBMDevice.cpp:61
&gt; &gt; +    if (globalFd == -1)
&gt; &gt; +        getDeviceFd();
&gt; 
&gt; This is now open to cross-thread race conditions.
&gt; 

Good point, we need to protect the first access.

&gt; &gt; Source/WebCore/platform/graphics/gbm/GBMDevice.cpp:75
&gt; &gt; -int GBMDevice::getDeviceFd()
&gt; &gt; +void GBMDevice::getDeviceFd()
&gt; 
&gt; This should be moved out into a standalone static function that internally
&gt; uses std::call_once() to protect against separate threads racing to open the
&gt; render node.

Thanks for the comments! I&apos;ll update the patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841829</commentid>
    <comment_count>5</comment_count>
      <attachid>452063</attachid>
    <who name="Alejandro G. Castro">alex</who>
    <bug_when>2022-02-15 11:21:49 -0800</bug_when>
    <thetext>Created attachment 452063
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1842129</commentid>
    <comment_count>6</comment_count>
      <attachid>452063</attachid>
    <who name="Zan Dobersek (Reviews)">zdobersek</who>
    <bug_when>2022-02-15 21:57:55 -0800</bug_when>
    <thetext>Comment on attachment 452063
Patch

Great, thanks.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1842208</commentid>
    <comment_count>7</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-02-16 02:57:13 -0800</bug_when>
    <thetext>Committed r289885 (247323@main): &lt;https://commits.webkit.org/247323@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 452063.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1842209</commentid>
    <comment_count>8</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-02-16 02:58:15 -0800</bug_when>
    <thetext>&lt;rdar://problem/89016322&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>451937</attachid>
            <date>2022-02-14 13:22:02 -0800</date>
            <delta_ts>2022-02-15 11:21:45 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-236607-20220214222201.patch</filename>
            <type>text/plain</type>
            <size>3443</size>
            <attacher name="Alejandro G. Castro">alex</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjhlNzY1MzFlZjkzZWIw
YzlmMWIxNmM1MzUwOTlkMWUwNzUxNjU4Zi4uZGZhZjViZTk0ZjExM2Q5MTE0MjZmMjYyN2Q1Njg4
YTczZGQ1ZDY4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAyLTE0ICBBbGVq
YW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdW1dQRV0g
VXNlIGRybSByZW5kZXIgbm9kZXMgaW4gR2JtRGV2aWNlIGFuZCBtYWtlIHRoZSBmZCBnbG9iYWwg
dG8gdGhlIHByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIzNjYwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIFdlIGFyZSBjcmVhdGluZyBhIGdsb2JhbCBzdGF0aWMgdmFyaWFibGUgdG8gaGFuZGxl
IHRoZSBmZCBvZiB0aGUKKyAgICAgICAgZGV2aWNlIGluIHRoZSBwcm9jZXNzLCB0byBtYWtlIHN1
cmUgd2Ugc2VhcmNoIGFuZCBvcGVuIG9uY2UgZm9yCisgICAgICAgIHRoZSBncmFwaGljcyBkZXZp
Y2UuIEFsc28gd2UgYXJlIHVzaW5nIHRoZSBEUk1fTk9ERV9SRU5ERVIgYmVjYXVzZQorICAgICAg
ICB3ZSBkbyBub3QgbmVlZCB0aGUgcHJpbWFyeSBkZXZpY2UgZm9yIHRoZSBvcGVyYXRpb25zIHdl
IGV4cGVjdCB0bworICAgICAgICB1c2UuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhbHJlYWR5
IGNvdmVyZWQgaW4gdGhlIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ2Jt
L0dCTURldmljZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHQk1EZXZpY2U6OkdCTURldmljZSk6
IFVzZSBhIG5ldyBnbG9iYWwgZmQuCisgICAgICAgIChXZWJDb3JlOjpHQk1EZXZpY2U6OmdldERl
dmljZUZkKTogV2UgZG8gbm90IHJldHVybiB0aGUgZmlsZSBkZXNjcmlwdG9yLgorICAgICAgICAq
IHBsYXRmb3JtL2dyYXBoaWNzL2dibS9HQk1EZXZpY2UuaDogRGl0dG8uCisKIDIwMjItMDItMTQg
IEZyw6lkw6lyaWMgV2FuZyAgPGZ3YW5nQGlnYWxpYS5jb20+CiAKICAgICAgICAgTnVsbHB0ciBj
cmFzaCBpbiBDb21wb3NpdGVFZGl0Q29tbWFuZDo6c3BsaXRUcmVlVG9Ob2RlIHZpYSBJbnNlcnRQ
YXJhZ3JhcGhTZXBhcmF0b3JDb21tYW5kOjpkb0FwcGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nYm0vR0JNRGV2aWNlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL2dyYXBoaWNzL2dibS9HQk1EZXZpY2UuY3BwCmluZGV4IGQzZjZjMzFlMzBjNTU5
Yjk3ZTYzOWZlNDhjNzNhOTk2N2MzZWJjNTYuLjY2YWEwM2VkNzFmODZkMGFiOWFhOWVlOTUzODU2
ZjQ5YjVkZmNjOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L2dibS9HQk1EZXZpY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L2dibS9HQk1EZXZpY2UuY3BwCkBAIC01MywxMSArNTMsMTUgQEAgY29uc3QgR0JNRGV2aWNlJiBH
Qk1EZXZpY2U6OmdldCgpCiAgICAgcmV0dXJuICp0aHJlYWRTcGVjaWZpY0RldmljZSgpOwogfQog
CitzdGF0aWMgaW50IGdsb2JhbEZkIHsgLTEgfTsKKwogR0JNRGV2aWNlOjpHQk1EZXZpY2UoKQog
ewotICAgIGludCBmZCA9IGdldERldmljZUZkKCk7Ci0gICAgaWYgKGZkID49IDApCi0gICAgICAg
IG1fZGV2aWNlID0gZ2JtX2NyZWF0ZV9kZXZpY2UoZmQpOworICAgIGlmIChnbG9iYWxGZCA9PSAt
MSkKKyAgICAgICAgZ2V0RGV2aWNlRmQoKTsKKworICAgIGlmIChnbG9iYWxGZCA+PSAwKQorICAg
ICAgICBtX2RldmljZSA9IGdibV9jcmVhdGVfZGV2aWNlKGdsb2JhbEZkKTsKIH0KIAogR0JNRGV2
aWNlOjp+R0JNRGV2aWNlKCkKQEAgLTY4LDI3ICs3MiwyNiBAQCBHQk1EZXZpY2U6On5HQk1EZXZp
Y2UoKQogICAgIH0KIH0KIAotaW50IEdCTURldmljZTo6Z2V0RGV2aWNlRmQoKQordm9pZCBHQk1E
ZXZpY2U6OmdldERldmljZUZkKCkKIHsKICAgICBkcm1EZXZpY2VQdHIgZGV2aWNlc1s2NF07CiAg
ICAgbWVtc2V0KGRldmljZXMsIDAsIHNpemVvZihkZXZpY2VzKSk7CiAKICAgICBpbnQgbnVtRGV2
aWNlcyA9IGRybUdldERldmljZXMyKDAsIGRldmljZXMsIFdURl9BUlJBWV9MRU5HVEgoZGV2aWNl
cykpOwogICAgIGlmIChudW1EZXZpY2VzIDw9MCkKLSAgICAgICAgcmV0dXJuIC0xOworICAgICAg
ICByZXR1cm47CiAKLSAgICBpbnQgZmQgPSAtMTsKICAgICBmb3IgKGludCBpID0gMDsgaSA8IG51
bURldmljZXM7ICsraSkgewogICAgICAgICBkcm1EZXZpY2UqIGRldmljZSA9IGRldmljZXNbaV07
Ci0gICAgICAgIGlmICghKGRldmljZS0+YXZhaWxhYmxlX25vZGVzICYgKDEgPDwgRFJNX05PREVf
UFJJTUFSWSkpKQorICAgICAgICBpZiAoIShkZXZpY2UtPmF2YWlsYWJsZV9ub2RlcyAmICgxIDw8
IERSTV9OT0RFX1JFTkRFUikpKQogICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgZmQg
PSBvcGVuKGRldmljZS0+bm9kZXNbRFJNX05PREVfUFJJTUFSWV0sIE9fUkRXUik7Ci0gICAgICAg
IGlmIChmZCA8IDApCi0gICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgZ2xvYmFsRmQgPSBv
cGVuKGRldmljZS0+bm9kZXNbRFJNX05PREVfUkVOREVSXSwgT19SRFdSKTsKKyAgICAgICAgaWYg
KGdsb2JhbEZkID49IDApCisgICAgICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICByZXR1cm4g
ZmQ7CisgICAgZHJtRnJlZURldmljZXMoZGV2aWNlcywgbnVtRGV2aWNlcyk7CiB9CiAKIH0gLy8g
bmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL2dibS9HQk1EZXZpY2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L2dibS9HQk1EZXZpY2UuaAppbmRleCA1Y2U1MmZlYTc2ODI1ZDNjN2EwNGIzZmIzMjM4M2RmNWNj
NTRlYWU2Li41ZjVmYjY5YTc3OTc3ODJmNDRiN2M0OTJmNzIzZmRiODlkNDRmZDExIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nYm0vR0JNRGV2aWNlLmgKKysr
IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ2JtL0dCTURldmljZS5oCkBAIC00
NCw3ICs0NCw3IEBAIHB1YmxpYzoKICAgICBzdHJ1Y3QgZ2JtX2RldmljZSogZGV2aWNlKCkgY29u
c3QgeyByZXR1cm4gbV9kZXZpY2U7IH0KIAogcHJpdmF0ZToKLSAgICBpbnQgZ2V0RGV2aWNlRmQo
KTsKKyAgICB2b2lkIGdldERldmljZUZkKCk7CiAKICAgICBzdHJ1Y3QgZ2JtX2RldmljZSogbV9k
ZXZpY2UgeyBudWxscHRyIH07CiB9Owo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452063</attachid>
            <date>2022-02-15 11:21:49 -0800</date>
            <delta_ts>2022-02-16 02:57:15 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-236607-20220215202148.patch</filename>
            <type>text/plain</type>
            <size>3720</size>
            <attacher name="Alejandro G. Castro">alex</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjhlNzY1MzFlZjkzZWIw
YzlmMWIxNmM1MzUwOTlkMWUwNzUxNjU4Zi4uODRiNTViYjQ0MTQ2Y2ZhZjA0ZGRmNjc5NDg3ZjE2
YmNlMDQyMzNmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAyLTE1ICBBbGVq
YW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdW1dQRV0g
VXNlIGRybSByZW5kZXIgbm9kZXMgaW4gR2JtRGV2aWNlIGFuZCBtYWtlIHRoZSBmZCBnbG9iYWwg
dG8gdGhlIHByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIzNjYwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIFdlIGFyZSBjcmVhdGluZyBhIGdsb2JhbCBzdGF0aWMgdmFyaWFibGUgdG8gaGFuZGxl
IHRoZSBmZCBvZiB0aGUKKyAgICAgICAgZGV2aWNlIGluIHRoZSBwcm9jZXNzLCB0byBtYWtlIHN1
cmUgd2Ugc2VhcmNoIGFuZCBvcGVuIG9uY2UgZm9yCisgICAgICAgIHRoZSBncmFwaGljcyBkZXZp
Y2UuIEFsc28gd2UgYXJlIHVzaW5nIHRoZSBEUk1fTk9ERV9SRU5ERVIgYmVjYXVzZQorICAgICAg
ICB3ZSBkbyBub3QgbmVlZCB0aGUgcHJpbWFyeSBkZXZpY2UgZm9yIHRoZSBvcGVyYXRpb25zIHdl
IGV4cGVjdCB0bworICAgICAgICB1c2UuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhbHJlYWR5
IGNvdmVyZWQgaW4gdGhlIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ2Jt
L0dCTURldmljZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHQk1EZXZpY2U6OkdCTURldmljZSk6
IFVzZSBhIG5ldyBnbG9iYWwgZmQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ2JtL0dC
TURldmljZS5oOiBEaXR0by4KKwogMjAyMi0wMi0xNCAgRnLDqWTDqXJpYyBXYW5nICA8ZndhbmdA
aWdhbGlhLmNvbT4KIAogICAgICAgICBOdWxscHRyIGNyYXNoIGluIENvbXBvc2l0ZUVkaXRDb21t
YW5kOjpzcGxpdFRyZWVUb05vZGUgdmlhIEluc2VydFBhcmFncmFwaFNlcGFyYXRvckNvbW1hbmQ6
OmRvQXBwbHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2di
bS9HQk1EZXZpY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ2JtL0dC
TURldmljZS5jcHAKaW5kZXggZDNmNmMzMWUzMGM1NTliOTdlNjM5ZmU0OGM3M2E5OTY3YzNlYmM1
Ni4uNTU5ZGJhMjQwZWYyYzM1ZDEzYWU4NmRjMDNmMjY4MjEyNTJiNjNkMyAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ2JtL0dCTURldmljZS5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ2JtL0dCTURldmljZS5jcHAKQEAgLTU1
LDkgKzU1LDMxIEBAIGNvbnN0IEdCTURldmljZSYgR0JNRGV2aWNlOjpnZXQoKQogCiBHQk1EZXZp
Y2U6OkdCTURldmljZSgpCiB7Ci0gICAgaW50IGZkID0gZ2V0RGV2aWNlRmQoKTsKLSAgICBpZiAo
ZmQgPj0gMCkKLSAgICAgICAgbV9kZXZpY2UgPSBnYm1fY3JlYXRlX2RldmljZShmZCk7CisgICAg
c3RhdGljIGludCBzX2dsb2JhbEZkIHsgLTEgfTsKKyAgICBzdGF0aWMgc3RkOjpvbmNlX2ZsYWcg
c19vbmNlRmxhZzsKKyAgICBzdGQ6OmNhbGxfb25jZShzX29uY2VGbGFnLCBbXSB7CisgICAgICAg
IGRybURldmljZVB0ciBkZXZpY2VzWzY0XTsKKyAgICAgICAgbWVtc2V0KGRldmljZXMsIDAsIHNp
emVvZihkZXZpY2VzKSk7CisKKyAgICAgICAgaW50IG51bURldmljZXMgPSBkcm1HZXREZXZpY2Vz
MigwLCBkZXZpY2VzLCBXVEZfQVJSQVlfTEVOR1RIKGRldmljZXMpKTsKKyAgICAgICAgaWYgKG51
bURldmljZXMgPD0gMCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBmb3IgKGludCBp
ID0gMDsgaSA8IG51bURldmljZXM7ICsraSkgeworICAgICAgICAgICAgZHJtRGV2aWNlKiBkZXZp
Y2UgPSBkZXZpY2VzW2ldOworICAgICAgICAgICAgaWYgKCEoZGV2aWNlLT5hdmFpbGFibGVfbm9k
ZXMgJiAoMSA8PCBEUk1fTk9ERV9SRU5ERVIpKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsK
KworICAgICAgICAgICAgc19nbG9iYWxGZCA9IG9wZW4oZGV2aWNlLT5ub2Rlc1tEUk1fTk9ERV9S
RU5ERVJdLCBPX1JEV1IgfCBPX0NMT0VYRUMpOworICAgICAgICAgICAgaWYgKHNfZ2xvYmFsRmQg
Pj0gMCkKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorCisgICAgICAgIGRybUZy
ZWVEZXZpY2VzKGRldmljZXMsIG51bURldmljZXMpOworICAgIH0pOworCisgICAgaWYgKHNfZ2xv
YmFsRmQgPj0gMCkKKyAgICAgICAgbV9kZXZpY2UgPSBnYm1fY3JlYXRlX2RldmljZShzX2dsb2Jh
bEZkKTsKIH0KIAogR0JNRGV2aWNlOjp+R0JNRGV2aWNlKCkKQEAgLTY4LDI5ICs5MCw2IEBAIEdC
TURldmljZTo6fkdCTURldmljZSgpCiAgICAgfQogfQogCi1pbnQgR0JNRGV2aWNlOjpnZXREZXZp
Y2VGZCgpCi17Ci0gICAgZHJtRGV2aWNlUHRyIGRldmljZXNbNjRdOwotICAgIG1lbXNldChkZXZp
Y2VzLCAwLCBzaXplb2YoZGV2aWNlcykpOwotCi0gICAgaW50IG51bURldmljZXMgPSBkcm1HZXRE
ZXZpY2VzMigwLCBkZXZpY2VzLCBXVEZfQVJSQVlfTEVOR1RIKGRldmljZXMpKTsKLSAgICBpZiAo
bnVtRGV2aWNlcyA8PTApCi0gICAgICAgIHJldHVybiAtMTsKLQotICAgIGludCBmZCA9IC0xOwot
ICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbnVtRGV2aWNlczsgKytpKSB7Ci0gICAgICAgIGRybURl
dmljZSogZGV2aWNlID0gZGV2aWNlc1tpXTsKLSAgICAgICAgaWYgKCEoZGV2aWNlLT5hdmFpbGFi
bGVfbm9kZXMgJiAoMSA8PCBEUk1fTk9ERV9QUklNQVJZKSkpCi0gICAgICAgICAgICBjb250aW51
ZTsKLQotICAgICAgICBmZCA9IG9wZW4oZGV2aWNlLT5ub2Rlc1tEUk1fTk9ERV9QUklNQVJZXSwg
T19SRFdSKTsKLSAgICAgICAgaWYgKGZkIDwgMCkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAg
IH0KLQotICAgIHJldHVybiBmZDsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5k
aWYgLy8gVVNFKEFOR0xFKSAmJiBVU0UoTklDT1NJQSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dibS9HQk1EZXZpY2UuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL2dyYXBoaWNzL2dibS9HQk1EZXZpY2UuaAppbmRleCA1Y2U1MmZlYTc2ODI1ZDNjN2Ew
NGIzZmIzMjM4M2RmNWNjNTRlYWU2Li4yNTBlMDdmYzlkN2Q2MTZjODRjMWFjYzc4NjQ5N2ViZTk0
OWQ5NzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nYm0v
R0JNRGV2aWNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ2JtL0dC
TURldmljZS5oCkBAIC00NCw4ICs0NCw2IEBAIHB1YmxpYzoKICAgICBzdHJ1Y3QgZ2JtX2Rldmlj
ZSogZGV2aWNlKCkgY29uc3QgeyByZXR1cm4gbV9kZXZpY2U7IH0KIAogcHJpdmF0ZToKLSAgICBp
bnQgZ2V0RGV2aWNlRmQoKTsKLQogICAgIHN0cnVjdCBnYm1fZGV2aWNlKiBtX2RldmljZSB7IG51
bGxwdHIgfTsKIH07CiAK
</data>

          </attachment>
      

    </bug>

</bugzilla>