<?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>237717</bug_id>
          
          <creation_ts>2022-03-10 08:55:27 -0800</creation_ts>
          <short_desc>[macOS] Image decoders should be restricted for Mail</short_desc>
          <delta_ts>2022-03-28 15:36:34 -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="Per Arne Vollan">pvollan</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>ggaren</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1850118</commentid>
    <comment_count>0</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-03-10 08:55:27 -0800</bug_when>
    <thetext>We already restrict image decoders for Mail on iOS. We should do so on macOS too.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1850120</commentid>
    <comment_count>1</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-03-10 08:57:19 -0800</bug_when>
    <thetext>&lt;rdar://89827733&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1850121</commentid>
    <comment_count>2</comment_count>
      <attachid>454367</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-03-10 09:01:21 -0800</bug_when>
    <thetext>Created attachment 454367
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1850232</commentid>
    <comment_count>3</comment_count>
      <attachid>454396</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-03-10 13:48:17 -0800</bug_when>
    <thetext>Created attachment 454396
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1850239</commentid>
    <comment_count>4</comment_count>
      <attachid>454398</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-03-10 14:10:45 -0800</bug_when>
    <thetext>Created attachment 454398
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1850261</commentid>
    <comment_count>5</comment_count>
      <attachid>454398</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2022-03-10 14:57:27 -0800</bug_when>
    <thetext>Comment on attachment 454398
Patch

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

r=me

&gt; Source/WebCore/platform/graphics/cg/ImageDecoderCG.h:78
&gt; +    static bool m_enableRestrictedDecoding;

For static variables, we use the &quot;s_&quot; prefix. &quot;m_&quot; for &quot;member&quot;, &quot;s_&quot; for &quot;static&quot;.

&gt; Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:450
&gt; +        if (auto trustdExtensionHandle = SandboxExtension::createHandleForMachLookup(&quot;com.apple.trustd.agent&quot;_s, std::nullopt))
&gt; +            parameters.trustdExtensionHandle = WTFMove(*trustdExtensionHandle);

In a follow-up, it would be nice to disconnect Mail from trustd.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1850274</commentid>
    <comment_count>6</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-03-10 15:32:26 -0800</bug_when>
    <thetext>(In reply to Geoffrey Garen from comment #5)
&gt; Comment on attachment 454398 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=454398&amp;action=review
&gt; 
&gt; r=me
&gt; 
&gt; &gt; Source/WebCore/platform/graphics/cg/ImageDecoderCG.h:78
&gt; &gt; +    static bool m_enableRestrictedDecoding;
&gt; 
&gt; For static variables, we use the &quot;s_&quot; prefix. &quot;m_&quot; for &quot;member&quot;, &quot;s_&quot; for
&gt; &quot;static&quot;.
&gt; 

Will fix!

&gt; &gt; Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:450
&gt; &gt; +        if (auto trustdExtensionHandle = SandboxExtension::createHandleForMachLookup(&quot;com.apple.trustd.agent&quot;_s, std::nullopt))
&gt; &gt; +            parameters.trustdExtensionHandle = WTFMove(*trustdExtensionHandle);
&gt; 
&gt; In a follow-up, it would be nice to disconnect Mail from trustd.

That is a good point, I will follow up on this.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1850608</commentid>
    <comment_count>7</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-03-11 14:14:45 -0800</bug_when>
    <thetext>Committed r291190 (248346@main): &lt;https://commits.webkit.org/248346@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 454398.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1850617</commentid>
    <comment_count>8</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-03-11 14:58:29 -0800</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1850618</commentid>
    <comment_count>9</comment_count>
      <attachid>454514</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-03-11 14:58:30 -0800</bug_when>
    <thetext>Created attachment 454514
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1850666</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-03-11 19:17:07 -0800</bug_when>
    <thetext>Committed r291204 (248359@main): &lt;https://commits.webkit.org/248359@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 454514.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1855753</commentid>
    <comment_count>11</comment_count>
      <attachid>454398</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2022-03-28 13:38:37 -0700</bug_when>
    <thetext>Comment on attachment 454398
Patch

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

&gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:295
&gt; +#if USE(APPLE_INTERNAL_SDK)

I know this was preexisting, but it&apos;s generally wrong for code to be guarded by USE(APPLE_INTERNAL_SDK); you should use SPI headers (which can be guarded by USE(APPLE_INTERNAL_SDK)) to run the same code in non-internal-SDK builds... is there a reason this code doesn&apos;t behave like the rest?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1855804</commentid>
    <comment_count>12</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2022-03-28 15:36:34 -0700</bug_when>
    <thetext>(In reply to Tim Horton from comment #11)
&gt; Comment on attachment 454398 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=454398&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:295
&gt; &gt; +#if USE(APPLE_INTERNAL_SDK)
&gt; 
&gt; I know this was preexisting, but it&apos;s generally wrong for code to be guarded
&gt; by USE(APPLE_INTERNAL_SDK); you should use SPI headers (which can be guarded
&gt; by USE(APPLE_INTERNAL_SDK)) to run the same code in non-internal-SDK
&gt; builds... is there a reason this code doesn&apos;t behave like the rest?

That is a good point. This should behave like the rest. I have filed a bug report to address this.

Thanks for reviewing!</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>454367</attachid>
            <date>2022-03-10 09:01:21 -0800</date>
            <delta_ts>2022-03-10 13:48:30 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>237717.patch</filename>
            <type>text/plain</type>
            <size>5336</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyOTExMTUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAzLTEwICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIEltYWdlIGRlY29k
ZXJzIHNob3VsZCBiZSByZXN0cmljdGVkIGZvciBNYWlsCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc3MTcKKyAgICAgICAgPHJkYXI6Ly84OTgyNzcz
Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBh
bHJlYWR5IHJlc3RyaWN0IGltYWdlIGRlY29kZXJzIGZvciBNYWlsIG9uIGlPUy4gV2Ugc2hvdWxk
IGRvIHNvIG9uIG1hY09TIHRvby4KKworICAgICAgICAqIFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRp
b25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFy
YW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0
aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0
aW9uUGFyYW1ldGVycy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9v
bENvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0
aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNz
Q29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6
ZVdlYlByb2Nlc3MpOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Mu
c2IuaW46CisKIDIwMjItMDMtMTAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAog
ICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI5MDc5NS4KSW5kZXg6IFNvdXJjZS9XZWJL
aXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCShy
ZXZpc2lvbiAyOTA5OTUpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRp
b25QYXJhbWV0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY3LDcgKzE2Nyw3IEBACiAKICNp
ZiBIQVZFKFZJREVPX1JFU1RSSUNURURfREVDT0RJTkcpCiAjaWYgUExBVEZPUk0oTUFDKQotICAg
IGVuY29kZXIgPDwgdmlkZW9EZWNvZGVyRXh0ZW5zaW9uSGFuZGxlczsKKyAgICBlbmNvZGVyIDw8
IHRydXN0ZEV4dGVuc2lvbkhhbmRsZTsKICNlbmRpZgogICAgIGVuY29kZXIgPDwgcmVzdHJpY3RJ
bWFnZUFuZFZpZGVvRGVjb2RlcnM7CiAjZW5kaWYKQEAgLTQ2OSwxMSArNDY5LDExIEBACiAKICNp
ZiBIQVZFKFZJREVPX1JFU1RSSUNURURfREVDT0RJTkcpCiAjaWYgUExBVEZPUk0oTUFDKQotICAg
IHN0ZDo6b3B0aW9uYWw8VmVjdG9yPFNhbmRib3hFeHRlbnNpb246OkhhbmRsZT4+IHZpZGVvRGVj
b2RlckV4dGVuc2lvbkhhbmRsZXM7Ci0gICAgZGVjb2RlciA+PiB2aWRlb0RlY29kZXJFeHRlbnNp
b25IYW5kbGVzOwotICAgIGlmICghdmlkZW9EZWNvZGVyRXh0ZW5zaW9uSGFuZGxlcykKKyAgICBz
dGQ6Om9wdGlvbmFsPFNhbmRib3hFeHRlbnNpb246OkhhbmRsZT4gdHJ1c3RkRXh0ZW5zaW9uSGFu
ZGxlOworICAgIGRlY29kZXIgPj4gdHJ1c3RkRXh0ZW5zaW9uSGFuZGxlOworICAgIGlmICghdHJ1
c3RkRXh0ZW5zaW9uSGFuZGxlKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgcGFyYW1ldGVy
cy52aWRlb0RlY29kZXJFeHRlbnNpb25IYW5kbGVzID0gV1RGTW92ZSgqdmlkZW9EZWNvZGVyRXh0
ZW5zaW9uSGFuZGxlcyk7CisgICAgcGFyYW1ldGVycy50cnVzdGRFeHRlbnNpb25IYW5kbGUgPSBX
VEZNb3ZlKCp0cnVzdGRFeHRlbnNpb25IYW5kbGUpOwogI2VuZGlmCiAgICAgc3RkOjpvcHRpb25h
bDxib29sPiByZXN0cmljdEltYWdlQW5kVmlkZW9EZWNvZGVyczsKICAgICBkZWNvZGVyID4+IHJl
c3RyaWN0SW1hZ2VBbmRWaWRlb0RlY29kZXJzOwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQv
V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAkocmV2aXNpb24gMjkwOTk1
KQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5o
CSh3b3JraW5nIGNvcHkpCkBAIC0yMDksNyArMjA5LDcgQEAKICAgICBzdGQ6Om9wdGlvbmFsPFNh
bmRib3hFeHRlbnNpb246OkhhbmRsZT4gbGF1bmNoU2VydmljZXNFeHRlbnNpb25IYW5kbGU7CiAj
aWYgSEFWRShWSURFT19SRVNUUklDVEVEX0RFQ09ESU5HKQogI2lmIFBMQVRGT1JNKE1BQykKLSAg
ICBWZWN0b3I8U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiB2aWRlb0RlY29kZXJFeHRlbnNpb25I
YW5kbGVzOworICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSB0cnVzdGRFeHRlbnNpb25IYW5k
bGU7CiAjZW5kaWYKICAgICBib29sIHJlc3RyaWN0SW1hZ2VBbmRWaWRlb0RlY29kZXJzIHsgZmFs
c2UgfTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJv
Y2Vzc1Bvb2xDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D
b2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCShyZXZpc2lvbiAyOTA5OTUpCisrKyBTb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCSh3b3JraW5nIGNv
cHkpCkBAIC00NDUsOCArNDQ1LDExIEBACiAKICNpZiBIQVZFKFZJREVPX1JFU1RSSUNURURfREVD
T0RJTkcpCiAjaWYgUExBVEZPUk0oTUFDKQotICAgIGlmIChNYWNBcHBsaWNhdGlvbjo6aXNBcHBs
ZU1haWwoKSkKLSAgICAgICAgcGFyYW1ldGVycy52aWRlb0RlY29kZXJFeHRlbnNpb25IYW5kbGVz
ID0gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlc0Zvck1hY2hMb29rdXAoeyAiY29tLmFw
cGxlLmNvcmVtZWRpYS52aWRlb2RlY29kZXIiX3MsICJjb20uYXBwbGUudHJ1c3RkLmFnZW50Il9z
IH0sIHN0ZDo6bnVsbG9wdCk7CisgICAgaWYgKE1hY0FwcGxpY2F0aW9uOjppc0FwcGxlTWFpbCgp
KSB7CisgICAgICAgIGlmIChhdXRvIHRydXN0ZEV4dGVuc2lvbkhhbmRsZSA9IFNhbmRib3hFeHRl
bnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29rdXAoImNvbS5hcHBsZS50cnVzdGQuYWdlbnQi
X3MsIHN0ZDo6bnVsbG9wdCkpCisgICAgICAgICAgICBwYXJhbWV0ZXJzLnRydXN0ZEV4dGVuc2lv
bkhhbmRsZSA9IFdURk1vdmUoKnRydXN0ZEV4dGVuc2lvbkhhbmRsZSk7CisgICAgICAgIHBhcmFt
ZXRlcnMucmVzdHJpY3RJbWFnZUFuZFZpZGVvRGVjb2RlcnMgPSB0cnVlOworICAgIH0KICNlbHNl
CiAgICAgcGFyYW1ldGVycy5yZXN0cmljdEltYWdlQW5kVmlkZW9EZWNvZGVycyA9IElPU0FwcGxp
Y2F0aW9uOjppc01vYmlsZU1haWwoKSB8fCBJT1NBcHBsaWNhdGlvbjo6aXNNYWlsQ29tcG9zaXRp
b25TZXJ2aWNlKCk7CiAjZW5kaWYgLy8gUExBVEZPUk0oTUFDKQpJbmRleDogU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAy
OTA5OTUpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29h
Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yODksMTEgKzI4OSwxMiBAQAogCiAjaWYgSEFWRShWSURF
T19SRVNUUklDVEVEX0RFQ09ESU5HKQogI2lmIFBMQVRGT1JNKE1BQykKLSAgICBTYW5kYm94RXh0
ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy52aWRlb0RlY29kZXJFeHRlbnNp
b25IYW5kbGVzKTsKLSNlbGlmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisgICAgU2FuZGJveEV4
dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMudHJ1c3RkRXh0ZW5zaW9uSGFu
ZGxlKTsKKyNlbmRpZiAvLyBQTEFURk9STShNQUMpCisjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NE
SykKICAgICBpZiAocGFyYW1ldGVycy5yZXN0cmljdEltYWdlQW5kVmlkZW9EZWNvZGVycykKICAg
ICAgICAgcmVzdHJpY3RJbWFnZUFuZFZpZGVvRGVjb2RlcnMoKTsKLSNlbmRpZiAvLyBQTEFURk9S
TShNQUMpCisjZW5kaWYKICNlbmRpZiAvLyBIQVZFKFZJREVPX1JFU1RSSUNURURfREVDT0RJTkcp
CiAKICAgICAvLyBEaXNhYmxlIE5TVVJMQ2FjaGUuCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4KPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCShyZXZpc2lvbiAyOTA5
OTUpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2Iu
aW4JKHdvcmtpbmcgY29weSkKQEAgLTE0MTAsNiArMTQxMCwxMSBAQAogKSkKICNlbmRpZgogCiso
YWxsb3cgbWFjaC1sb29rdXAKKyAgICAocmVxdWlyZS1hbGwKKyAgICAgICAgKGV4dGVuc2lvbiAi
Y29tLmFwcGxlLndlYmtpdC5leHRlbnNpb24ubWFjaCIpCisgICAgICAgIChnbG9iYWwtbmFtZSAi
Y29tLmFwcGxlLnRydXN0ZC5hZ2VudCIpKSkKKwogOzsgVmFyaW91cyBzZXJ2aWNlcyByZXF1aXJl
ZCBieSBBcHBLaXQgYW5kIG90aGVyIGZyYW1ld29ya3MKIChhbGxvdyBtYWNoLWxvb2t1cAogICAg
ICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmxvZ2QiKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>454396</attachid>
            <date>2022-03-10 13:48:17 -0800</date>
            <delta_ts>2022-03-10 14:11:18 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>237717.patch</filename>
            <type>text/plain</type>
            <size>17505</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI5MTEyNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAzLTEwICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIEltYWdlIGRl
Y29kZXJzIHNob3VsZCBiZSByZXN0cmljdGVkIGZvciBNYWlsCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc3MTcKKyAgICAgICAgPHJkYXI6Ly84OTgy
NzczMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBP
bmx5IGFkZCByZXN0cmljdGVkIGRlY29kaW5nIGZsYWcgd2hlbiBpdCBpcyBleHBsaWNpdGx5IHJl
cXVlc3RlZC4KKworICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoK
KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZURlY29kZXJDRy5jcHA6CisgICAg
ICAgIChXZWJDb3JlOjpjcmVhdGVJbWFnZVNvdXJjZU9wdGlvbnMpOgorICAgICAgICAoV2ViQ29y
ZTo6SW1hZ2VEZWNvZGVyQ0c6OmVuYWJsZVJlc3RyaWN0ZWREZWNvZGluZyk6CisgICAgICAgIChX
ZWJDb3JlOjpJbWFnZURlY29kZXJDRzo6cmVzdHJpY3RlZERlY29kaW5nRW5hYmxlZCk6CisgICAg
ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VEZWNvZGVyQ0cuaDoKKwogMjAyMi0wMy0x
MCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIERvY3VtZW50IGlz
IGxlYWtpbmcgb24gaGFhcmV0ei5jby5pbCBkdWUgdG8gYW4gYXN5bmMgc2NyaXB0CkluZGV4OiBT
b3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShy
ZXZpc2lvbiAyOTA5OTUpCisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9q
ZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTEyNDIsNiArMTI0Miw3IEBACiAJCTQzNThF
ODdEMTM2MEEyRUUwMEU0NzQ4QyAvKiBKU1NWR0ZFRHJvcFNoYWRvd0VsZW1lbnQuaCBpbiBIZWFk
ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQzNThFODdCMTM2MEEyRUUw
MEU0NzQ4QyAvKiBKU1NWR0ZFRHJvcFNoYWRvd0VsZW1lbnQuaCAqLzsgfTsKIAkJNDM1OEU4ODEx
MzYwQTMxNzAwRTQ3NDhDIC8qIEZFRHJvcFNoYWRvdy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0g
UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDM1OEU4N0YxMzYwQTMxNzAwRTQ3NDhDIC8qIEZFRHJv
cFNoYWRvdy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07
CiAJCTQzNThFODg2MTM2MEEzM0IwMEU0NzQ4QyAvKiBTVkdGRURyb3BTaGFkb3dFbGVtZW50Lmgg
aW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MzU4RTg4MzEz
NjBBMzNCMDBFNDc0OEMgLyogU1ZHRkVEcm9wU2hhZG93RWxlbWVudC5oICovOyB9OworCQk0MzY3
MDdFNzI0QzlDQTRCMTAwNDQyMzQgLyogUmVuZGVyU1ZHVHJhbnNmb3JtYWJsZUNvbnRhaW5lci5o
IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDM2NzE4QkIx
MkQ5Q0E0QjAwMDQyMjM0IC8qIFJlbmRlclNWR1RyYW5zZm9ybWFibGVDb250YWluZXIuaCAqLzsg
fTsKIAkJNDM2NzA4QzExMkQ5Q0E0QjAwMDQ0MjM0IC8qIFJlbmRlclNWR0Jsb2NrLmggaW4gSGVh
ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MzY3MDg4MjEyRDlDQTRB
MDAwNDQyMzQgLyogUmVuZGVyU1ZHQmxvY2suaCAqLzsgfTsKIAkJNDM2NzA4QzMxMkQ5Q0E0QjAw
MDQ0MjM0IC8qIExlZ2FjeVJlbmRlclNWR0NvbnRhaW5lci5oIGluIEhlYWRlcnMgKi8gPSB7aXNh
ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDM2NzA4ODQxMkQ5Q0E0QTAwMDQ0MjM0IC8qIExl
Z2FjeVJlbmRlclNWR0NvbnRhaW5lci5oICovOyB9OwogCQk0MzY3MDhDNDMzRjhDQTRDMTAwNDQy
MzQgLyogUmVuZGVyU1ZHQ29udGFpbmVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls
ZEZpbGU7IGZpbGVSZWYgPSA0MzY3MDc3NDEyRDlCQzRBMDAwNDQyMzQgLyogUmVuZGVyU1ZHQ29u
dGFpbmVyLmggKi87IH07CkBAIC0xMjYzLDcgKzEyNjQsNiBAQAogCQk0MzY3MDhFMzEyRDlDQTRC
MDAwNDQyMzQgLyogUmVuZGVyU1ZHUmVzb3VyY2VTb2xpZENvbG9yLmggaW4gSGVhZGVycyAqLyA9
IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MzY3MDhBNDEyRDlDQTRCMDAwNDQyMzQg
LyogUmVuZGVyU1ZHUmVzb3VyY2VTb2xpZENvbG9yLmggKi87IH07CiAJCTQzNjcwOEU1MTJEOUNB
NEIwMDA0NDIzNCAvKiBMZWdhY3lSZW5kZXJTVkdSb290LmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg
PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MzY3MDhBNjEyRDlDQTRCMDAwNDQyMzQgLyogTGVn
YWN5UmVuZGVyU1ZHUm9vdC5oICovOyB9OwogCQk0MzY3MDhFNTEyRDlEQjRCMDAwNDQyMzQgLyog
UmVuZGVyU1ZHUm9vdC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl
UmVmID0gNDM2NzA4QTYxMkQ5REI0QjAwMDQ0MjM0IC8qIFJlbmRlclNWR1Jvb3QuaCAqLzsgfTsK
LQkJNDM2NzA3RTcyNEM5Q0E0QjEwMDQ0MjM0IC8qIFJlbmRlclNWR1RyYW5zZm9ybWFibGVDb250
YWluZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQz
NjcxOEJCMTJEOUNBNEIwMDA0MjIzNCAvKiBSZW5kZXJTVkdUcmFuc2Zvcm1hYmxlQ29udGFpbmVy
LmggKi87IH07CiAJCTQzNjcwOEU5MTJEOUNBNEIwMDA0NDIzNCAvKiBMZWdhY3lSZW5kZXJTVkdU
cmFuc2Zvcm1hYmxlQ29udGFpbmVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp
bGU7IGZpbGVSZWYgPSA0MzY3MDhBQTEyRDlDQTRCMDAwNDQyMzQgLyogTGVnYWN5UmVuZGVyU1ZH
VHJhbnNmb3JtYWJsZUNvbnRhaW5lci5oICovOyB9OwogCQk0MzY3MDhFQjEyRDlDQTRCMDAwNDQy
MzQgLyogUmVuZGVyU1ZHVmlld3BvcnRDb250YWluZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9
IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQzNjcwOEFDMTJEOUNBNEIwMDA0NDIzNCAvKiBSZW5k
ZXJTVkdWaWV3cG9ydENvbnRhaW5lci5oICovOyB9OwogCQk0MzY3MDhFRTEyRDlDQTRCMDAwNDQy
MzQgLyogU1ZHTWFya2VyRGF0YS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl
OyBmaWxlUmVmID0gNDM2NzA4QUYxMkQ5Q0E0QjAwMDQ0MjM0IC8qIFNWR01hcmtlckRhdGEuaCAq
LzsgfTsKQEAgLTE5MDAsNyArMTkwMCw3IEBACiAJCTU1NDY3NTdCMUZEMjEyQTkwMDNCMTBCMCAv
KiBJbWFnZVNvdXJjZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl
UmVmID0gNTU0Njc1NzgxRkQxRkMxQTAwM0IxMEIwIC8qIEltYWdlU291cmNlLmggKi87IHNldHRp
bmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJNTU1MENCNDIxRTk1NUUz
QzAwMTExQUEwIC8qIEltYWdlVHlwZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxk
RmlsZTsgZmlsZVJlZiA9IDU1NTBDQjQxMUU5NTVFM0MwMDExMUFBMCAvKiBJbWFnZVR5cGVzLmgg
Ki87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJNTU1MTMw
MDExRTdDQ0NDQjAwQTY5RTM4IC8qIERlY29kaW5nT3B0aW9ucy5oIGluIEhlYWRlcnMgKi8gPSB7
aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTU1MTMwMDAxRTdDQ0NDQTAwQTY5RTM4IC8q
IERlY29kaW5nT3B0aW9ucy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUs
ICk7IH07IH07Ci0JCTU1NUI4N0VEMUNBQUYwQUIwMDM0OTQyNSAvKiBJbWFnZURlY29kZXJDRy5o
IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTU1Qjg3RUIx
Q0FBRjBBQjAwMzQ5NDI1IC8qIEltYWdlRGVjb2RlckNHLmggKi87IH07CisJCTU1NUI4N0VEMUNB
QUYwQUIwMDM0OTQyNSAvKiBJbWFnZURlY29kZXJDRy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0g
UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTU1Qjg3RUIxQ0FBRjBBQjAwMzQ5NDI1IC8qIEltYWdl
RGVjb2RlckNHLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsg
fTsKIAkJNTU2QzdDNEIyMjEyMzk5NzAwOUIwNkNBIC8qIFJlbmRlcmluZ1VwZGF0ZVNjaGVkdWxl
ci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTU2QzdD
NDcyMjEyMzk0MjAwOUIwNkNBIC8qIFJlbmRlcmluZ1VwZGF0ZVNjaGVkdWxlci5oICovOyBzZXR0
aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTU1NzZBNTY1MUQ4OEE3
MDgwMENDQzA0QyAvKiBJbWFnZUZyYW1lLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls
ZEZpbGU7IGZpbGVSZWYgPSA1NTc2QTU2MzFEODhBNzA4MDBDQ0MwNEMgLyogSW1hZ2VGcmFtZS5o
ICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTU1ODQ3
NjVBMjQ1M0YzMzQwMDlGNTUwQyAvKiBSZWR1Y2VkUmVzb2x1dGlvblNlY29uZHMuaCBpbiBIZWFk
ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDU1ODQ3NjU4MjQ1M0FCQzIw
MDlGNTUwQyAvKiBSZWR1Y2VkUmVzb2x1dGlvblNlY29uZHMuaCAqLzsgc2V0dGluZ3MgPSB7QVRU
UklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwpAQCAtOTA5Niw5ICs5MDk2LDcgQEAKIAkJNDM2
NzA4QTUxMkQ5Q0E1QzAwMDQ0MjM0IC8qIFJlbmRlclNWR1Jvb3QuY3BwICovID0ge2lzYSA9IFBC
WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291
cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUmVuZGVyU1ZHUm9vdC5jcHA7IHNvdXJjZVRyZWUgPSAi
PGdyb3VwPiI7IH07CiAJCTQzNjcwOEE2MTJEOUNBNEIwMDA0NDIzNCAvKiBMZWdhY3lSZW5kZXJT
VkdSb290LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg
bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IExlZ2FjeVJlbmRlclNW
R1Jvb3QuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDM2NzA4QTYxMkQ5REI0QjAw
MDQ0MjM0IC8qIFJlbmRlclNWR1Jvb3QuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm
aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo
ID0gUmVuZGVyU1ZHUm9vdC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQk0MzY3MDhC
ODEyQzlDQTRDMDAwMTE0MzQgLyogUmVuZGVyU1ZHVHJhbnNmb3JtYWJsZUNvbnRhaW5lci5jcHAg
Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du
RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBSZW5kZXJTVkdUcmFuc2Zvcm1h
YmxlQ29udGFpbmVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDM2NzA4QTkx
MkQ5Q0E0QjAwMDQ0MjM0IC8qIExlZ2FjeVJlbmRlclNWR1RyYW5zZm9ybWFibGVDb250YWluZXIu
Y3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL
bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTGVnYWN5UmVuZGVyU1ZH
VHJhbnNmb3JtYWJsZUNvbnRhaW5lci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0J
CTQzNjcxOEJCMTJEOUNBNEIwMDA0MjIzNCAvKiBSZW5kZXJTVkdUcmFuc2Zvcm1hYmxlQ29udGFp
bmVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz
dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFJlbmRlclNWR1RyYW5zZm9y
bWFibGVDb250YWluZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDM2NzA4QUEx
MkQ5Q0E0QjAwMDQ0MjM0IC8qIExlZ2FjeVJlbmRlclNWR1RyYW5zZm9ybWFibGVDb250YWluZXIu
aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v
d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTGVnYWN5UmVuZGVyU1ZHVHJhbnNm
b3JtYWJsZUNvbnRhaW5lci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0MzY3MDhB
QjEyRDlDQTRCMDAwNDQyMzQgLyogUmVuZGVyU1ZHVmlld3BvcnRDb250YWluZXIuY3BwICovID0g
e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU
eXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUmVuZGVyU1ZHVmlld3BvcnRDb250YWlu
ZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0MzY3MDhBQzEyRDlDQTRCMDAw
NDQyMzQgLyogUmVuZGVyU1ZHVmlld3BvcnRDb250YWluZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxl
UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv
ZGUuYy5oOyBwYXRoID0gUmVuZGVyU1ZHVmlld3BvcnRDb250YWluZXIuaDsgc291cmNlVHJlZSA9
ICI8Z3JvdXA+IjsgfTsKQEAgLTkxMDksMTEgKzkxMDcsMTMgQEAKIAkJNDM2NzA4QjUxMkQ5Q0E0
QjAwMDQ0MjM0IC8qIFNWR1JlbmRlclRyZWVBc1RleHQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm
ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu
Yy5oOyBwYXRoID0gU1ZHUmVuZGVyVHJlZUFzVGV4dC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i
OyB9OwogCQk0MzY3MDhCNjEyRDlDQTRCMDAwNDQyMzQgLyogU1ZHUmVzb3VyY2VzLmNwcCAqLyA9
IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl
VHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFNWR1Jlc291cmNlcy5jcHA7IHNvdXJj
ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQzNjcwOEI3MTJEOUNBNEIwMDA0NDIzNCAvKiBTVkdS
ZXNvdXJjZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0
OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gU1ZHUmVzb3VyY2Vz
Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTQzNjcwOEI4MTJDOUNBNEMwMDAxMTQz
NCAvKiBSZW5kZXJTVkdUcmFuc2Zvcm1hYmxlQ29udGFpbmVyLmNwcCAqLyA9IHtpc2EgPSBQQlhG
aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj
ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFJlbmRlclNWR1RyYW5zZm9ybWFibGVDb250YWluZXIuY3Bw
OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0MzY3MDhCODEyRDlDQTRCMDAwNDQyMzQg
LyogU1ZHUmVzb3VyY2VzQ2FjaGUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp
bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw
YXRoID0gU1ZHUmVzb3VyY2VzQ2FjaGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog
CQk0MzY3MDhCOTEyRDlDQTRCMDAwNDQyMzQgLyogU1ZHUmVzb3VyY2VzQ2FjaGUuaCAqLyA9IHtp
c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw
ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gU1ZHUmVzb3VyY2VzQ2FjaGUuaDsgc291cmNlVHJl
ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDM2NzA4QkExMkQ5Q0E0QjAwMDQ0MjM0IC8qIFNWR1Jlc291
cmNlc0N5Y2xlU29sdmVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j
b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9
IFNWR1Jlc291cmNlc0N5Y2xlU29sdmVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK
IAkJNDM2NzA4QkIxMkQ5Q0E0QjAwMDQ0MjM0IC8qIFNWR1Jlc291cmNlc0N5Y2xlU29sdmVyLmgg
Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du
RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFNWR1Jlc291cmNlc0N5Y2xlU29sdmVy
Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQzNjcwOEZEMTJEOUNBNEEwMDAzMjEx
NCAvKiBSZW5kZXJTVkdNb2RlbE9iamVjdC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7
IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBh
dGggPSBSZW5kZXJTVkdNb2RlbE9iamVjdC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owor
CQk0MzY3MThCQjEyRDlDQTRCMDAwNDIyMzQgLyogUmVuZGVyU1ZHVHJhbnNmb3JtYWJsZUNvbnRh
aW5lci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh
c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBSZW5kZXJTVkdUcmFuc2Zv
cm1hYmxlQ29udGFpbmVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQzOTA0NkMz
MTJEQTI1RTgwMEFGODBBMiAvKiBSZW5kZXJNYXRoTUxCbG9jay5jcHAgKi8gPSB7aXNhID0gUEJY
RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy
Y2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBSZW5kZXJNYXRoTUxCbG9jay5jcHA7IHNvdXJjZVRyZWUg
PSAiPGdyb3VwPiI7IH07CiAJCTQzOTA0NkM0MTJEQTI1RTgwMEFGODBBMiAvKiBSZW5kZXJNYXRo
TUxCbG9jay5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7
IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBSZW5kZXJNYXRoTUxC
bG9jay5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0MzkwNDZDNTEyREEyNUU4MDBB
RjgwQTIgLyogUmVuZGVyTWF0aE1MRmVuY2VkLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl
bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw
LmNwcDsgcGF0aCA9IFJlbmRlck1hdGhNTEZlbmNlZC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw
PiI7IH07CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZURl
Y29kZXJDRy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp
Y3MvY2cvSW1hZ2VEZWNvZGVyQ0cuY3BwCShyZXZpc2lvbiAyOTA5OTUpCisrKyBTb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZURlY29kZXJDRy5jcHAJKHdvcmtpbmcgY29w
eSkKQEAgLTY3LDcgKzY3LDggQEAKICAgICBDRkRpY3Rpb25hcnlTZXRWYWx1ZShvcHRpb25zLmdl
dCgpLCBrQ0dJbWFnZVNvdXJjZVNob3VsZFByZWZlclJHQjMyLCBrQ0ZCb29sZWFuVHJ1ZSk7CiAg
ICAgQ0ZEaWN0aW9uYXJ5U2V0VmFsdWUob3B0aW9ucy5nZXQoKSwga0NHSW1hZ2VTb3VyY2VTa2lw
TWV0YWRhdGEsIGtDRkJvb2xlYW5UcnVlKTsKICNpZiBIQVZFKElNQUdFX1JFU1RSSUNURURfREVD
T0RJTkcpICYmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCi0gICAgQ0ZEaWN0aW9uYXJ5U2V0VmFs
dWUob3B0aW9ucy5nZXQoKSwga0NHSW1hZ2VTb3VyY2VFbmFibGVSZXN0cmljdGVkRGVjb2Rpbmcs
IGtDRkJvb2xlYW5UcnVlKTsKKyAgICBpZiAoSW1hZ2VEZWNvZGVyQ0c6OnJlc3RyaWN0ZWREZWNv
ZGluZ0VuYWJsZWQoKSkKKyAgICAgICAgQ0ZEaWN0aW9uYXJ5U2V0VmFsdWUob3B0aW9ucy5nZXQo
KSwga0NHSW1hZ2VTb3VyY2VFbmFibGVSZXN0cmljdGVkRGVjb2RpbmcsIGtDRkJvb2xlYW5UcnVl
KTsKICNlbmRpZgogICAgIHJldHVybiBvcHRpb25zOwogfQpAQCAtMjU0LDYgKzI1NSw4IEBACiB9
CiAjZW5kaWYKIAorYm9vbCBJbWFnZURlY29kZXJDRzo6bV9lbmFibGVSZXN0cmljdGVkRGVjb2Rp
bmcgPSBmYWxzZTsKKwogSW1hZ2VEZWNvZGVyQ0c6OkltYWdlRGVjb2RlckNHKEZyYWdtZW50ZWRT
aGFyZWRCdWZmZXImIGRhdGEsIEFscGhhT3B0aW9uLCBHYW1tYUFuZENvbG9yUHJvZmlsZU9wdGlv
bikKIHsKICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHV0aUhpbnQ7CkBAIC01OTQsNiArNTk3
LDE2IEBACiAgICAgcmV0dXJuIE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkSW1hZ2VNSU1F
VHlwZShtaW1lVHlwZSk7CiB9CiAKK3ZvaWQgSW1hZ2VEZWNvZGVyQ0c6OmVuYWJsZVJlc3RyaWN0
ZWREZWNvZGluZygpCit7CisgICAgbV9lbmFibGVSZXN0cmljdGVkRGVjb2RpbmcgPSB0cnVlOwog
fQogCitib29sIEltYWdlRGVjb2RlckNHOjpyZXN0cmljdGVkRGVjb2RpbmdFbmFibGVkKCkKK3sK
KyAgICByZXR1cm4gbV9lbmFibGVSZXN0cmljdGVkRGVjb2Rpbmc7Cit9CisKK30KKwogI2VuZGlm
IC8vIFVTRShDRykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0lt
YWdlRGVjb2RlckNHLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY2cvSW1hZ2VEZWNvZGVyQ0cuaAkocmV2aXNpb24gMjkwOTk1KQorKysgU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VEZWNvZGVyQ0cuaAkod29ya2luZyBjb3B5
KQpAQCAtNjgsMTAgKzY4LDE0IEBACiAgICAgYm9vbCBpc0FsbERhdGFSZWNlaXZlZCgpIGNvbnN0
IGZpbmFsIHsgcmV0dXJuIG1faXNBbGxEYXRhUmVjZWl2ZWQ7IH0KICAgICB2b2lkIGNsZWFyRnJh
bWVCdWZmZXJDYWNoZShzaXplX3QpIGZpbmFsIHsgfQogCisgICAgV0VCQ09SRV9FWFBPUlQgc3Rh
dGljIHZvaWQgZW5hYmxlUmVzdHJpY3RlZERlY29kaW5nKCk7CisgICAgc3RhdGljIGJvb2wgcmVz
dHJpY3RlZERlY29kaW5nRW5hYmxlZCgpOworCiBwcml2YXRlOgogICAgIGJvb2wgbV9pc0FsbERh
dGFSZWNlaXZlZCB7IGZhbHNlIH07CiAgICAgbXV0YWJsZSBFbmNvZGVkRGF0YVN0YXR1cyBtX2Vu
Y29kZWREYXRhU3RhdHVzIHsgRW5jb2RlZERhdGFTdGF0dXM6OlVua25vd24gfTsKICAgICBSZXRh
aW5QdHI8Q0dJbWFnZVNvdXJjZVJlZj4gbV9uYXRpdmVEZWNvZGVyOworICAgIHN0YXRpYyBib29s
IG1fZW5hYmxlUmVzdHJpY3RlZERlY29kaW5nOwogfTsKIAogfQpJbmRleDogU291cmNlL1dlYktp
dC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlz
aW9uIDI5MTExNSkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA
IC0xLDMgKzEsMjMgQEAKKzIwMjItMDMtMTAgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBw
bGUuY29tPgorCisgICAgICAgIFttYWNPU10gSW1hZ2UgZGVjb2RlcnMgc2hvdWxkIGJlIHJlc3Ry
aWN0ZWQgZm9yIE1haWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIzNzcxNworICAgICAgICA8cmRhcjovLzg5ODI3NzMzPgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGFscmVhZHkgcmVzdHJpY3QgaW1h
Z2UgZGVjb2RlcnMgZm9yIE1haWwgb24gaU9TLiBXZSBzaG91bGQgZG8gc28gb24gbWFjT1MgdG9v
LgorCisgICAgICAgICogU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgor
ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUgY29u
c3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNv
ZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6Cisg
ICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW06CisgICAgICAg
IChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToK
KyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAg
KFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAg
ICAgICogV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vzcy5zYi5pbjoKKwogMjAyMi0wMy0x
MCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs
IHJldmVydGluZyByMjkwNzk1LgpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vz
c0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFy
ZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9uIDI5MDk5NSkKKysr
IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCSh3
b3JraW5nIGNvcHkpCkBAIC0xNjcsNyArMTY3LDcgQEAKIAogI2lmIEhBVkUoVklERU9fUkVTVFJJ
Q1RFRF9ERUNPRElORykKICNpZiBQTEFURk9STShNQUMpCi0gICAgZW5jb2RlciA8PCB2aWRlb0Rl
Y29kZXJFeHRlbnNpb25IYW5kbGVzOworICAgIGVuY29kZXIgPDwgdHJ1c3RkRXh0ZW5zaW9uSGFu
ZGxlOwogI2VuZGlmCiAgICAgZW5jb2RlciA8PCByZXN0cmljdEltYWdlQW5kVmlkZW9EZWNvZGVy
czsKICNlbmRpZgpAQCAtNDY5LDExICs0NjksMTEgQEAKIAogI2lmIEhBVkUoVklERU9fUkVTVFJJ
Q1RFRF9ERUNPRElORykKICNpZiBQTEFURk9STShNQUMpCi0gICAgc3RkOjpvcHRpb25hbDxWZWN0
b3I8U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPj4gdmlkZW9EZWNvZGVyRXh0ZW5zaW9uSGFuZGxl
czsKLSAgICBkZWNvZGVyID4+IHZpZGVvRGVjb2RlckV4dGVuc2lvbkhhbmRsZXM7Ci0gICAgaWYg
KCF2aWRlb0RlY29kZXJFeHRlbnNpb25IYW5kbGVzKQorICAgIHN0ZDo6b3B0aW9uYWw8U2FuZGJv
eEV4dGVuc2lvbjo6SGFuZGxlPiB0cnVzdGRFeHRlbnNpb25IYW5kbGU7CisgICAgZGVjb2RlciA+
PiB0cnVzdGRFeHRlbnNpb25IYW5kbGU7CisgICAgaWYgKCF0cnVzdGRFeHRlbnNpb25IYW5kbGUp
CiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBwYXJhbWV0ZXJzLnZpZGVvRGVjb2RlckV4dGVu
c2lvbkhhbmRsZXMgPSBXVEZNb3ZlKCp2aWRlb0RlY29kZXJFeHRlbnNpb25IYW5kbGVzKTsKKyAg
ICBwYXJhbWV0ZXJzLnRydXN0ZEV4dGVuc2lvbkhhbmRsZSA9IFdURk1vdmUoKnRydXN0ZEV4dGVu
c2lvbkhhbmRsZSk7CiAjZW5kaWYKICAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IHJlc3RyaWN0SW1h
Z2VBbmRWaWRlb0RlY29kZXJzOwogICAgIGRlY29kZXIgPj4gcmVzdHJpY3RJbWFnZUFuZFZpZGVv
RGVjb2RlcnM7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25Q
YXJhbWV0ZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vz
c0NyZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiAyOTA5OTUpCisrKyBTb3VyY2UvV2ViS2l0
L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHdvcmtpbmcgY29weSkKQEAg
LTIwOSw3ICsyMDksNyBAQAogICAgIHN0ZDo6b3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6SGFu
ZGxlPiBsYXVuY2hTZXJ2aWNlc0V4dGVuc2lvbkhhbmRsZTsKICNpZiBIQVZFKFZJREVPX1JFU1RS
SUNURURfREVDT0RJTkcpCiAjaWYgUExBVEZPUk0oTUFDKQotICAgIFZlY3RvcjxTYW5kYm94RXh0
ZW5zaW9uOjpIYW5kbGU+IHZpZGVvRGVjb2RlckV4dGVuc2lvbkhhbmRsZXM7CisgICAgU2FuZGJv
eEV4dGVuc2lvbjo6SGFuZGxlIHRydXN0ZEV4dGVuc2lvbkhhbmRsZTsKICNlbmRpZgogICAgIGJv
b2wgcmVzdHJpY3RJbWFnZUFuZFZpZGVvRGVjb2RlcnMgeyBmYWxzZSB9OwogI2VuZGlmCkluZGV4
OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29s
Q29jb2EubW0JKHJldmlzaW9uIDI5MDk5NSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv
Y29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTQ0NSw4ICs0NDUs
MTEgQEAKIAogI2lmIEhBVkUoVklERU9fUkVTVFJJQ1RFRF9ERUNPRElORykKICNpZiBQTEFURk9S
TShNQUMpCi0gICAgaWYgKE1hY0FwcGxpY2F0aW9uOjppc0FwcGxlTWFpbCgpKQotICAgICAgICBw
YXJhbWV0ZXJzLnZpZGVvRGVjb2RlckV4dGVuc2lvbkhhbmRsZXMgPSBTYW5kYm94RXh0ZW5zaW9u
OjpjcmVhdGVIYW5kbGVzRm9yTWFjaExvb2t1cCh7ICJjb20uYXBwbGUuY29yZW1lZGlhLnZpZGVv
ZGVjb2RlciJfcywgImNvbS5hcHBsZS50cnVzdGQuYWdlbnQiX3MgfSwgc3RkOjpudWxsb3B0KTsK
KyAgICBpZiAoTWFjQXBwbGljYXRpb246OmlzQXBwbGVNYWlsKCkpIHsKKyAgICAgICAgaWYgKGF1
dG8gdHJ1c3RkRXh0ZW5zaW9uSGFuZGxlID0gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxl
Rm9yTWFjaExvb2t1cCgiY29tLmFwcGxlLnRydXN0ZC5hZ2VudCJfcywgc3RkOjpudWxsb3B0KSkK
KyAgICAgICAgICAgIHBhcmFtZXRlcnMudHJ1c3RkRXh0ZW5zaW9uSGFuZGxlID0gV1RGTW92ZSgq
dHJ1c3RkRXh0ZW5zaW9uSGFuZGxlKTsKKyAgICAgICAgcGFyYW1ldGVycy5yZXN0cmljdEltYWdl
QW5kVmlkZW9EZWNvZGVycyA9IHRydWU7CisgICAgfQogI2Vsc2UKICAgICBwYXJhbWV0ZXJzLnJl
c3RyaWN0SW1hZ2VBbmRWaWRlb0RlY29kZXJzID0gSU9TQXBwbGljYXRpb246OmlzTW9iaWxlTWFp
bCgpIHx8IElPU0FwcGxpY2F0aW9uOjppc01haWxDb21wb3NpdGlvblNlcnZpY2UoKTsKICNlbmRp
ZiAvLyBQTEFURk9STShNQUMpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2Ev
V2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI5MDk5NSkKKysrIFNvdXJjZS9X
ZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkK
QEAgLTY3LDYgKzY3LDcgQEAKICNpbXBvcnQgPFdlYkNvcmUvSGlzdG9yeUNvbnRyb2xsZXIuaD4K
ICNpbXBvcnQgPFdlYkNvcmUvSGlzdG9yeUl0ZW0uaD4KICNpbXBvcnQgPFdlYkNvcmUvSU9TdXJm
YWNlLmg+CisjaW1wb3J0IDxXZWJDb3JlL0ltYWdlRGVjb2RlckNHLmg+CiAjaW1wb3J0IDxXZWJD
b3JlL0xvY2FsaXplZERldmljZU1vZGVsLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0xvY2FsaXplZFN0
cmluZ3MuaD4KICNpbXBvcnQgPFdlYkNvcmUvTG9nSW5pdGlhbGl6YXRpb24uaD4KQEAgLTI4OSwx
MSArMjkwLDE0IEBACiAKICNpZiBIQVZFKFZJREVPX1JFU1RSSUNURURfREVDT0RJTkcpCiAjaWYg
UExBVEZPUk0oTUFDKQotICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShw
YXJhbWV0ZXJzLnZpZGVvRGVjb2RlckV4dGVuc2lvbkhhbmRsZXMpOwotI2VsaWYgVVNFKEFQUExF
X0lOVEVSTkFMX1NESykKLSAgICBpZiAocGFyYW1ldGVycy5yZXN0cmljdEltYWdlQW5kVmlkZW9E
ZWNvZGVycykKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1l
dGVycy50cnVzdGRFeHRlbnNpb25IYW5kbGUpOworI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKKyNp
ZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQorICAgIGlmIChwYXJhbWV0ZXJzLnJlc3RyaWN0SW1h
Z2VBbmRWaWRlb0RlY29kZXJzKSB7CisgICAgICAgIEltYWdlRGVjb2RlckNHOjplbmFibGVSZXN0
cmljdGVkRGVjb2RpbmcoKTsKICAgICAgICAgcmVzdHJpY3RJbWFnZUFuZFZpZGVvRGVjb2RlcnMo
KTsKLSNlbmRpZiAvLyBQTEFURk9STShNQUMpCisgICAgfQorI2VuZGlmCiAjZW5kaWYgLy8gSEFW
RShWSURFT19SRVNUUklDVEVEX0RFQ09ESU5HKQogCiAgICAgLy8gRGlzYWJsZSBOU1VSTENhY2hl
LgpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNi
LmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2Vi
UHJvY2Vzcy5zYi5pbgkocmV2aXNpb24gMjkwOTk1KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9j
ZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xNDEwLDYg
KzE0MTAsMTEgQEAKICkpCiAjZW5kaWYKIAorKGFsbG93IG1hY2gtbG9va3VwCisgICAgKHJlcXVp
cmUtYWxsCisgICAgICAgIChleHRlbnNpb24gImNvbS5hcHBsZS53ZWJraXQuZXh0ZW5zaW9uLm1h
Y2giKQorICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS50cnVzdGQuYWdlbnQiKSkpCisK
IDs7IFZhcmlvdXMgc2VydmljZXMgcmVxdWlyZWQgYnkgQXBwS2l0IGFuZCBvdGhlciBmcmFtZXdv
cmtzCiAoYWxsb3cgbWFjaC1sb29rdXAKICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5s
b2dkIikK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>454398</attachid>
            <date>2022-03-10 14:10:45 -0800</date>
            <delta_ts>2022-03-11 14:14:47 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>237717.patch</filename>
            <type>text/plain</type>
            <size>10656</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI5MTEzMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAzLTEwICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIEltYWdlIGRl
Y29kZXJzIHNob3VsZCBiZSByZXN0cmljdGVkIGZvciBNYWlsCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc3MTcKKyAgICAgICAgPHJkYXI6Ly84OTgy
NzczMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBP
bmx5IGFkZCByZXN0cmljdGVkIGRlY29kaW5nIGZsYWcgd2hlbiBpdCBpcyBleHBsaWNpdGx5IHJl
cXVlc3RlZC4KKworICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoK
KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZURlY29kZXJDRy5jcHA6CisgICAg
ICAgIChXZWJDb3JlOjpjcmVhdGVJbWFnZVNvdXJjZU9wdGlvbnMpOgorICAgICAgICAoV2ViQ29y
ZTo6SW1hZ2VEZWNvZGVyQ0c6OmVuYWJsZVJlc3RyaWN0ZWREZWNvZGluZyk6CisgICAgICAgIChX
ZWJDb3JlOjpJbWFnZURlY29kZXJDRzo6cmVzdHJpY3RlZERlY29kaW5nRW5hYmxlZCk6CisgICAg
ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VEZWNvZGVyQ0cuaDoKKwogMjAyMi0wMy0x
MCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBbd2ViLWFu
aW1hdGlvbnNdIG1hc2stY2xpcCBzaG91bGQgc3VwcG9ydCBkaXNjcmV0ZSBhbmltYXRpb24KSW5k
ZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy
b2oJKHJldmlzaW9uIDI5MTEzMikKKysrIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9q
L3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMTkwMiw3ICsxOTAyLDcgQEAKIAkJ
NTU0Njc1N0IxRkQyMTJBOTAwM0IxMEIwIC8qIEltYWdlU291cmNlLmggaW4gSGVhZGVycyAqLyA9
IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1NTQ2NzU3ODFGRDFGQzFBMDAzQjEwQjAg
LyogSW1hZ2VTb3VyY2UuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCAp
OyB9OyB9OwogCQk1NTUwQ0I0MjFFOTU1RTNDMDAxMTFBQTAgLyogSW1hZ2VUeXBlcy5oIGluIEhl
YWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTU1MENCNDExRTk1NUUz
QzAwMTExQUEwIC8qIEltYWdlVHlwZXMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQ
cml2YXRlLCApOyB9OyB9OwogCQk1NTUxMzAwMTFFN0NDQ0NCMDBBNjlFMzggLyogRGVjb2RpbmdP
cHRpb25zLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1
NTUxMzAwMDFFN0NDQ0NBMDBBNjlFMzggLyogRGVjb2RpbmdPcHRpb25zLmggKi87IHNldHRpbmdz
ID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKLQkJNTU1Qjg3RUQxQ0FBRjBBQjAw
MzQ5NDI1IC8qIEltYWdlRGVjb2RlckNHLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls
ZEZpbGU7IGZpbGVSZWYgPSA1NTVCODdFQjFDQUFGMEFCMDAzNDk0MjUgLyogSW1hZ2VEZWNvZGVy
Q0cuaCAqLzsgfTsKKwkJNTU1Qjg3RUQxQ0FBRjBBQjAwMzQ5NDI1IC8qIEltYWdlRGVjb2RlckNH
LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1NTVCODdF
QjFDQUFGMEFCMDAzNDk0MjUgLyogSW1hZ2VEZWNvZGVyQ0cuaCAqLzsgc2V0dGluZ3MgPSB7QVRU
UklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk1NTZDN0M0QjIyMTIzOTk3MDA5QjA2Q0Eg
LyogUmVuZGVyaW5nVXBkYXRlU2NoZWR1bGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC
dWlsZEZpbGU7IGZpbGVSZWYgPSA1NTZDN0M0NzIyMTIzOTQyMDA5QjA2Q0EgLyogUmVuZGVyaW5n
VXBkYXRlU2NoZWR1bGVyLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwg
KTsgfTsgfTsKIAkJNTU3NkE1NjUxRDg4QTcwODAwQ0NDMDRDIC8qIEltYWdlRnJhbWUuaCBpbiBI
ZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDU1NzZBNTYzMUQ4OEE3
MDgwMENDQzA0QyAvKiBJbWFnZUZyYW1lLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAo
UHJpdmF0ZSwgKTsgfTsgfTsKIAkJNTU4NDc2NUEyNDUzRjMzNDAwOUY1NTBDIC8qIFJlZHVjZWRS
ZXNvbHV0aW9uU2Vjb25kcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm
aWxlUmVmID0gNTU4NDc2NTgyNDUzQUJDMjAwOUY1NTBDIC8qIFJlZHVjZWRSZXNvbHV0aW9uU2Vj
b25kcy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07Cklu
ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZURlY29kZXJDRy5j
cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1h
Z2VEZWNvZGVyQ0cuY3BwCShyZXZpc2lvbiAyOTExMzIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9jZy9JbWFnZURlY29kZXJDRy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY3
LDcgKzY3LDggQEAKICAgICBDRkRpY3Rpb25hcnlTZXRWYWx1ZShvcHRpb25zLmdldCgpLCBrQ0dJ
bWFnZVNvdXJjZVNob3VsZFByZWZlclJHQjMyLCBrQ0ZCb29sZWFuVHJ1ZSk7CiAgICAgQ0ZEaWN0
aW9uYXJ5U2V0VmFsdWUob3B0aW9ucy5nZXQoKSwga0NHSW1hZ2VTb3VyY2VTa2lwTWV0YWRhdGEs
IGtDRkJvb2xlYW5UcnVlKTsKICNpZiBIQVZFKElNQUdFX1JFU1RSSUNURURfREVDT0RJTkcpICYm
IFVTRShBUFBMRV9JTlRFUk5BTF9TREspCi0gICAgQ0ZEaWN0aW9uYXJ5U2V0VmFsdWUob3B0aW9u
cy5nZXQoKSwga0NHSW1hZ2VTb3VyY2VFbmFibGVSZXN0cmljdGVkRGVjb2RpbmcsIGtDRkJvb2xl
YW5UcnVlKTsKKyAgICBpZiAoSW1hZ2VEZWNvZGVyQ0c6OnJlc3RyaWN0ZWREZWNvZGluZ0VuYWJs
ZWQoKSkKKyAgICAgICAgQ0ZEaWN0aW9uYXJ5U2V0VmFsdWUob3B0aW9ucy5nZXQoKSwga0NHSW1h
Z2VTb3VyY2VFbmFibGVSZXN0cmljdGVkRGVjb2RpbmcsIGtDRkJvb2xlYW5UcnVlKTsKICNlbmRp
ZgogICAgIHJldHVybiBvcHRpb25zOwogfQpAQCAtMjU0LDYgKzI1NSw4IEBACiB9CiAjZW5kaWYK
IAorYm9vbCBJbWFnZURlY29kZXJDRzo6bV9lbmFibGVSZXN0cmljdGVkRGVjb2RpbmcgPSBmYWxz
ZTsKKwogSW1hZ2VEZWNvZGVyQ0c6OkltYWdlRGVjb2RlckNHKEZyYWdtZW50ZWRTaGFyZWRCdWZm
ZXImIGRhdGEsIEFscGhhT3B0aW9uLCBHYW1tYUFuZENvbG9yUHJvZmlsZU9wdGlvbikKIHsKICAg
ICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHV0aUhpbnQ7CkBAIC01OTQsNiArNTk3LDE2IEBACiAg
ICAgcmV0dXJuIE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZShtaW1l
VHlwZSk7CiB9CiAKK3ZvaWQgSW1hZ2VEZWNvZGVyQ0c6OmVuYWJsZVJlc3RyaWN0ZWREZWNvZGlu
ZygpCit7CisgICAgbV9lbmFibGVSZXN0cmljdGVkRGVjb2RpbmcgPSB0cnVlOwogfQogCitib29s
IEltYWdlRGVjb2RlckNHOjpyZXN0cmljdGVkRGVjb2RpbmdFbmFibGVkKCkKK3sKKyAgICByZXR1
cm4gbV9lbmFibGVSZXN0cmljdGVkRGVjb2Rpbmc7Cit9CisKK30KKwogI2VuZGlmIC8vIFVTRShD
RykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlRGVjb2Rl
ckNHLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cv
SW1hZ2VEZWNvZGVyQ0cuaAkocmV2aXNpb24gMjkxMTMyKQorKysgU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VEZWNvZGVyQ0cuaAkod29ya2luZyBjb3B5KQpAQCAtNjgs
MTAgKzY4LDE0IEBACiAgICAgYm9vbCBpc0FsbERhdGFSZWNlaXZlZCgpIGNvbnN0IGZpbmFsIHsg
cmV0dXJuIG1faXNBbGxEYXRhUmVjZWl2ZWQ7IH0KICAgICB2b2lkIGNsZWFyRnJhbWVCdWZmZXJD
YWNoZShzaXplX3QpIGZpbmFsIHsgfQogCisgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIHZvaWQg
ZW5hYmxlUmVzdHJpY3RlZERlY29kaW5nKCk7CisgICAgc3RhdGljIGJvb2wgcmVzdHJpY3RlZERl
Y29kaW5nRW5hYmxlZCgpOworCiBwcml2YXRlOgogICAgIGJvb2wgbV9pc0FsbERhdGFSZWNlaXZl
ZCB7IGZhbHNlIH07CiAgICAgbXV0YWJsZSBFbmNvZGVkRGF0YVN0YXR1cyBtX2VuY29kZWREYXRh
U3RhdHVzIHsgRW5jb2RlZERhdGFTdGF0dXM6OlVua25vd24gfTsKICAgICBSZXRhaW5QdHI8Q0dJ
bWFnZVNvdXJjZVJlZj4gbV9uYXRpdmVEZWNvZGVyOworICAgIHN0YXRpYyBib29sIG1fZW5hYmxl
UmVzdHJpY3RlZERlY29kaW5nOwogfTsKIAogfQpJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VM
b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDI5MTEz
MikKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs
MjMgQEAKKzIwMjItMDMtMTAgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgor
CisgICAgICAgIFttYWNPU10gSW1hZ2UgZGVjb2RlcnMgc2hvdWxkIGJlIHJlc3RyaWN0ZWQgZm9y
IE1haWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz
NzcxNworICAgICAgICA8cmRhcjovLzg5ODI3NzMzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGFscmVhZHkgcmVzdHJpY3QgaW1hZ2UgZGVjb2Rl
cnMgZm9yIE1haWwgb24gaU9TLiBXZSBzaG91bGQgZG8gc28gb24gbWFjT1MgdG9vLgorCisgICAg
ICAgICogU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAo
V2ViS2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUgY29uc3QpOgorICAg
ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAg
ICAgICAqIFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICog
VUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6
OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAg
KiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6
V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgICogV2Vi
UHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vzcy5zYi5pbjoKKwogMjAyMi0wMy0xMCAgSmVhbi1Z
dmVzIEF2ZW5hcmQgIDxqeWFAYXBwbGUuY29tPgogCiAgICAgICAgIE1lZGlhU2FtcGxlQ3Vyc29y
IHNob3VsZCBpdGVyYXRlIG92ZXIgdGhlIHNhbXBsZXMgY29udGFpbmVkIGluIHRoZSBNZWRpYVNh
bXBsZXNCbG9jawpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9u
UGFyYW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJv
Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9uIDI5MTEzMikKKysrIFNvdXJjZS9X
ZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCSh3b3JraW5nIGNv
cHkpCkBAIC0xNjcsNyArMTY3LDcgQEAKIAogI2lmIEhBVkUoVklERU9fUkVTVFJJQ1RFRF9ERUNP
RElORykKICNpZiBQTEFURk9STShNQUMpCi0gICAgZW5jb2RlciA8PCB2aWRlb0RlY29kZXJFeHRl
bnNpb25IYW5kbGVzOworICAgIGVuY29kZXIgPDwgdHJ1c3RkRXh0ZW5zaW9uSGFuZGxlOwogI2Vu
ZGlmCiAgICAgZW5jb2RlciA8PCByZXN0cmljdEltYWdlQW5kVmlkZW9EZWNvZGVyczsKICNlbmRp
ZgpAQCAtNDcwLDExICs0NzAsMTEgQEAKIAogI2lmIEhBVkUoVklERU9fUkVTVFJJQ1RFRF9ERUNP
RElORykKICNpZiBQTEFURk9STShNQUMpCi0gICAgc3RkOjpvcHRpb25hbDxWZWN0b3I8U2FuZGJv
eEV4dGVuc2lvbjo6SGFuZGxlPj4gdmlkZW9EZWNvZGVyRXh0ZW5zaW9uSGFuZGxlczsKLSAgICBk
ZWNvZGVyID4+IHZpZGVvRGVjb2RlckV4dGVuc2lvbkhhbmRsZXM7Ci0gICAgaWYgKCF2aWRlb0Rl
Y29kZXJFeHRlbnNpb25IYW5kbGVzKQorICAgIHN0ZDo6b3B0aW9uYWw8U2FuZGJveEV4dGVuc2lv
bjo6SGFuZGxlPiB0cnVzdGRFeHRlbnNpb25IYW5kbGU7CisgICAgZGVjb2RlciA+PiB0cnVzdGRF
eHRlbnNpb25IYW5kbGU7CisgICAgaWYgKCF0cnVzdGRFeHRlbnNpb25IYW5kbGUpCiAgICAgICAg
IHJldHVybiBmYWxzZTsKLSAgICBwYXJhbWV0ZXJzLnZpZGVvRGVjb2RlckV4dGVuc2lvbkhhbmRs
ZXMgPSBXVEZNb3ZlKCp2aWRlb0RlY29kZXJFeHRlbnNpb25IYW5kbGVzKTsKKyAgICBwYXJhbWV0
ZXJzLnRydXN0ZEV4dGVuc2lvbkhhbmRsZSA9IFdURk1vdmUoKnRydXN0ZEV4dGVuc2lvbkhhbmRs
ZSk7CiAjZW5kaWYKICAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IHJlc3RyaWN0SW1hZ2VBbmRWaWRl
b0RlY29kZXJzOwogICAgIGRlY29kZXIgPj4gcmVzdHJpY3RJbWFnZUFuZFZpZGVvRGVjb2RlcnM7
CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJz
LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9u
UGFyYW1ldGVycy5oCShyZXZpc2lvbiAyOTExMzIpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9X
ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTIwOSw3ICsy
MDksNyBAQAogICAgIHN0ZDo6b3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiBsYXVu
Y2hTZXJ2aWNlc0V4dGVuc2lvbkhhbmRsZTsKICNpZiBIQVZFKFZJREVPX1JFU1RSSUNURURfREVD
T0RJTkcpCiAjaWYgUExBVEZPUk0oTUFDKQotICAgIFZlY3RvcjxTYW5kYm94RXh0ZW5zaW9uOjpI
YW5kbGU+IHZpZGVvRGVjb2RlckV4dGVuc2lvbkhhbmRsZXM7CisgICAgU2FuZGJveEV4dGVuc2lv
bjo6SGFuZGxlIHRydXN0ZEV4dGVuc2lvbkhhbmRsZTsKICNlbmRpZgogICAgIGJvb2wgcmVzdHJp
Y3RJbWFnZUFuZFZpZGVvRGVjb2RlcnMgeyBmYWxzZSB9OwogI2VuZGlmCkluZGV4OiBTb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0J
KHJldmlzaW9uIDI5MTEzMikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBy
b2Nlc3NQb29sQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTQ0NSw4ICs0NDUsMTEgQEAKIAog
I2lmIEhBVkUoVklERU9fUkVTVFJJQ1RFRF9ERUNPRElORykKICNpZiBQTEFURk9STShNQUMpCi0g
ICAgaWYgKE1hY0FwcGxpY2F0aW9uOjppc0FwcGxlTWFpbCgpKQotICAgICAgICBwYXJhbWV0ZXJz
LnZpZGVvRGVjb2RlckV4dGVuc2lvbkhhbmRsZXMgPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVI
YW5kbGVzRm9yTWFjaExvb2t1cCh7ICJjb20uYXBwbGUuY29yZW1lZGlhLnZpZGVvZGVjb2RlciJf
cywgImNvbS5hcHBsZS50cnVzdGQuYWdlbnQiX3MgfSwgc3RkOjpudWxsb3B0KTsKKyAgICBpZiAo
TWFjQXBwbGljYXRpb246OmlzQXBwbGVNYWlsKCkpIHsKKyAgICAgICAgaWYgKGF1dG8gdHJ1c3Rk
RXh0ZW5zaW9uSGFuZGxlID0gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yTWFjaExv
b2t1cCgiY29tLmFwcGxlLnRydXN0ZC5hZ2VudCJfcywgc3RkOjpudWxsb3B0KSkKKyAgICAgICAg
ICAgIHBhcmFtZXRlcnMudHJ1c3RkRXh0ZW5zaW9uSGFuZGxlID0gV1RGTW92ZSgqdHJ1c3RkRXh0
ZW5zaW9uSGFuZGxlKTsKKyAgICAgICAgcGFyYW1ldGVycy5yZXN0cmljdEltYWdlQW5kVmlkZW9E
ZWNvZGVycyA9IHRydWU7CisgICAgfQogI2Vsc2UKICAgICBwYXJhbWV0ZXJzLnJlc3RyaWN0SW1h
Z2VBbmRWaWRlb0RlY29kZXJzID0gSU9TQXBwbGljYXRpb246OmlzTW9iaWxlTWFpbCgpIHx8IElP
U0FwcGxpY2F0aW9uOjppc01haWxDb21wb3NpdGlvblNlcnZpY2UoKTsKICNlbmRpZiAvLyBQTEFU
Rk9STShNQUMpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vz
c0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9X
ZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI5MTEzMikKKysrIFNvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTY3LDYg
KzY3LDcgQEAKICNpbXBvcnQgPFdlYkNvcmUvSGlzdG9yeUNvbnRyb2xsZXIuaD4KICNpbXBvcnQg
PFdlYkNvcmUvSGlzdG9yeUl0ZW0uaD4KICNpbXBvcnQgPFdlYkNvcmUvSU9TdXJmYWNlLmg+Cisj
aW1wb3J0IDxXZWJDb3JlL0ltYWdlRGVjb2RlckNHLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0xvY2Fs
aXplZERldmljZU1vZGVsLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0xvY2FsaXplZFN0cmluZ3MuaD4K
ICNpbXBvcnQgPFdlYkNvcmUvTG9nSW5pdGlhbGl6YXRpb24uaD4KQEAgLTI4OSwxMSArMjkwLDE0
IEBACiAKICNpZiBIQVZFKFZJREVPX1JFU1RSSUNURURfREVDT0RJTkcpCiAjaWYgUExBVEZPUk0o
TUFDKQotICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJhbWV0ZXJz
LnZpZGVvRGVjb2RlckV4dGVuc2lvbkhhbmRsZXMpOwotI2VsaWYgVVNFKEFQUExFX0lOVEVSTkFM
X1NESykKLSAgICBpZiAocGFyYW1ldGVycy5yZXN0cmljdEltYWdlQW5kVmlkZW9EZWNvZGVycykK
KyAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy50cnVz
dGRFeHRlbnNpb25IYW5kbGUpOworI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKKyNpZiBVU0UoQVBQ
TEVfSU5URVJOQUxfU0RLKQorICAgIGlmIChwYXJhbWV0ZXJzLnJlc3RyaWN0SW1hZ2VBbmRWaWRl
b0RlY29kZXJzKSB7CisgICAgICAgIEltYWdlRGVjb2RlckNHOjplbmFibGVSZXN0cmljdGVkRGVj
b2RpbmcoKTsKICAgICAgICAgcmVzdHJpY3RJbWFnZUFuZFZpZGVvRGVjb2RlcnMoKTsKLSNlbmRp
ZiAvLyBQTEFURk9STShNQUMpCisgICAgfQorI2VuZGlmCiAjZW5kaWYgLy8gSEFWRShWSURFT19S
RVNUUklDVEVEX0RFQ09ESU5HKQogCiAgICAgLy8gRGlzYWJsZSBOU1VSTENhY2hlLgpJbmRleDog
U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vzcy5z
Yi5pbgkocmV2aXNpb24gMjkxMTMyKQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5h
cHBsZS5XZWJQcm9jZXNzLnNiLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xNDEwLDYgKzE0MTAsMTEg
QEAKICkpCiAjZW5kaWYKIAorKGFsbG93IG1hY2gtbG9va3VwCisgICAgKHJlcXVpcmUtYWxsCisg
ICAgICAgIChleHRlbnNpb24gImNvbS5hcHBsZS53ZWJraXQuZXh0ZW5zaW9uLm1hY2giKQorICAg
ICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS50cnVzdGQuYWdlbnQiKSkpCisKIDs7IFZhcmlv
dXMgc2VydmljZXMgcmVxdWlyZWQgYnkgQXBwS2l0IGFuZCBvdGhlciBmcmFtZXdvcmtzCiAoYWxs
b3cgbWFjaC1sb29rdXAKICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5sb2dkIikK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>454514</attachid>
            <date>2022-03-11 14:58:30 -0800</date>
            <delta_ts>2022-03-11 19:17:09 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-237717-20220311145830.patch</filename>
            <type>text/plain</type>
            <size>2331</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI5MTE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAzLTExICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIEltYWdlIGRl
Y29kZXJzIHNob3VsZCBiZSByZXN0cmljdGVkIGZvciBNYWlsCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc3MTcKKyAgICAgICAgPHJkYXI6Ly84OTgy
NzczMz4KKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4KKworICAgICAgICBV
c2UgY29ycmVjdCBwcmVmaXggZm9yIHN0YXRpYyBtZW1iZXIuCisKKyAgICAgICAgKiBwbGF0Zm9y
bS9ncmFwaGljcy9jZy9JbWFnZURlY29kZXJDRy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFn
ZURlY29kZXJDRzo6ZW5hYmxlUmVzdHJpY3RlZERlY29kaW5nKToKKyAgICAgICAgKFdlYkNvcmU6
OkltYWdlRGVjb2RlckNHOjpyZXN0cmljdGVkRGVjb2RpbmdFbmFibGVkKToKKyAgICAgICAgKiBw
bGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZURlY29kZXJDRy5oOgorCiAyMDIyLTAzLTExICBQZXIg
QXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjT1NdIEltYWdl
IGRlY29kZXJzIHNob3VsZCBiZSByZXN0cmljdGVkIGZvciBNYWlsCkluZGV4OiBTb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZURlY29kZXJDRy5jcHAKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VEZWNvZGVyQ0cuY3Bw
CShyZXZpc2lvbiAyOTExOTMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j
Zy9JbWFnZURlY29kZXJDRy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1NSw3ICsyNTUsNyBAQCB2
b2lkIHNoYXJlZEJ1ZmZlclJlbGVhc2Uodm9pZCogaW5mbykKIH0KICNlbmRpZgogCi1ib29sIElt
YWdlRGVjb2RlckNHOjptX2VuYWJsZVJlc3RyaWN0ZWREZWNvZGluZyA9IGZhbHNlOworYm9vbCBJ
bWFnZURlY29kZXJDRzo6c19lbmFibGVSZXN0cmljdGVkRGVjb2RpbmcgPSBmYWxzZTsKIAogSW1h
Z2VEZWNvZGVyQ0c6OkltYWdlRGVjb2RlckNHKEZyYWdtZW50ZWRTaGFyZWRCdWZmZXImIGRhdGEs
IEFscGhhT3B0aW9uLCBHYW1tYUFuZENvbG9yUHJvZmlsZU9wdGlvbikKIHsKQEAgLTU5OSwxMiAr
NTk5LDEyIEBAIGJvb2wgSW1hZ2VEZWNvZGVyQ0c6OmNhbkRlY29kZVR5cGUoY29uc3QKIAogdm9p
ZCBJbWFnZURlY29kZXJDRzo6ZW5hYmxlUmVzdHJpY3RlZERlY29kaW5nKCkKIHsKLSAgICBtX2Vu
YWJsZVJlc3RyaWN0ZWREZWNvZGluZyA9IHRydWU7CisgICAgc19lbmFibGVSZXN0cmljdGVkRGVj
b2RpbmcgPSB0cnVlOwogfQogCiBib29sIEltYWdlRGVjb2RlckNHOjpyZXN0cmljdGVkRGVjb2Rp
bmdFbmFibGVkKCkKIHsKLSAgICByZXR1cm4gbV9lbmFibGVSZXN0cmljdGVkRGVjb2Rpbmc7Cisg
ICAgcmV0dXJuIHNfZW5hYmxlUmVzdHJpY3RlZERlY29kaW5nOwogfQogCiB9CkluZGV4OiBTb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZURlY29kZXJDRy5oCj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlRGVjb2RlckNH
LmgJKHJldmlzaW9uIDI5MTE5MykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L2NnL0ltYWdlRGVjb2RlckNHLmgJKHdvcmtpbmcgY29weSkKQEAgLTc1LDcgKzc1LDcgQEAgcHJp
dmF0ZToKICAgICBib29sIG1faXNBbGxEYXRhUmVjZWl2ZWQgeyBmYWxzZSB9OwogICAgIG11dGFi
bGUgRW5jb2RlZERhdGFTdGF0dXMgbV9lbmNvZGVkRGF0YVN0YXR1cyB7IEVuY29kZWREYXRhU3Rh
dHVzOjpVbmtub3duIH07CiAgICAgUmV0YWluUHRyPENHSW1hZ2VTb3VyY2VSZWY+IG1fbmF0aXZl
RGVjb2RlcjsKLSAgICBzdGF0aWMgYm9vbCBtX2VuYWJsZVJlc3RyaWN0ZWREZWNvZGluZzsKKyAg
ICBzdGF0aWMgYm9vbCBzX2VuYWJsZVJlc3RyaWN0ZWREZWNvZGluZzsKIH07CiAKIH0K
</data>

          </attachment>
      

    </bug>

</bugzilla>