<?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>216834</bug_id>
          
          <creation_ts>2020-09-22 10:19:39 -0700</creation_ts>
          <short_desc>[macOS] Issue sandbox extension for the diagnostic daemon</short_desc>
          <delta_ts>2020-09-24 09:47:41 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit Misc.</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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Per Arne Vollan">pvollan</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>mitz</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1690763</commentid>
    <comment_count>0</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-09-22 10:19:39 -0700</bug_when>
    <thetext>On internal installs, the UI process should issue a mach lookup sandbox extension for accessing the diagnostic daemon, and send it to the WebContent process.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1690764</commentid>
    <comment_count>1</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-09-22 10:21:42 -0700</bug_when>
    <thetext>&lt;rdar://problem/58496834&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1690789</commentid>
    <comment_count>2</comment_count>
      <attachid>409383</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-09-22 11:39:21 -0700</bug_when>
    <thetext>Created attachment 409383
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1690792</commentid>
    <comment_count>3</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-09-22 11:42:33 -0700</bug_when>
    <thetext>*** Bug 206115 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1690796</commentid>
    <comment_count>4</comment_count>
      <attachid>409385</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-09-22 11:45:39 -0700</bug_when>
    <thetext>Created attachment 409385
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1691192</commentid>
    <comment_count>5</comment_count>
      <attachid>409385</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2020-09-23 11:29:54 -0700</bug_when>
    <thetext>Comment on attachment 409385
Patch

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

r=me, but I think you could use an existing FileSystem function instead of the raw &apos;stat&apos; operation.

&gt; Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:68
&gt; +#import &lt;sys/stat.h&gt;

You don&apos;t need to include this if you use , FileSystem::fileIsDirectory

&gt; Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:211
&gt; +    static bool isInternal = !stat(&quot;/AppleInternal&quot;, &amp;st);

I think it might be better to do:

static bool isInternal = FileSystem::fileIsDirectory(&quot;/AppleInternal&quot;, FileSystem::ShouldFollowSymbolicLinks::No);</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1691196</commentid>
    <comment_count>6</comment_count>
      <attachid>409488</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-09-23 11:40:19 -0700</bug_when>
    <thetext>Created attachment 409488
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1691197</commentid>
    <comment_count>7</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-09-23 11:40:56 -0700</bug_when>
    <thetext>(In reply to Brent Fulgham from comment #5)
&gt; Comment on attachment 409385 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=409385&amp;action=review
&gt; 
&gt; r=me, but I think you could use an existing FileSystem function instead of
&gt; the raw &apos;stat&apos; operation.
&gt; 
&gt; &gt; Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:68
&gt; &gt; +#import &lt;sys/stat.h&gt;
&gt; 
&gt; You don&apos;t need to include this if you use , FileSystem::fileIsDirectory
&gt; 
&gt; &gt; Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:211
&gt; &gt; +    static bool isInternal = !stat(&quot;/AppleInternal&quot;, &amp;st);
&gt; 
&gt; I think it might be better to do:
&gt; 
&gt; static bool isInternal = FileSystem::fileIsDirectory(&quot;/AppleInternal&quot;,
&gt; FileSystem::ShouldFollowSymbolicLinks::No);

Will fix, thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1691199</commentid>
    <comment_count>8</comment_count>
      <attachid>409489</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-09-23 11:45:42 -0700</bug_when>
    <thetext>Created attachment 409489
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1691231</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-09-23 12:52:08 -0700</bug_when>
    <thetext>Committed r267498: &lt;https://trac.webkit.org/changeset/267498&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 409489.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1691250</commentid>
    <comment_count>10</comment_count>
      <attachid>409385</attachid>
    <who name="">mitz</who>
    <bug_when>2020-09-23 13:53:33 -0700</bug_when>
    <thetext>Comment on attachment 409385
Patch

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

&gt;&gt; Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:211
&gt;&gt; +    static bool isInternal = !stat(&quot;/AppleInternal&quot;, &amp;st);
&gt; 
&gt; I think it might be better to do:
&gt; 
&gt; static bool isInternal = FileSystem::fileIsDirectory(&quot;/AppleInternal&quot;, FileSystem::ShouldFollowSymbolicLinks::No);

Either way it’s not the recommended way to test whether a computer is running the Apple-internal version of macOS. See OSVariantSPI.h in WTF.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1691278</commentid>
    <comment_count>11</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-09-23 15:19:59 -0700</bug_when>
    <thetext>(In reply to mitz from comment #10)
&gt; Comment on attachment 409385 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=409385&amp;action=review
&gt; 
&gt; &gt;&gt; Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:211
&gt; &gt;&gt; +    static bool isInternal = !stat(&quot;/AppleInternal&quot;, &amp;st);
&gt; &gt; 
&gt; &gt; I think it might be better to do:
&gt; &gt; 
&gt; &gt; static bool isInternal = FileSystem::fileIsDirectory(&quot;/AppleInternal&quot;, FileSystem::ShouldFollowSymbolicLinks::No);
&gt; 
&gt; Either way it’s not the recommended way to test whether a computer is
&gt; running the Apple-internal version of macOS. See OSVariantSPI.h in WTF.

Ah, thanks! I will look into that.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1691548</commentid>
    <comment_count>12</comment_count>
      <attachid>409584</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-09-24 09:46:24 -0700</bug_when>
    <thetext>Created attachment 409584
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1691549</commentid>
    <comment_count>13</comment_count>
      <attachid>409585</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-09-24 09:47:41 -0700</bug_when>
    <thetext>Created attachment 409585
Patch</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>409383</attachid>
            <date>2020-09-22 11:39:21 -0700</date>
            <delta_ts>2020-09-22 11:57:53 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>216834.patch</filename>
            <type>text/plain</type>
            <size>7262</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjc0MTcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA5LTIyICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIElzc3VlIHNhbmRi
b3ggZXh0ZW5zaW9uIGZvciB0aGUgZGlhZ25vc3RpYyBkYWVtb24KKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjgzNAorICAgICAgICA8cmRhcjovL3By
b2JsZW0vNTg0OTY4MzQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAg
ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6
CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6
CisgICAgICAgICogU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAg
ICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbToKKyAgICAgICAgKFdl
YktpdDo6aXNJbnRlcm5hbEluc3RhbGwpOgorICAgICAgICAoV2ViS2l0OjphZ3hDb21waWxlckNs
YXNzZXMpOgorICAgICAgICAoV2ViS2l0OjpkaWFnbm9zdGljU2VydmljZXMpOgorICAgICAgICAo
V2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW06CisgICAgICAgIChX
ZWJLaXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAg
ICAqIFdlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW46CisKIDIwMjAtMDktMjIg
IFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBh
IGRlZmF1bHQgcHJvbXB0IGZvciBnZXRVc2VyTWVkaWEKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hh
cmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj
ZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCShyZXZpc2lv
biAyNjcwMTIpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJh
bWV0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYyLDggKzE2Miw4IEBACiAgICAgZW5jb2Rl
ciA8PCBjb250YWluZXJNYW5hZ2VyRXh0ZW5zaW9uSGFuZGxlOwogICAgIGVuY29kZXIgPDwgbW9i
aWxlR2VzdGFsdEV4dGVuc2lvbkhhbmRsZTsKIAorICAgIGVuY29kZXIgPDwgZGlhZ25vc3RpY3NF
eHRlbnNpb25IYW5kbGVzOwogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgZW5jb2RlciA8
PCBkaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXM7CiAgICAgZW5jb2RlciA8PCBkeW5hbWljTWFj
aEV4dGVuc2lvbkhhbmRsZXM7CiAgICAgZW5jb2RlciA8PCBkeW5hbWljSU9LaXRFeHRlbnNpb25I
YW5kbGVzOwogI2VuZGlmCkBAIC00MzgsNyArNDM4LDYgQEAKICAgICAgICAgcmV0dXJuIGZhbHNl
OwogICAgIHBhcmFtZXRlcnMubW9iaWxlR2VzdGFsdEV4dGVuc2lvbkhhbmRsZSA9IFdURk1vdmUo
Km1vYmlsZUdlc3RhbHRFeHRlbnNpb25IYW5kbGUpOwogCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlM
WSkKICAgICBPcHRpb25hbDxTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheT4gZGlhZ25vc3Rp
Y3NFeHRlbnNpb25IYW5kbGVzOwogICAgIGRlY29kZXIgPj4gZGlhZ25vc3RpY3NFeHRlbnNpb25I
YW5kbGVzOwogICAgIGlmICghZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGVzKQpAQCAtNDQ1LDYg
KzQ0NCw3IEBACiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBwYXJhbWV0ZXJzLmRpYWdub3N0
aWNzRXh0ZW5zaW9uSGFuZGxlcyA9IFdURk1vdmUoKmRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxl
cyk7CiAKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIE9wdGlvbmFsPFNhbmRib3hFeHRl
bnNpb246OkhhbmRsZUFycmF5PiBkeW5hbWljTWFjaEV4dGVuc2lvbkhhbmRsZXM7CiAgICAgZGVj
b2RlciA+PiBkeW5hbWljTWFjaEV4dGVuc2lvbkhhbmRsZXM7CiAgICAgaWYgKCFkeW5hbWljTWFj
aEV4dGVuc2lvbkhhbmRsZXMpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNz
Q3JlYXRpb25QYXJhbWV0ZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQv
V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiAyNjcwMTIpCisrKyBTb3Vy
Y2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHdvcmtpbmcg
Y29weSkKQEAgLTIwNiw4ICsyMDYsOCBAQAogICAgIE9wdGlvbmFsPFNhbmRib3hFeHRlbnNpb246
OkhhbmRsZT4gY29udGFpbmVyTWFuYWdlckV4dGVuc2lvbkhhbmRsZTsKICAgICBPcHRpb25hbDxT
YW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+IG1vYmlsZUdlc3RhbHRFeHRlbnNpb25IYW5kbGU7CiAK
KyAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheSBkaWFnbm9zdGljc0V4dGVuc2lvbkhh
bmRsZXM7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBTYW5kYm94RXh0ZW5zaW9uOjpI
YW5kbGVBcnJheSBkaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXM7CiAgICAgU2FuZGJveEV4dGVu
c2lvbjo6SGFuZGxlQXJyYXkgZHluYW1pY01hY2hFeHRlbnNpb25IYW5kbGVzOwogICAgIFNhbmRi
b3hFeHRlbnNpb246OkhhbmRsZUFycmF5IGR5bmFtaWNJT0tpdEV4dGVuc2lvbkhhbmRsZXM7CiAj
ZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29s
Q29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi
UHJvY2Vzc1Bvb2xDb2NvYS5tbQkocmV2aXNpb24gMjY3MDEyKQorKysgU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAt
MjAxLDEzICsyMDEsMTYgQEAKICNlbmRpZgogfQogCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkK
IHN0YXRpYyBib29sIGlzSW50ZXJuYWxJbnN0YWxsKCkKIHsKKyNpZiBQTEFURk9STShJT1NfRkFN
SUxZKQogICAgIHN0YXRpYyBib29sIGlzSW50ZXJuYWwgPSBNR0dldEJvb2xBbnN3ZXIoa01HUUFw
cGxlSW50ZXJuYWxJbnN0YWxsQ2FwYWJpbGl0eSk7CisjZWxzZQorICAgIHN0cnVjdCBzdGF0IHN0
OworICAgIHN0YXRpYyBib29sIGlzSW50ZXJuYWwgPSAhc3RhdCgiL0FwcGxlSW50ZXJuYWwiLCAm
c3QpOworI2VuZGlmCiAgICAgcmV0dXJuIGlzSW50ZXJuYWw7CiB9Ci0jZW5kaWYKIAogLy8gRklY
TUUoMjA3NzE2KTogVGhlIGZvbGxvd2luZyBzaG91bGQgYmUgcmVtb3ZlZCB3aGVuIHRoZSBHUFUg
cHJvY2VzcyBpcyBjb21wbGV0ZS4KIHN0YXRpYyBjb25zdCBWZWN0b3I8QVNDSUlMaXRlcmFsPiYg
bWVkaWFSZWxhdGVkTWFjaFNlcnZpY2VzKCkKQEAgLTI2MCwxNiArMjYzLDYgQEAKICAgICByZXR1
cm4gc2VydmljZXM7CiB9CiAKLXN0YXRpYyBjb25zdCBWZWN0b3I8QVNDSUlMaXRlcmFsPiYgZGlh
Z25vc3RpY1NlcnZpY2VzKCkKLXsKLSAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIHN0
YXRpYyBjb25zdCBhdXRvIHNlcnZpY2VzID0gbWFrZU5ldmVyRGVzdHJveWVkKFZlY3RvcjxBU0NJ
SUxpdGVyYWw+IHsKLSAgICAgICAgImNvbS5hcHBsZS5kaWFnbm9zdGljZCJfcywKLSAgICAgICAg
ImNvbS5hcHBsZS5vc2FuYWx5dGljcy5vc2FuYWx5dGljc2hlbHBlciJfcwotICAgIH0pOwotICAg
IHJldHVybiBzZXJ2aWNlczsKLX0KLQogc3RhdGljIGNvbnN0IFZlY3RvcjxBU0NJSUxpdGVyYWw+
JiBhZ3hDb21waWxlckNsYXNzZXMoKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CkBA
IC0yODcsNyArMjgwLDYgQEAKICAgICB9KTsKICAgICByZXR1cm4gaW9raXRDbGFzc2VzOwogfQot
CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPUykKQEAgLTMwMiw2ICsyOTQsMTkgQEAKIH0KICNl
bmRpZgogCitzdGF0aWMgY29uc3QgVmVjdG9yPEFTQ0lJTGl0ZXJhbD4mIGRpYWdub3N0aWNTZXJ2
aWNlcygpCit7CisgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKyAgICBzdGF0aWMgY29uc3Qg
YXV0byBzZXJ2aWNlcyA9IG1ha2VOZXZlckRlc3Ryb3llZChWZWN0b3I8QVNDSUlMaXRlcmFsPiB7
CisgICAgICAgICJjb20uYXBwbGUuZGlhZ25vc3RpY2QiX3MsCisjaWYgUExBVEZPUk0oSU9TX0ZB
TUlMWSkKKyAgICAgICAgImNvbS5hcHBsZS5vc2FuYWx5dGljcy5vc2FuYWx5dGljc2hlbHBlciJf
cworI2VuZGlmCisgICAgfSk7CisgICAgcmV0dXJuIHNlcnZpY2VzOworfQorCisKIHN0YXRpYyBi
b29sIHJlcXVpcmVzQ29udGFpbmVyTWFuYWdlckFjY2VzcygpCiB7CiAjaWYgUExBVEZPUk0oTUFD
KQpAQCAtNDIxLDE4ICs0MjYsMTYgQEAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIGlm
ICghV2ViQ29yZTo6SU9TQXBwbGljYXRpb246OmlzTW9iaWxlU2FmYXJpKCkpCiAgICAgICAgIHBh
cmFtZXRlcnMuZHluYW1pY01hY2hFeHRlbnNpb25IYW5kbGVzID0gU2FuZGJveEV4dGVuc2lvbjo6
Y3JlYXRlSGFuZGxlc0Zvck1hY2hMb29rdXAobm9uQnJvd3NlclNlcnZpY2VzKCksIFdURjo6bnVs
bG9wdCk7Ci0gICAgCi0gICAgaWYgKGlzSW50ZXJuYWxJbnN0YWxsKCkpCi0gICAgICAgIHBhcmFt
ZXRlcnMuZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGVzID0gU2FuZGJveEV4dGVuc2lvbjo6Y3Jl
YXRlSGFuZGxlc0Zvck1hY2hMb29rdXAoZGlhZ25vc3RpY1NlcnZpY2VzKCksIFdURjo6bnVsbG9w
dCwgU2FuZGJveEV4dGVuc2lvbjo6RmxhZ3M6Ok5vUmVwb3J0KTsKIAogICAgIGlmIChXZWJDb3Jl
OjpkZXZpY2VIYXNBR1hDb21waWxlclNlcnZpY2UoKSkKICAgICAgICAgcGFyYW1ldGVycy5keW5h
bWljSU9LaXRFeHRlbnNpb25IYW5kbGVzID0gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxl
c0ZvcklPS2l0Q2xhc3NFeHRlbnNpb25zKGFneENvbXBpbGVyQ2xhc3NlcygpLCBXVEY6Om51bGxv
cHQpOwogI2VuZGlmCi0gICAgCi0jaWYgUExBVEZPUk0oQ09DT0EpCisKKyAgICBpZiAoaXNJbnRl
cm5hbEluc3RhbGwoKSkKKyAgICAgICAgcGFyYW1ldGVycy5kaWFnbm9zdGljc0V4dGVuc2lvbkhh
bmRsZXMgPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVzRm9yTWFjaExvb2t1cChkaWFn
bm9zdGljU2VydmljZXMoKSwgV1RGOjpudWxsb3B0LCBTYW5kYm94RXh0ZW5zaW9uOjpGbGFnczo6
Tm9SZXBvcnQpOworCiAgICAgcGFyYW1ldGVycy5zeXN0ZW1IYXNCYXR0ZXJ5ID0gc3lzdGVtSGFz
QmF0dGVyeSgpOwogICAgIHBhcmFtZXRlcnMuc3lzdGVtSGFzQUMgPSBjYWNoZWRTeXN0ZW1IYXNB
QygpLnZhbHVlT3IodHJ1ZSk7Ci0jZW5kaWYKIAogICAgIGlmIChyZXF1aXJlc0NvbnRhaW5lck1h
bmFnZXJBY2Nlc3MoKSkgewogICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgaGFuZGxl
OwpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5t
bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vz
c0NvY29hLm1tCShyZXZpc2lvbiAyNjcwMTIpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
Y29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMTEsOCArMzExLDgg
QEAKICAgICBpZiAocGFyYW1ldGVycy5jb250YWluZXJNYW5hZ2VyRXh0ZW5zaW9uSGFuZGxlKQog
ICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkoKnBhcmFtZXRlcnMu
Y29udGFpbmVyTWFuYWdlckV4dGVuc2lvbkhhbmRsZSk7CiAgICAgCisgICAgU2FuZGJveEV4dGVu
c2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMuZGlhZ25vc3RpY3NFeHRlbnNpb25I
YW5kbGVzKTsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIFNhbmRib3hFeHRlbnNpb246
OmNvbnN1bWVQZXJtYW5lbnRseShwYXJhbWV0ZXJzLmRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxl
cyk7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMu
ZHluYW1pY01hY2hFeHRlbnNpb25IYW5kbGVzKTsKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25z
dW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5keW5hbWljSU9LaXRFeHRlbnNpb25IYW5kbGVzKTsK
ICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9j
ZXNzLnNiLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBw
bGUuV2ViUHJvY2Vzcy5zYi5pbgkocmV2aXNpb24gMjY3MDEyKQorKysgU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCSh3b3JraW5nIGNvcHkpCkBAIC05
OTMsNiArOTkzLDcgQEAKICAgICAgICAgICAgICJjb20uYXBwbGUuY2ZwcmVmc2QuYWdlbnQiCiAg
ICAgICAgICAgICAiY29tLmFwcGxlLmNmcHJlZnNkLmRhZW1vbiIKICAgICAgICAgICAgICJjb20u
YXBwbGUuY29udGFpbmVybWFuYWdlcmQiCisgICAgICAgICAgICAiY29tLmFwcGxlLmRpYWdub3N0
aWNkIgogICAgICAgICAgICAgImNvbS5hcHBsZS50Y2NkIgogICAgICAgICAgICAgImNvbS5hcHBs
ZS5CbHVldG9vdGhTZXJ2aWNlcyIKIAo=
</data>
<flag name="commit-queue"
          id="425081"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>409385</attachid>
            <date>2020-09-22 11:45:39 -0700</date>
            <delta_ts>2020-09-23 11:29:54 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>216834.patch</filename>
            <type>text/plain</type>
            <size>7497</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjc0MTcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA5LTIyICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIElzc3VlIHNhbmRi
b3ggZXh0ZW5zaW9uIGZvciB0aGUgZGlhZ25vc3RpYyBkYWVtb24KKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjgzNAorICAgICAgICA8cmRhcjovL3By
b2JsZW0vNTg0OTY4MzQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAg
ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6
CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6
CisgICAgICAgICogU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAg
ICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbToKKyAgICAgICAgKFdl
YktpdDo6aXNJbnRlcm5hbEluc3RhbGwpOgorICAgICAgICAoV2ViS2l0OjphZ3hDb21waWxlckNs
YXNzZXMpOgorICAgICAgICAoV2ViS2l0OjpkaWFnbm9zdGljU2VydmljZXMpOgorICAgICAgICAo
V2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW06CisgICAgICAgIChX
ZWJLaXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAg
ICAqIFdlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW46CisKIDIwMjAtMDktMjIg
IFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBh
IGRlZmF1bHQgcHJvbXB0IGZvciBnZXRVc2VyTWVkaWEKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hh
cmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj
ZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCShyZXZpc2lv
biAyNjcwMTIpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJh
bWV0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYyLDggKzE2Miw4IEBACiAgICAgZW5jb2Rl
ciA8PCBjb250YWluZXJNYW5hZ2VyRXh0ZW5zaW9uSGFuZGxlOwogICAgIGVuY29kZXIgPDwgbW9i
aWxlR2VzdGFsdEV4dGVuc2lvbkhhbmRsZTsKIAorICAgIGVuY29kZXIgPDwgZGlhZ25vc3RpY3NF
eHRlbnNpb25IYW5kbGVzOwogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgZW5jb2RlciA8
PCBkaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXM7CiAgICAgZW5jb2RlciA8PCBkeW5hbWljTWFj
aEV4dGVuc2lvbkhhbmRsZXM7CiAgICAgZW5jb2RlciA8PCBkeW5hbWljSU9LaXRFeHRlbnNpb25I
YW5kbGVzOwogI2VuZGlmCkBAIC00MzgsNyArNDM4LDYgQEAKICAgICAgICAgcmV0dXJuIGZhbHNl
OwogICAgIHBhcmFtZXRlcnMubW9iaWxlR2VzdGFsdEV4dGVuc2lvbkhhbmRsZSA9IFdURk1vdmUo
Km1vYmlsZUdlc3RhbHRFeHRlbnNpb25IYW5kbGUpOwogCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlM
WSkKICAgICBPcHRpb25hbDxTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheT4gZGlhZ25vc3Rp
Y3NFeHRlbnNpb25IYW5kbGVzOwogICAgIGRlY29kZXIgPj4gZGlhZ25vc3RpY3NFeHRlbnNpb25I
YW5kbGVzOwogICAgIGlmICghZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGVzKQpAQCAtNDQ1LDYg
KzQ0NCw3IEBACiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBwYXJhbWV0ZXJzLmRpYWdub3N0
aWNzRXh0ZW5zaW9uSGFuZGxlcyA9IFdURk1vdmUoKmRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxl
cyk7CiAKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIE9wdGlvbmFsPFNhbmRib3hFeHRl
bnNpb246OkhhbmRsZUFycmF5PiBkeW5hbWljTWFjaEV4dGVuc2lvbkhhbmRsZXM7CiAgICAgZGVj
b2RlciA+PiBkeW5hbWljTWFjaEV4dGVuc2lvbkhhbmRsZXM7CiAgICAgaWYgKCFkeW5hbWljTWFj
aEV4dGVuc2lvbkhhbmRsZXMpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNz
Q3JlYXRpb25QYXJhbWV0ZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQv
V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiAyNjcwMTIpCisrKyBTb3Vy
Y2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHdvcmtpbmcg
Y29weSkKQEAgLTIwNiw4ICsyMDYsOCBAQAogICAgIE9wdGlvbmFsPFNhbmRib3hFeHRlbnNpb246
OkhhbmRsZT4gY29udGFpbmVyTWFuYWdlckV4dGVuc2lvbkhhbmRsZTsKICAgICBPcHRpb25hbDxT
YW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+IG1vYmlsZUdlc3RhbHRFeHRlbnNpb25IYW5kbGU7CiAK
KyAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheSBkaWFnbm9zdGljc0V4dGVuc2lvbkhh
bmRsZXM7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBTYW5kYm94RXh0ZW5zaW9uOjpI
YW5kbGVBcnJheSBkaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXM7CiAgICAgU2FuZGJveEV4dGVu
c2lvbjo6SGFuZGxlQXJyYXkgZHluYW1pY01hY2hFeHRlbnNpb25IYW5kbGVzOwogICAgIFNhbmRi
b3hFeHRlbnNpb246OkhhbmRsZUFycmF5IGR5bmFtaWNJT0tpdEV4dGVuc2lvbkhhbmRsZXM7CiAj
ZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29s
Q29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi
UHJvY2Vzc1Bvb2xDb2NvYS5tbQkocmV2aXNpb24gMjY3MDEyKQorKysgU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAt
NjUsNiArNjUsNyBAQAogI2ltcG9ydCA8cGFsL2NvY29hL01lZGlhVG9vbGJveFNvZnRMaW5rLmg+
CiAjaW1wb3J0IDxwYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oPgogI2ltcG9ydCA8c3lzL3BhcmFt
Lmg+CisjaW1wb3J0IDxzeXMvc3RhdC5oPgogI2ltcG9ydCA8d3RmL0ZpbGVTeXN0ZW0uaD4KICNp
bXBvcnQgPHd0Zi9Qcm9jZXNzUHJpdmlsZWdlLmg+CiAjaW1wb3J0IDx3dGYvU29mdExpbmtpbmcu
aD4KQEAgLTIwMSwxMyArMjAyLDE2IEBACiAjZW5kaWYKIH0KIAotI2lmIFBMQVRGT1JNKElPU19G
QU1JTFkpCiBzdGF0aWMgYm9vbCBpc0ludGVybmFsSW5zdGFsbCgpCiB7CisjaWYgUExBVEZPUk0o
SU9TX0ZBTUlMWSkKICAgICBzdGF0aWMgYm9vbCBpc0ludGVybmFsID0gTUdHZXRCb29sQW5zd2Vy
KGtNR1FBcHBsZUludGVybmFsSW5zdGFsbENhcGFiaWxpdHkpOworI2Vsc2UKKyAgICBzdHJ1Y3Qg
c3RhdCBzdDsKKyAgICBzdGF0aWMgYm9vbCBpc0ludGVybmFsID0gIXN0YXQoIi9BcHBsZUludGVy
bmFsIiwgJnN0KTsKKyNlbmRpZgogICAgIHJldHVybiBpc0ludGVybmFsOwogfQotI2VuZGlmCiAK
IC8vIEZJWE1FKDIwNzcxNik6IFRoZSBmb2xsb3dpbmcgc2hvdWxkIGJlIHJlbW92ZWQgd2hlbiB0
aGUgR1BVIHByb2Nlc3MgaXMgY29tcGxldGUuCiBzdGF0aWMgY29uc3QgVmVjdG9yPEFTQ0lJTGl0
ZXJhbD4mIG1lZGlhUmVsYXRlZE1hY2hTZXJ2aWNlcygpCkBAIC0yNjAsMTYgKzI2NCw2IEBACiAg
ICAgcmV0dXJuIHNlcnZpY2VzOwogfQogCi1zdGF0aWMgY29uc3QgVmVjdG9yPEFTQ0lJTGl0ZXJh
bD4mIGRpYWdub3N0aWNTZXJ2aWNlcygpCi17Ci0gICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsK
LSAgICBzdGF0aWMgY29uc3QgYXV0byBzZXJ2aWNlcyA9IG1ha2VOZXZlckRlc3Ryb3llZChWZWN0
b3I8QVNDSUlMaXRlcmFsPiB7Ci0gICAgICAgICJjb20uYXBwbGUuZGlhZ25vc3RpY2QiX3MsCi0g
ICAgICAgICJjb20uYXBwbGUub3NhbmFseXRpY3Mub3NhbmFseXRpY3NoZWxwZXIiX3MKLSAgICB9
KTsKLSAgICByZXR1cm4gc2VydmljZXM7Ci19Ci0KIHN0YXRpYyBjb25zdCBWZWN0b3I8QVNDSUlM
aXRlcmFsPiYgYWd4Q29tcGlsZXJDbGFzc2VzKCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFk
KCkpOwpAQCAtMjg3LDcgKzI4MSw2IEBACiAgICAgfSk7CiAgICAgcmV0dXJuIGlva2l0Q2xhc3Nl
czsKIH0KLQogI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1MpCkBAIC0zMDIsNiArMjk1LDE5IEBA
CiB9CiAjZW5kaWYKIAorc3RhdGljIGNvbnN0IFZlY3RvcjxBU0NJSUxpdGVyYWw+JiBkaWFnbm9z
dGljU2VydmljZXMoKQoreworICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisgICAgc3RhdGlj
IGNvbnN0IGF1dG8gc2VydmljZXMgPSBtYWtlTmV2ZXJEZXN0cm95ZWQoVmVjdG9yPEFTQ0lJTGl0
ZXJhbD4geworICAgICAgICAiY29tLmFwcGxlLmRpYWdub3N0aWNkIl9zLAorI2lmIFBMQVRGT1JN
KElPU19GQU1JTFkpCisgICAgICAgICJjb20uYXBwbGUub3NhbmFseXRpY3Mub3NhbmFseXRpY3No
ZWxwZXIiX3MKKyNlbmRpZgorICAgIH0pOworICAgIHJldHVybiBzZXJ2aWNlczsKK30KKworCiBz
dGF0aWMgYm9vbCByZXF1aXJlc0NvbnRhaW5lck1hbmFnZXJBY2Nlc3MoKQogewogI2lmIFBMQVRG
T1JNKE1BQykKQEAgLTQyMSwxOCArNDI3LDE2IEBACiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkK
ICAgICBpZiAoIVdlYkNvcmU6OklPU0FwcGxpY2F0aW9uOjppc01vYmlsZVNhZmFyaSgpKQogICAg
ICAgICBwYXJhbWV0ZXJzLmR5bmFtaWNNYWNoRXh0ZW5zaW9uSGFuZGxlcyA9IFNhbmRib3hFeHRl
bnNpb246OmNyZWF0ZUhhbmRsZXNGb3JNYWNoTG9va3VwKG5vbkJyb3dzZXJTZXJ2aWNlcygpLCBX
VEY6Om51bGxvcHQpOwotICAgIAotICAgIGlmIChpc0ludGVybmFsSW5zdGFsbCgpKQotICAgICAg
ICBwYXJhbWV0ZXJzLmRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlcyA9IFNhbmRib3hFeHRlbnNp
b246OmNyZWF0ZUhhbmRsZXNGb3JNYWNoTG9va3VwKGRpYWdub3N0aWNTZXJ2aWNlcygpLCBXVEY6
Om51bGxvcHQsIFNhbmRib3hFeHRlbnNpb246OkZsYWdzOjpOb1JlcG9ydCk7CiAKICAgICBpZiAo
V2ViQ29yZTo6ZGV2aWNlSGFzQUdYQ29tcGlsZXJTZXJ2aWNlKCkpCiAgICAgICAgIHBhcmFtZXRl
cnMuZHluYW1pY0lPS2l0RXh0ZW5zaW9uSGFuZGxlcyA9IFNhbmRib3hFeHRlbnNpb246OmNyZWF0
ZUhhbmRsZXNGb3JJT0tpdENsYXNzRXh0ZW5zaW9ucyhhZ3hDb21waWxlckNsYXNzZXMoKSwgV1RG
OjpudWxsb3B0KTsKICNlbmRpZgotICAgIAotI2lmIFBMQVRGT1JNKENPQ09BKQorCisgICAgaWYg
KGlzSW50ZXJuYWxJbnN0YWxsKCkpCisgICAgICAgIHBhcmFtZXRlcnMuZGlhZ25vc3RpY3NFeHRl
bnNpb25IYW5kbGVzID0gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlc0Zvck1hY2hMb29r
dXAoZGlhZ25vc3RpY1NlcnZpY2VzKCksIFdURjo6bnVsbG9wdCwgU2FuZGJveEV4dGVuc2lvbjo6
RmxhZ3M6Ok5vUmVwb3J0KTsKKwogICAgIHBhcmFtZXRlcnMuc3lzdGVtSGFzQmF0dGVyeSA9IHN5
c3RlbUhhc0JhdHRlcnkoKTsKICAgICBwYXJhbWV0ZXJzLnN5c3RlbUhhc0FDID0gY2FjaGVkU3lz
dGVtSGFzQUMoKS52YWx1ZU9yKHRydWUpOwotI2VuZGlmCiAKICAgICBpZiAocmVxdWlyZXNDb250
YWluZXJNYW5hZ2VyQWNjZXNzKCkpIHsKICAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxl
IGhhbmRsZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNz
Q29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dl
YlByb2Nlc3NDb2NvYS5tbQkocmV2aXNpb24gMjY3MDEyKQorKysgU291cmNlL1dlYktpdC9XZWJQ
cm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzExLDgg
KzMxMSw4IEBACiAgICAgaWYgKHBhcmFtZXRlcnMuY29udGFpbmVyTWFuYWdlckV4dGVuc2lvbkhh
bmRsZSkKICAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KCpwYXJh
bWV0ZXJzLmNvbnRhaW5lck1hbmFnZXJFeHRlbnNpb25IYW5kbGUpOwogICAgIAorICAgIFNhbmRi
b3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJhbWV0ZXJzLmRpYWdub3N0aWNzRXh0
ZW5zaW9uSGFuZGxlcyk7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBTYW5kYm94RXh0
ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5kaWFnbm9zdGljc0V4dGVuc2lv
bkhhbmRsZXMpOwogICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJh
bWV0ZXJzLmR5bmFtaWNNYWNoRXh0ZW5zaW9uSGFuZGxlcyk7CiAgICAgU2FuZGJveEV4dGVuc2lv
bjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMuZHluYW1pY0lPS2l0RXh0ZW5zaW9uSGFu
ZGxlcyk7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUu
V2ViUHJvY2Vzcy5zYi5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
Y29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4JKHJldmlzaW9uIDI2NzAxMikKKysrIFNvdXJjZS9X
ZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vzcy5zYi5pbgkod29ya2luZyBjb3B5
KQpAQCAtOTkzLDYgKzk5Myw3IEBACiAgICAgICAgICAgICAiY29tLmFwcGxlLmNmcHJlZnNkLmFn
ZW50IgogICAgICAgICAgICAgImNvbS5hcHBsZS5jZnByZWZzZC5kYWVtb24iCiAgICAgICAgICAg
ICAiY29tLmFwcGxlLmNvbnRhaW5lcm1hbmFnZXJkIgorICAgICAgICAgICAgImNvbS5hcHBsZS5k
aWFnbm9zdGljZCIKICAgICAgICAgICAgICJjb20uYXBwbGUudGNjZCIKICAgICAgICAgICAgICJj
b20uYXBwbGUuQmx1ZXRvb3RoU2VydmljZXMiCiAK
</data>
<flag name="review"
          id="425088"
          type_id="1"
          status="+"
          setter="bfulgham"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>409488</attachid>
            <date>2020-09-23 11:40:19 -0700</date>
            <delta_ts>2020-09-23 11:45:21 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>216834.patch</filename>
            <type>text/plain</type>
            <size>9552</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjc0MTcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA5LTIzICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIElzc3VlIHNhbmRi
b3ggZXh0ZW5zaW9uIGZvciB0aGUgZGlhZ25vc3RpYyBkYWVtb24KKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjgzNAorICAgICAgICA8cmRhcjovL3By
b2JsZW0vNTg0OTY4MzQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKwor
ICAgICAgICAqIFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAg
ICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlIGNvbnN0KToK
KyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToK
KyAgICAgICAgKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAg
ICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tOgorICAgICAgICAoV2Vi
S2l0Ojppc0ludGVybmFsSW5zdGFsbCk6CisgICAgICAgIChXZWJLaXQ6OmFneENvbXBpbGVyQ2xh
c3Nlcyk6CisgICAgICAgIChXZWJLaXQ6OmRpYWdub3N0aWNTZXJ2aWNlcyk6CisgICAgICAgIChX
ZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAg
ICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdl
YktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAg
ICogV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vzcy5zYi5pbjoKKwogMjAyMC0wOS0yMiAg
WW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IGEg
ZGVmYXVsdCBwcm9tcHQgZm9yIGdldFVzZXJNZWRpYQpJbmRleDogU291cmNlL1dlYktpdC9TaGFy
ZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9u
IDI2NzAxMikKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFt
ZXRlcnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjIsOCArMTYyLDggQEAKICAgICBlbmNvZGVy
IDw8IGNvbnRhaW5lck1hbmFnZXJFeHRlbnNpb25IYW5kbGU7CiAgICAgZW5jb2RlciA8PCBtb2Jp
bGVHZXN0YWx0RXh0ZW5zaW9uSGFuZGxlOwogCisgICAgZW5jb2RlciA8PCBkaWFnbm9zdGljc0V4
dGVuc2lvbkhhbmRsZXM7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBlbmNvZGVyIDw8
IGRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlczsKICAgICBlbmNvZGVyIDw8IGR5bmFtaWNNYWNo
RXh0ZW5zaW9uSGFuZGxlczsKICAgICBlbmNvZGVyIDw8IGR5bmFtaWNJT0tpdEV4dGVuc2lvbkhh
bmRsZXM7CiAjZW5kaWYKQEAgLTQzOCw3ICs0MzgsNiBAQAogICAgICAgICByZXR1cm4gZmFsc2U7
CiAgICAgcGFyYW1ldGVycy5tb2JpbGVHZXN0YWx0RXh0ZW5zaW9uSGFuZGxlID0gV1RGTW92ZSgq
bW9iaWxlR2VzdGFsdEV4dGVuc2lvbkhhbmRsZSk7CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZ
KQogICAgIE9wdGlvbmFsPFNhbmRib3hFeHRlbnNpb246OkhhbmRsZUFycmF5PiBkaWFnbm9zdGlj
c0V4dGVuc2lvbkhhbmRsZXM7CiAgICAgZGVjb2RlciA+PiBkaWFnbm9zdGljc0V4dGVuc2lvbkhh
bmRsZXM7CiAgICAgaWYgKCFkaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXMpCkBAIC00NDUsNiAr
NDQ0LDcgQEAKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHBhcmFtZXRlcnMuZGlhZ25vc3Rp
Y3NFeHRlbnNpb25IYW5kbGVzID0gV1RGTW92ZSgqZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGVz
KTsKIAorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVu
c2lvbjo6SGFuZGxlQXJyYXk+IGR5bmFtaWNNYWNoRXh0ZW5zaW9uSGFuZGxlczsKICAgICBkZWNv
ZGVyID4+IGR5bmFtaWNNYWNoRXh0ZW5zaW9uSGFuZGxlczsKICAgICBpZiAoIWR5bmFtaWNNYWNo
RXh0ZW5zaW9uSGFuZGxlcykKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3ND
cmVhdGlvblBhcmFtZXRlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9X
ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHJldmlzaW9uIDI2NzAxMikKKysrIFNvdXJj
ZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAkod29ya2luZyBj
b3B5KQpAQCAtMjA2LDggKzIwNiw4IEBACiAgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6
SGFuZGxlPiBjb250YWluZXJNYW5hZ2VyRXh0ZW5zaW9uSGFuZGxlOwogICAgIE9wdGlvbmFsPFNh
bmRib3hFeHRlbnNpb246OkhhbmRsZT4gbW9iaWxlR2VzdGFsdEV4dGVuc2lvbkhhbmRsZTsKIAor
ICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZUFycmF5IGRpYWdub3N0aWNzRXh0ZW5zaW9uSGFu
ZGxlczsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIFNhbmRib3hFeHRlbnNpb246Okhh
bmRsZUFycmF5IGRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlczsKICAgICBTYW5kYm94RXh0ZW5z
aW9uOjpIYW5kbGVBcnJheSBkeW5hbWljTWFjaEV4dGVuc2lvbkhhbmRsZXM7CiAgICAgU2FuZGJv
eEV4dGVuc2lvbjo6SGFuZGxlQXJyYXkgZHluYW1pY0lPS2l0RXh0ZW5zaW9uSGFuZGxlczsKICNl
bmRpZgpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xD
b2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQ
cm9jZXNzUG9vbENvY29hLm1tCShyZXZpc2lvbiAyNjcwMTIpCisrKyBTb3VyY2UvV2ViS2l0L1VJ
UHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0y
MDEsMTMgKzIwMSwxNSBAQAogI2VuZGlmCiB9CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQog
c3RhdGljIGJvb2wgaXNJbnRlcm5hbEluc3RhbGwoKQogeworI2lmIFBMQVRGT1JNKElPU19GQU1J
TFkpCiAgICAgc3RhdGljIGJvb2wgaXNJbnRlcm5hbCA9IE1HR2V0Qm9vbEFuc3dlcihrTUdRQXBw
bGVJbnRlcm5hbEluc3RhbGxDYXBhYmlsaXR5KTsKKyNlbHNlCisgICAgc3RhdGljIGJvb2wgaXNJ
bnRlcm5hbCA9IEZpbGVTeXN0ZW06OmZpbGVJc0RpcmVjdG9yeSgiL0FwcGxlSW50ZXJuYWwiLCBG
aWxlU3lzdGVtOjpTaG91bGRGb2xsb3dTeW1ib2xpY0xpbmtzOjpObyk7CisjZW5kaWYKICAgICBy
ZXR1cm4gaXNJbnRlcm5hbDsKIH0KLSNlbmRpZgogCiAvLyBGSVhNRSgyMDc3MTYpOiBUaGUgZm9s
bG93aW5nIHNob3VsZCBiZSByZW1vdmVkIHdoZW4gdGhlIEdQVSBwcm9jZXNzIGlzIGNvbXBsZXRl
Lgogc3RhdGljIGNvbnN0IFZlY3RvcjxBU0NJSUxpdGVyYWw+JiBtZWRpYVJlbGF0ZWRNYWNoU2Vy
dmljZXMoKQpAQCAtMjYwLDE2ICsyNjIsNiBAQAogICAgIHJldHVybiBzZXJ2aWNlczsKIH0KIAot
c3RhdGljIGNvbnN0IFZlY3RvcjxBU0NJSUxpdGVyYWw+JiBkaWFnbm9zdGljU2VydmljZXMoKQot
ewotICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgc3RhdGljIGNvbnN0IGF1dG8gc2Vy
dmljZXMgPSBtYWtlTmV2ZXJEZXN0cm95ZWQoVmVjdG9yPEFTQ0lJTGl0ZXJhbD4gewotICAgICAg
ICAiY29tLmFwcGxlLmRpYWdub3N0aWNkIl9zLAotICAgICAgICAiY29tLmFwcGxlLm9zYW5hbHl0
aWNzLm9zYW5hbHl0aWNzaGVscGVyIl9zCi0gICAgfSk7Ci0gICAgcmV0dXJuIHNlcnZpY2VzOwot
fQotCiBzdGF0aWMgY29uc3QgVmVjdG9yPEFTQ0lJTGl0ZXJhbD4mIGFneENvbXBpbGVyQ2xhc3Nl
cygpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKQEAgLTI4Nyw3ICsyNzksNiBAQAog
ICAgIH0pOwogICAgIHJldHVybiBpb2tpdENsYXNzZXM7CiB9Ci0KICNlbmRpZgogCiAjaWYgUExB
VEZPUk0oSU9TKQpAQCAtMzAyLDYgKzI5MywxOSBAQAogfQogI2VuZGlmCiAKK3N0YXRpYyBjb25z
dCBWZWN0b3I8QVNDSUlMaXRlcmFsPiYgZGlhZ25vc3RpY1NlcnZpY2VzKCkKK3sKKyAgICBBU1NF
UlQoaXNNYWluVGhyZWFkKCkpOworICAgIHN0YXRpYyBjb25zdCBhdXRvIHNlcnZpY2VzID0gbWFr
ZU5ldmVyRGVzdHJveWVkKFZlY3RvcjxBU0NJSUxpdGVyYWw+IHsKKyAgICAgICAgImNvbS5hcHBs
ZS5kaWFnbm9zdGljZCJfcywKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgICAgICAiY29t
LmFwcGxlLm9zYW5hbHl0aWNzLm9zYW5hbHl0aWNzaGVscGVyIl9zCisjZW5kaWYKKyAgICB9KTsK
KyAgICByZXR1cm4gc2VydmljZXM7Cit9CisKKwogc3RhdGljIGJvb2wgcmVxdWlyZXNDb250YWlu
ZXJNYW5hZ2VyQWNjZXNzKCkKIHsKICNpZiBQTEFURk9STShNQUMpCkBAIC00MjEsMTggKzQyNSwx
NiBAQAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgaWYgKCFXZWJDb3JlOjpJT1NBcHBs
aWNhdGlvbjo6aXNNb2JpbGVTYWZhcmkoKSkKICAgICAgICAgcGFyYW1ldGVycy5keW5hbWljTWFj
aEV4dGVuc2lvbkhhbmRsZXMgPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVzRm9yTWFj
aExvb2t1cChub25Ccm93c2VyU2VydmljZXMoKSwgV1RGOjpudWxsb3B0KTsKLSAgICAKLSAgICBp
ZiAoaXNJbnRlcm5hbEluc3RhbGwoKSkKLSAgICAgICAgcGFyYW1ldGVycy5kaWFnbm9zdGljc0V4
dGVuc2lvbkhhbmRsZXMgPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVzRm9yTWFjaExv
b2t1cChkaWFnbm9zdGljU2VydmljZXMoKSwgV1RGOjpudWxsb3B0LCBTYW5kYm94RXh0ZW5zaW9u
OjpGbGFnczo6Tm9SZXBvcnQpOwogCiAgICAgaWYgKFdlYkNvcmU6OmRldmljZUhhc0FHWENvbXBp
bGVyU2VydmljZSgpKQogICAgICAgICBwYXJhbWV0ZXJzLmR5bmFtaWNJT0tpdEV4dGVuc2lvbkhh
bmRsZXMgPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVzRm9ySU9LaXRDbGFzc0V4dGVu
c2lvbnMoYWd4Q29tcGlsZXJDbGFzc2VzKCksIFdURjo6bnVsbG9wdCk7CiAjZW5kaWYKLSAgICAK
LSNpZiBQTEFURk9STShDT0NPQSkKKworICAgIGlmIChpc0ludGVybmFsSW5zdGFsbCgpKQorICAg
ICAgICBwYXJhbWV0ZXJzLmRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlcyA9IFNhbmRib3hFeHRl
bnNpb246OmNyZWF0ZUhhbmRsZXNGb3JNYWNoTG9va3VwKGRpYWdub3N0aWNTZXJ2aWNlcygpLCBX
VEY6Om51bGxvcHQsIFNhbmRib3hFeHRlbnNpb246OkZsYWdzOjpOb1JlcG9ydCk7CisKICAgICBw
YXJhbWV0ZXJzLnN5c3RlbUhhc0JhdHRlcnkgPSBzeXN0ZW1IYXNCYXR0ZXJ5KCk7CiAgICAgcGFy
YW1ldGVycy5zeXN0ZW1IYXNBQyA9IGNhY2hlZFN5c3RlbUhhc0FDKCkudmFsdWVPcih0cnVlKTsK
LSNlbmRpZgogCiAgICAgaWYgKHJlcXVpcmVzQ29udGFpbmVyTWFuYWdlckFjY2VzcygpKSB7CiAg
ICAgICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBoYW5kbGU7CkluZGV4OiBTb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9u
IDI2NzAxMikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29j
b2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTMxMSw4ICszMTEsOCBAQAogICAgIGlmIChwYXJhbWV0
ZXJzLmNvbnRhaW5lck1hbmFnZXJFeHRlbnNpb25IYW5kbGUpCiAgICAgICAgIFNhbmRib3hFeHRl
bnNpb246OmNvbnN1bWVQZXJtYW5lbnRseSgqcGFyYW1ldGVycy5jb250YWluZXJNYW5hZ2VyRXh0
ZW5zaW9uSGFuZGxlKTsKICAgICAKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFu
ZW50bHkocGFyYW1ldGVycy5kaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXMpOwogI2lmIFBMQVRG
T1JNKElPU19GQU1JTFkpCi0gICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5
KHBhcmFtZXRlcnMuZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGVzKTsKICAgICBTYW5kYm94RXh0
ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5keW5hbWljTWFjaEV4dGVuc2lv
bkhhbmRsZXMpOwogICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJh
bWV0ZXJzLmR5bmFtaWNJT0tpdEV4dGVuc2lvbkhhbmRsZXMpOwogI2VuZGlmCkluZGV4OiBTb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4KPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmlu
CShyZXZpc2lvbiAyNjc0NzEpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxl
LldlYlByb2Nlc3Muc2IuaW4JKHdvcmtpbmcgY29weSkKQEAgLTQ1NCw3ICs0NTQsMTEgQEAKICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAiZGlzcGxheS1zY2FsZSIpKSkpCiAKIChkZW55IG1h
Y2gtbG9va3VwICh4cGMtc2VydmljZS1uYW1lLXByZWZpeCAiIikpCisKIChhbGxvdyBtYWNoLWxv
b2t1cAorI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwCisgICAg
KHdpdGggcmVwb3J0KSAod2l0aCB0ZWxlbWV0cnktYmFja3RyYWNlKQorI2VuZGlmCiAgICAgKHhw
Yy1zZXJ2aWNlLW5hbWUgImNvbS5hcHBsZS5QZXJmb3JtYW5jZUFuYWx5c2lzLmFuaW1hdGlvbnBl
cmZkIikKICAgICAoeHBjLXNlcnZpY2UtbmFtZSAiY29tLmFwcGxlLmF1ZGlvLlNhbmRib3hIZWxw
ZXIiKQogICAgICh4cGMtc2VydmljZS1uYW1lICJjb20uYXBwbGUuaGlzZXJ2aWNlcy14cGNzZXJ2
aWNlIikKQEAgLTcxMyw2ICs3MTcsOSBAQAogCiA7OyBTdGlsbCBhY3RpdmVseSBpbiB1c2UKIChh
bGxvdyBtYWNoLWxvb2t1cAorI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0g
MTEwMDAwCisgICAgKHdpdGggcmVwb3J0KSAod2l0aCB0ZWxlbWV0cnktYmFja3RyYWNlKQorI2Vu
ZGlmCiAgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuY29yZXNlcnZpY2VzLmxhdW5jaHNlcnZp
Y2VzZCIpCiAgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuZGlhZ25vc3RpY2QiKQogICAgIChn
bG9iYWwtbmFtZSAiY29tLmFwcGxlLmljb25zZXJ2aWNlcyIpCkBAIC03MjMsOCArNzMwLDggQEAK
ICkKIAogKGFsbG93IG1hY2gtbG9va3VwCi0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFV
SVJFRCA+PSAxMDE1MDAKLSAgICAod2l0aCByZXBvcnQpICh3aXRoIHRlbGVtZXRyeSkKKyNpZiBf
X01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDExMDAwMAorICAgICh3aXRoIHJlcG9y
dCkgKHdpdGggdGVsZW1ldHJ5LWJhY2t0cmFjZSkKICNlbmRpZgogICAgIChnbG9iYWwtbmFtZSAi
Y29tLmFwcGxlLmF3ZGQiKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmNvb2tpZWQiKQpA
QCAtNzM2LDE1ICs3NDMsOCBAQAogI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQg
PCAxMDE0MDAKICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5Gb250T2JqZWN0c1NlcnZl
ciIpCiAjZW5kaWYKLSAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5TeXN0ZW1Db25maWd1
cmF0aW9uLmNvbmZpZ2QiKQotICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmFuYWx5dGlj
c2QiKQotICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmFzc2VydGlvbmQucHJvY2Vzc2Fz
c2VydGlvbmNvbm5lY3Rpb24iKQotICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmF1ZGlv
LlN5c3RlbVNvdW5kU2VydmVyLU9TWCIpCi0gICAgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUu
YXVkaW8uYXVkaW9oYWxkIikKLSAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5mb250cyIp
CiAgICAgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUubG9nZCIpCiAgICAgICAgKGdsb2JhbC1u
YW1lICJjb20uYXBwbGUubG9nZC5ldmVudHMiKQotICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFw
cGxlLmxza2RkIikgOzsgPHJkYXI6Ly9wcm9ibGVtLzQ5MTIzODU1PgogI2lmIF9fTUFDX09TX1hf
VkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxNDAwIHx8IFBMQVRGT1JNKE1BQ0NBVEFMWVNUKQog
ICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLkNBUmVuZGVyU2VydmVyIikgOyBOZWVkZWQg
Zm9yIFtDQUNvbnRleHQgcmVtb3RlQ29udGV4dFdpdGhPcHRpb25zXQogI2Vsc2UKQEAgLTc1Myw5
ICs3NTMsMTYgQEAKICkKIAogKGFsbG93IG1hY2gtbG9va3VwCi0jaWYgX19NQUNfT1NfWF9WRVJT
SU9OX01JTl9SRVFVSVJFRCA+PSAxMDE1MDAKLSAgICAod2l0aCByZXBvcnQpICh3aXRoIHRlbGVt
ZXRyeSkKKyNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDExMDAwMAorICAg
ICh3aXRoIHJlcG9ydCkgKHdpdGggdGVsZW1ldHJ5LWJhY2t0cmFjZSkKICNlbmRpZgorICAgIChn
bG9iYWwtbmFtZSAiY29tLmFwcGxlLlN5c3RlbUNvbmZpZ3VyYXRpb24uY29uZmlnZCIpCisgICAg
KGdsb2JhbC1uYW1lICJjb20uYXBwbGUuYW5hbHl0aWNzZCIpCisgICAgKGdsb2JhbC1uYW1lICJj
b20uYXBwbGUuYXNzZXJ0aW9uZC5wcm9jZXNzYXNzZXJ0aW9uY29ubmVjdGlvbiIpCisgICAgKGds
b2JhbC1uYW1lICJjb20uYXBwbGUuYXVkaW8uU3lzdGVtU291bmRTZXJ2ZXItT1NYIikKKyAgICAo
Z2xvYmFsLW5hbWUgImNvbS5hcHBsZS5hdWRpby5hdWRpb2hhbGQiKQorICAgIChnbG9iYWwtbmFt
ZSAiY29tLmFwcGxlLmZvbnRzIikKKyAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5sc2tkZCIp
IDs7IDxyZGFyOi8vcHJvYmxlbS80OTEyMzg1NT4KICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBs
ZS5Qb3dlck1hbmFnZW1lbnQuY29udHJvbCIpCiApCiAK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>409489</attachid>
            <date>2020-09-23 11:45:42 -0700</date>
            <delta_ts>2020-09-23 12:52:09 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>216834.patch</filename>
            <type>text/plain</type>
            <size>7302</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjc0MTcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA5LTIzICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIElzc3VlIHNhbmRi
b3ggZXh0ZW5zaW9uIGZvciB0aGUgZGlhZ25vc3RpYyBkYWVtb24KKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjgzNAorICAgICAgICA8cmRhcjovL3By
b2JsZW0vNTg0OTY4MzQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKwor
ICAgICAgICAqIFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAg
ICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlIGNvbnN0KToK
KyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToK
KyAgICAgICAgKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAg
ICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tOgorICAgICAgICAoV2Vi
S2l0Ojppc0ludGVybmFsSW5zdGFsbCk6CisgICAgICAgIChXZWJLaXQ6OmFneENvbXBpbGVyQ2xh
c3Nlcyk6CisgICAgICAgIChXZWJLaXQ6OmRpYWdub3N0aWNTZXJ2aWNlcyk6CisgICAgICAgIChX
ZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAg
ICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdl
YktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAg
ICogV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vzcy5zYi5pbjoKKwogMjAyMC0wOS0yMiAg
WW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IGEg
ZGVmYXVsdCBwcm9tcHQgZm9yIGdldFVzZXJNZWRpYQpJbmRleDogU291cmNlL1dlYktpdC9TaGFy
ZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9u
IDI2NzAxMikKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFt
ZXRlcnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjIsOCArMTYyLDggQEAKICAgICBlbmNvZGVy
IDw8IGNvbnRhaW5lck1hbmFnZXJFeHRlbnNpb25IYW5kbGU7CiAgICAgZW5jb2RlciA8PCBtb2Jp
bGVHZXN0YWx0RXh0ZW5zaW9uSGFuZGxlOwogCisgICAgZW5jb2RlciA8PCBkaWFnbm9zdGljc0V4
dGVuc2lvbkhhbmRsZXM7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBlbmNvZGVyIDw8
IGRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlczsKICAgICBlbmNvZGVyIDw8IGR5bmFtaWNNYWNo
RXh0ZW5zaW9uSGFuZGxlczsKICAgICBlbmNvZGVyIDw8IGR5bmFtaWNJT0tpdEV4dGVuc2lvbkhh
bmRsZXM7CiAjZW5kaWYKQEAgLTQzOCw3ICs0MzgsNiBAQAogICAgICAgICByZXR1cm4gZmFsc2U7
CiAgICAgcGFyYW1ldGVycy5tb2JpbGVHZXN0YWx0RXh0ZW5zaW9uSGFuZGxlID0gV1RGTW92ZSgq
bW9iaWxlR2VzdGFsdEV4dGVuc2lvbkhhbmRsZSk7CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZ
KQogICAgIE9wdGlvbmFsPFNhbmRib3hFeHRlbnNpb246OkhhbmRsZUFycmF5PiBkaWFnbm9zdGlj
c0V4dGVuc2lvbkhhbmRsZXM7CiAgICAgZGVjb2RlciA+PiBkaWFnbm9zdGljc0V4dGVuc2lvbkhh
bmRsZXM7CiAgICAgaWYgKCFkaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXMpCkBAIC00NDUsNiAr
NDQ0LDcgQEAKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHBhcmFtZXRlcnMuZGlhZ25vc3Rp
Y3NFeHRlbnNpb25IYW5kbGVzID0gV1RGTW92ZSgqZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGVz
KTsKIAorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVu
c2lvbjo6SGFuZGxlQXJyYXk+IGR5bmFtaWNNYWNoRXh0ZW5zaW9uSGFuZGxlczsKICAgICBkZWNv
ZGVyID4+IGR5bmFtaWNNYWNoRXh0ZW5zaW9uSGFuZGxlczsKICAgICBpZiAoIWR5bmFtaWNNYWNo
RXh0ZW5zaW9uSGFuZGxlcykKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3ND
cmVhdGlvblBhcmFtZXRlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9X
ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHJldmlzaW9uIDI2NzAxMikKKysrIFNvdXJj
ZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAkod29ya2luZyBj
b3B5KQpAQCAtMjA2LDggKzIwNiw4IEBACiAgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6
SGFuZGxlPiBjb250YWluZXJNYW5hZ2VyRXh0ZW5zaW9uSGFuZGxlOwogICAgIE9wdGlvbmFsPFNh
bmRib3hFeHRlbnNpb246OkhhbmRsZT4gbW9iaWxlR2VzdGFsdEV4dGVuc2lvbkhhbmRsZTsKIAor
ICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZUFycmF5IGRpYWdub3N0aWNzRXh0ZW5zaW9uSGFu
ZGxlczsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIFNhbmRib3hFeHRlbnNpb246Okhh
bmRsZUFycmF5IGRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlczsKICAgICBTYW5kYm94RXh0ZW5z
aW9uOjpIYW5kbGVBcnJheSBkeW5hbWljTWFjaEV4dGVuc2lvbkhhbmRsZXM7CiAgICAgU2FuZGJv
eEV4dGVuc2lvbjo6SGFuZGxlQXJyYXkgZHluYW1pY0lPS2l0RXh0ZW5zaW9uSGFuZGxlczsKICNl
bmRpZgpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xD
b2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQ
cm9jZXNzUG9vbENvY29hLm1tCShyZXZpc2lvbiAyNjcwMTIpCisrKyBTb3VyY2UvV2ViS2l0L1VJ
UHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0y
MDEsMTMgKzIwMSwxNSBAQAogI2VuZGlmCiB9CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQog
c3RhdGljIGJvb2wgaXNJbnRlcm5hbEluc3RhbGwoKQogeworI2lmIFBMQVRGT1JNKElPU19GQU1J
TFkpCiAgICAgc3RhdGljIGJvb2wgaXNJbnRlcm5hbCA9IE1HR2V0Qm9vbEFuc3dlcihrTUdRQXBw
bGVJbnRlcm5hbEluc3RhbGxDYXBhYmlsaXR5KTsKKyNlbHNlCisgICAgc3RhdGljIGJvb2wgaXNJ
bnRlcm5hbCA9IEZpbGVTeXN0ZW06OmZpbGVJc0RpcmVjdG9yeSgiL0FwcGxlSW50ZXJuYWwiLCBG
aWxlU3lzdGVtOjpTaG91bGRGb2xsb3dTeW1ib2xpY0xpbmtzOjpObyk7CisjZW5kaWYKICAgICBy
ZXR1cm4gaXNJbnRlcm5hbDsKIH0KLSNlbmRpZgogCiAvLyBGSVhNRSgyMDc3MTYpOiBUaGUgZm9s
bG93aW5nIHNob3VsZCBiZSByZW1vdmVkIHdoZW4gdGhlIEdQVSBwcm9jZXNzIGlzIGNvbXBsZXRl
Lgogc3RhdGljIGNvbnN0IFZlY3RvcjxBU0NJSUxpdGVyYWw+JiBtZWRpYVJlbGF0ZWRNYWNoU2Vy
dmljZXMoKQpAQCAtMjYwLDE2ICsyNjIsNiBAQAogICAgIHJldHVybiBzZXJ2aWNlczsKIH0KIAot
c3RhdGljIGNvbnN0IFZlY3RvcjxBU0NJSUxpdGVyYWw+JiBkaWFnbm9zdGljU2VydmljZXMoKQot
ewotICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgc3RhdGljIGNvbnN0IGF1dG8gc2Vy
dmljZXMgPSBtYWtlTmV2ZXJEZXN0cm95ZWQoVmVjdG9yPEFTQ0lJTGl0ZXJhbD4gewotICAgICAg
ICAiY29tLmFwcGxlLmRpYWdub3N0aWNkIl9zLAotICAgICAgICAiY29tLmFwcGxlLm9zYW5hbHl0
aWNzLm9zYW5hbHl0aWNzaGVscGVyIl9zCi0gICAgfSk7Ci0gICAgcmV0dXJuIHNlcnZpY2VzOwot
fQotCiBzdGF0aWMgY29uc3QgVmVjdG9yPEFTQ0lJTGl0ZXJhbD4mIGFneENvbXBpbGVyQ2xhc3Nl
cygpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKQEAgLTI4Nyw3ICsyNzksNiBAQAog
ICAgIH0pOwogICAgIHJldHVybiBpb2tpdENsYXNzZXM7CiB9Ci0KICNlbmRpZgogCiAjaWYgUExB
VEZPUk0oSU9TKQpAQCAtMzAyLDYgKzI5MywxOSBAQAogfQogI2VuZGlmCiAKK3N0YXRpYyBjb25z
dCBWZWN0b3I8QVNDSUlMaXRlcmFsPiYgZGlhZ25vc3RpY1NlcnZpY2VzKCkKK3sKKyAgICBBU1NF
UlQoaXNNYWluVGhyZWFkKCkpOworICAgIHN0YXRpYyBjb25zdCBhdXRvIHNlcnZpY2VzID0gbWFr
ZU5ldmVyRGVzdHJveWVkKFZlY3RvcjxBU0NJSUxpdGVyYWw+IHsKKyAgICAgICAgImNvbS5hcHBs
ZS5kaWFnbm9zdGljZCJfcywKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgICAgICAiY29t
LmFwcGxlLm9zYW5hbHl0aWNzLm9zYW5hbHl0aWNzaGVscGVyIl9zCisjZW5kaWYKKyAgICB9KTsK
KyAgICByZXR1cm4gc2VydmljZXM7Cit9CisKKwogc3RhdGljIGJvb2wgcmVxdWlyZXNDb250YWlu
ZXJNYW5hZ2VyQWNjZXNzKCkKIHsKICNpZiBQTEFURk9STShNQUMpCkBAIC00MjEsMTggKzQyNSwx
NiBAQAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgaWYgKCFXZWJDb3JlOjpJT1NBcHBs
aWNhdGlvbjo6aXNNb2JpbGVTYWZhcmkoKSkKICAgICAgICAgcGFyYW1ldGVycy5keW5hbWljTWFj
aEV4dGVuc2lvbkhhbmRsZXMgPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVzRm9yTWFj
aExvb2t1cChub25Ccm93c2VyU2VydmljZXMoKSwgV1RGOjpudWxsb3B0KTsKLSAgICAKLSAgICBp
ZiAoaXNJbnRlcm5hbEluc3RhbGwoKSkKLSAgICAgICAgcGFyYW1ldGVycy5kaWFnbm9zdGljc0V4
dGVuc2lvbkhhbmRsZXMgPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVzRm9yTWFjaExv
b2t1cChkaWFnbm9zdGljU2VydmljZXMoKSwgV1RGOjpudWxsb3B0LCBTYW5kYm94RXh0ZW5zaW9u
OjpGbGFnczo6Tm9SZXBvcnQpOwogCiAgICAgaWYgKFdlYkNvcmU6OmRldmljZUhhc0FHWENvbXBp
bGVyU2VydmljZSgpKQogICAgICAgICBwYXJhbWV0ZXJzLmR5bmFtaWNJT0tpdEV4dGVuc2lvbkhh
bmRsZXMgPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVzRm9ySU9LaXRDbGFzc0V4dGVu
c2lvbnMoYWd4Q29tcGlsZXJDbGFzc2VzKCksIFdURjo6bnVsbG9wdCk7CiAjZW5kaWYKLSAgICAK
LSNpZiBQTEFURk9STShDT0NPQSkKKworICAgIGlmIChpc0ludGVybmFsSW5zdGFsbCgpKQorICAg
ICAgICBwYXJhbWV0ZXJzLmRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlcyA9IFNhbmRib3hFeHRl
bnNpb246OmNyZWF0ZUhhbmRsZXNGb3JNYWNoTG9va3VwKGRpYWdub3N0aWNTZXJ2aWNlcygpLCBX
VEY6Om51bGxvcHQsIFNhbmRib3hFeHRlbnNpb246OkZsYWdzOjpOb1JlcG9ydCk7CisKICAgICBw
YXJhbWV0ZXJzLnN5c3RlbUhhc0JhdHRlcnkgPSBzeXN0ZW1IYXNCYXR0ZXJ5KCk7CiAgICAgcGFy
YW1ldGVycy5zeXN0ZW1IYXNBQyA9IGNhY2hlZFN5c3RlbUhhc0FDKCkudmFsdWVPcih0cnVlKTsK
LSNlbmRpZgogCiAgICAgaWYgKHJlcXVpcmVzQ29udGFpbmVyTWFuYWdlckFjY2VzcygpKSB7CiAg
ICAgICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBoYW5kbGU7CkluZGV4OiBTb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9u
IDI2NzAxMikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29j
b2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTMxMSw4ICszMTEsOCBAQAogICAgIGlmIChwYXJhbWV0
ZXJzLmNvbnRhaW5lck1hbmFnZXJFeHRlbnNpb25IYW5kbGUpCiAgICAgICAgIFNhbmRib3hFeHRl
bnNpb246OmNvbnN1bWVQZXJtYW5lbnRseSgqcGFyYW1ldGVycy5jb250YWluZXJNYW5hZ2VyRXh0
ZW5zaW9uSGFuZGxlKTsKICAgICAKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFu
ZW50bHkocGFyYW1ldGVycy5kaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXMpOwogI2lmIFBMQVRG
T1JNKElPU19GQU1JTFkpCi0gICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5
KHBhcmFtZXRlcnMuZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGVzKTsKICAgICBTYW5kYm94RXh0
ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5keW5hbWljTWFjaEV4dGVuc2lv
bkhhbmRsZXMpOwogICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJh
bWV0ZXJzLmR5bmFtaWNJT0tpdEV4dGVuc2lvbkhhbmRsZXMpOwogI2VuZGlmCkluZGV4OiBTb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4KPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmlu
CShyZXZpc2lvbiAyNjc0OTApCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxl
LldlYlByb2Nlc3Muc2IuaW4JKHdvcmtpbmcgY29weSkKQEAgLTEwMDAsNiArMTAwMCw3IEBACiAg
ICAgICAgICAgICAiY29tLmFwcGxlLmNmcHJlZnNkLmFnZW50IgogICAgICAgICAgICAgImNvbS5h
cHBsZS5jZnByZWZzZC5kYWVtb24iCiAgICAgICAgICAgICAiY29tLmFwcGxlLmNvbnRhaW5lcm1h
bmFnZXJkIgorICAgICAgICAgICAgImNvbS5hcHBsZS5kaWFnbm9zdGljZCIKICAgICAgICAgICAg
ICJjb20uYXBwbGUudGNjZCIKICAgICAgICAgICAgICJjb20uYXBwbGUuQmx1ZXRvb3RoU2Vydmlj
ZXMiCiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>409584</attachid>
            <date>2020-09-24 09:46:24 -0700</date>
            <delta_ts>2020-09-24 09:47:20 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>216834.patch</filename>
            <type>text/plain</type>
            <size>1714</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2Eu
bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vz
c1Bvb2xDb2NvYS5tbQkocmV2aXNpb24gMjY3NTM1KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtNjksNiAr
NjksNyBAQAogI2ltcG9ydCA8d3RmL1Byb2Nlc3NQcml2aWxlZ2UuaD4KICNpbXBvcnQgPHd0Zi9T
b2Z0TGlua2luZy5oPgogI2ltcG9ydCA8d3RmL2NvY29hL0VudGl0bGVtZW50cy5oPgorI2ltcG9y
dCA8d3RmL3NwaS9kYXJ3aW4vT1NWYXJpYW50U1BJLmg+CiAjaW1wb3J0IDx3dGYvc3BpL2Rhcndp
bi9TYW5kYm94U1BJLmg+CiAjaW1wb3J0IDx3dGYvc3BpL2Rhcndpbi9keWxkU1BJLmg+CiAKQEAg
LTIwNiw3ICsyMDcsNyBAQAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgc3RhdGljIGJv
b2wgaXNJbnRlcm5hbCA9IE1HR2V0Qm9vbEFuc3dlcihrTUdRQXBwbGVJbnRlcm5hbEluc3RhbGxD
YXBhYmlsaXR5KTsKICNlbHNlCi0gICAgc3RhdGljIGJvb2wgaXNJbnRlcm5hbCA9IEZpbGVTeXN0
ZW06OmZpbGVJc0RpcmVjdG9yeSgiL0FwcGxlSW50ZXJuYWwiLCBGaWxlU3lzdGVtOjpTaG91bGRG
b2xsb3dTeW1ib2xpY0xpbmtzOjpObyk7CisgICAgc3RhdGljIGJvb2wgaXNJbnRlcm5hbCA9IG9z
X3ZhcmlhbnRfYWxsb3dzX2ludGVybmFsX3NlY3VyaXR5X3BvbGljaWVzKCJjb20uYXBwbGUuV2Vi
S2l0IikKICNlbmRpZgogICAgIHJldHVybiBpc0ludGVybmFsOwogfQpJbmRleDogU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI2NzUzNSkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp
CkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMDktMjQgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5A
YXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gSXNzdWUgc2FuZGJveCBleHRlbnNpb24gZm9y
IHRoZSBkaWFnbm9zdGljIGRhZW1vbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MjE2ODM0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODQ5NjgzND4K
KworICAgICAgICBVbnJldmlld2VkLCBhZGRyZXNzIHJldmlldyBmZWVkYmFjay4KKworICAgICAg
ICBVc2UgdGhlIGZ1bmN0aW9uIG9zX3ZhcmlhbnRfYWxsb3dzX2ludGVybmFsX3NlY3VyaXR5X3Bv
bGljaWVzIHRvIGRldGVybWluZSBpZiB0aGUgT1MgdmFyaWFudCBpcyBpbnRlcm5hbC4KKworICAg
ICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tOgorICAgICAgICAo
V2ViS2l0Ojppc0ludGVybmFsSW5zdGFsbCk6CisKIDIwMjAtMDktMjQgIENhcmxvcyBHYXJjaWEg
Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dQRV0gTW92ZSBw
cm94eSBzZXR0aW5ncyBmcm9tIFdlYktpdENvbnRleHQgdG8gV2ViS2l0V2Vic2l0ZURhdGFNYW5h
Z2VyCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>409585</attachid>
            <date>2020-09-24 09:47:41 -0700</date>
            <delta_ts>2020-09-24 09:47:41 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>216834.patch</filename>
            <type>text/plain</type>
            <size>1715</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2Eu
bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vz
c1Bvb2xDb2NvYS5tbQkocmV2aXNpb24gMjY3NTM1KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtNjksNiAr
NjksNyBAQAogI2ltcG9ydCA8d3RmL1Byb2Nlc3NQcml2aWxlZ2UuaD4KICNpbXBvcnQgPHd0Zi9T
b2Z0TGlua2luZy5oPgogI2ltcG9ydCA8d3RmL2NvY29hL0VudGl0bGVtZW50cy5oPgorI2ltcG9y
dCA8d3RmL3NwaS9kYXJ3aW4vT1NWYXJpYW50U1BJLmg+CiAjaW1wb3J0IDx3dGYvc3BpL2Rhcndp
bi9TYW5kYm94U1BJLmg+CiAjaW1wb3J0IDx3dGYvc3BpL2Rhcndpbi9keWxkU1BJLmg+CiAKQEAg
LTIwNiw3ICsyMDcsNyBAQAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgc3RhdGljIGJv
b2wgaXNJbnRlcm5hbCA9IE1HR2V0Qm9vbEFuc3dlcihrTUdRQXBwbGVJbnRlcm5hbEluc3RhbGxD
YXBhYmlsaXR5KTsKICNlbHNlCi0gICAgc3RhdGljIGJvb2wgaXNJbnRlcm5hbCA9IEZpbGVTeXN0
ZW06OmZpbGVJc0RpcmVjdG9yeSgiL0FwcGxlSW50ZXJuYWwiLCBGaWxlU3lzdGVtOjpTaG91bGRG
b2xsb3dTeW1ib2xpY0xpbmtzOjpObyk7CisgICAgc3RhdGljIGJvb2wgaXNJbnRlcm5hbCA9IG9z
X3ZhcmlhbnRfYWxsb3dzX2ludGVybmFsX3NlY3VyaXR5X3BvbGljaWVzKCJjb20uYXBwbGUuV2Vi
S2l0Iik7CiAjZW5kaWYKICAgICByZXR1cm4gaXNJbnRlcm5hbDsKIH0KSW5kZXg6IFNvdXJjZS9X
ZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShy
ZXZpc2lvbiAyNjc1MzUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5
KQpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA5LTI0ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFu
QGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIElzc3VlIHNhbmRib3ggZXh0ZW5zaW9uIGZv
ciB0aGUgZGlhZ25vc3RpYyBkYWVtb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIxNjgzNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTg0OTY4MzQ+
CisKKyAgICAgICAgVW5yZXZpZXdlZCwgYWRkcmVzcyByZXZpZXcgZmVlZGJhY2suCisKKyAgICAg
ICAgVXNlIHRoZSBmdW5jdGlvbiBvc192YXJpYW50X2FsbG93c19pbnRlcm5hbF9zZWN1cml0eV9w
b2xpY2llcyB0byBkZXRlcm1pbmUgaWYgdGhlIE9TIHZhcmlhbnQgaXMgaW50ZXJuYWwuCisKKyAg
ICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbToKKyAgICAgICAg
KFdlYktpdDo6aXNJbnRlcm5hbEluc3RhbGwpOgorCiAyMDIwLTA5LTI0ICBDYXJsb3MgR2FyY2lh
IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVdIE1vdmUg
cHJveHkgc2V0dGluZ3MgZnJvbSBXZWJLaXRDb250ZXh0IHRvIFdlYktpdFdlYnNpdGVEYXRhTWFu
YWdlcgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>