') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); [release/7.0] Fix WXORX issue in EEClass::Destruct by github-actions[bot] · Pull Request #79703 · dotnet/runtime · GitHub
Skip to content

[release/7.0] Fix WXORX issue in EEClass::Destruct - #79703

Merged
carlossanlop merged 1 commit into
release/7.0from
backport/pr-79696-to-release/7.0
Jan 5, 2023
Merged

[release/7.0] Fix WXORX issue in EEClass::Destruct#79703
carlossanlop merged 1 commit into
release/7.0from
backport/pr-79696-to-release/7.0

Conversation

@github-actions

@github-actionsgithub-actionsBot commented Dec 15, 2022•
edited by janvorli
Loading

Copy link
Copy Markdown
Contributor

Backport of #79696 to release/7.0

/cc @janvorli

Customer Impact

.NET runtime with W^X enabled crashes with access violation when unloading code that uses delegates set to instance methods that require return buffer for their return value.

Testing

coreclr tests executed in unloadable assembly load context.

Risk

Low, the location that the fix modifies would always crash with AV with W^X and the change is effectively no-op with W^X disabled.

@janvorli
Fix WXORX issue in EEClass::Destruct
9d59b97
While investigating failures of some coreclr tests when running in an
unloadable context, I've hit AV in EEClass::Destruct in one of the
tests. The reason is that we are missing ExecutableWriterHolder when
updating refCount on pDelegateEEClass->m_pInstRetBuffCallStub.
This change fixes it.
@ghostghost added the area-VM-coreclr label Dec 15, 2022
@janvorlijanvorli added this to the 7.0.x milestone Dec 15, 2022
@janvorlijanvorli self-assigned this Dec 15, 2022
@janvorli
janvorli requested a review from jkotasDecember 15, 2022 14:25
@janvorlijanvorli added the Servicing-consider Issue for next servicing release review label Dec 15, 2022
@runfoapprunfoappBot mentioned this pull request Dec 15, 2022
Closed
jeffschwMSFT
jeffschwMSFT approved these changes Dec 16, 2022
View reviewed changes

@jeffschwMSFTjeffschwMSFT left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved. we will take for consideration in 7.0.x

@rbhandarbhanda modified the milestones: 7.0.x, 7.0.3Jan 5, 2023
@rbhandarbhanda added Servicing-approved Approved for servicing release and removed Servicing-consider Issue for next servicing release review labels Jan 5, 2023
@carlossanlop

carlossanlop commented Jan 5, 2023

Copy link
Copy Markdown
Contributor

@janvorli@jkotas can you please take a look at the CI failures?

@jkotas

jkotas commented Jan 5, 2023

Copy link
Copy Markdown
Member

This is CoreCLR-specific change. All CI failures are in Mono and thus unrelated.

@carlossanlop

carlossanlop commented Jan 5, 2023

Copy link
Copy Markdown
Contributor

Approved by Tactics (7.0.3).
Signed off by area owners.
No OOB changes needed.
CI failures unrelated.
Ready to merge. :shipit:

@carlossanlop
carlossanlop merged commit c79f847 into release/7.0Jan 5, 2023
@carlossanlop
carlossanlop deleted the backport/pr-79696-to-release/7.0 branch January 5, 2023 19:44
@ghostghost locked as resolved and limited conversation to collaborators Feb 5, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jkotasjkotasjkotas approved these changes
@jeffschwMSFTjeffschwMSFTjeffschwMSFT approved these changes

Assignees

@janvorlijanvorli

Labels

area-VM-coreclrServicing-approvedApproved for servicing release

Projects

None yet

Milestone

7.0.3

Development

Successfully merging this pull request may close these issues.

5 participants

@carlossanlop@jkotas@jeffschwMSFT@janvorli@rbhanda