From unknown Thu Aug 14 21:44:34 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#73735 <73735@debbugs.gnu.org> To: bug#73735 <73735@debbugs.gnu.org> Subject: Status: [PATCH] gnu: librewolf: Fix CVE-2024-9680. Reply-To: bug#73735 <73735@debbugs.gnu.org> Date: Fri, 15 Aug 2025 04:44:34 +0000 retitle 73735 [PATCH] gnu: librewolf: Fix CVE-2024-9680. reassign 73735 guix-patches submitter 73735 Hilton Chain severity 73735 normal tag 73735 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 10 11:48:44 2024 Received: (at submit) by debbugs.gnu.org; 10 Oct 2024 15:48:44 +0000 Received: from localhost ([127.0.0.1]:60250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1syvP9-0000zT-1S for submit@debbugs.gnu.org; Thu, 10 Oct 2024 11:48:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:33044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1syvP5-0000zK-PF for submit@debbugs.gnu.org; Thu, 10 Oct 2024 11:48:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1syvOt-0003jj-7T for guix-patches@gnu.org; Thu, 10 Oct 2024 11:48:27 -0400 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1syvOq-0000M8-Cv for guix-patches@gnu.org; Thu, 10 Oct 2024 11:48:26 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1728575298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dLtMYsXk2x2LakDtgqxiKbYrS0LltU+abJaURGgfzAQ=; b=s5CXMMQHSH8jpPuJh8CrQKz+I6rAsimnTQlNeaULo9awS3vnpEhaaGiofB50f9TTVhzfb2 7qav8ecLB+ZQz+BpjM4o59S8W0N5kA08+RqO4902O7tEF0su/b6uBMMSriNSujnNnPap3K Xd/6Czx8bl7s/f08I/XBR4IuCYkH+QQ9Z5hMXMgIkfbv+Zcc4KwTp0vDJvkyg0gFYEM7CL e0UjKIJANv2E3z6X93JH7RZpkRD1rRDeNsu5w+hrE0VhC/O1f+160rfHc5ytMeo2BK35I4 gCQq7pS7aK1u39LCeIGjXsnpcwYK8zAQagY/oEUKV8dkOsoOPS/5UntCEmtEgQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: guix-patches@gnu.org Subject: [PATCH] gnu: librewolf: Fix CVE-2024-9680. Date: Thu, 10 Oct 2024 23:43:25 +0800 Message-ID: MIME-Version: 1.0 X-Debbugs-Cc: André Batista , Clément Lassieur , Jonathan Brielmaier , Mark H Weaver Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/patches/librewolf-CVE-2024-9680.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/librewolf.scm (librewolf)[source]: Add it. (%librewolf-build-id): Update. Change-Id: Ib32888db1f62eae33f025d034d234a930804f14e --- gnu/local.mk | 1 + gnu/packages/librewolf.scm | 5 +- .../patches/librewolf-CVE-2024-9680.patch | 244 ++++++++++++++++++ 3 files changed, 248 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/librewolf-CVE-2024-9680.patch diff --git a/gnu/local.mk b/gnu/local.mk index 05a8716063..06e8910162 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1607,6 +1607,7 @@ dist_patch_DATA = \ %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \ %D%/packages/patches/libguestfs-syms.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ + %D%/packages/patches/librewolf-CVE-2024-9680.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/lightdm-arguments-ordering.patch \ diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index 31de7a7171..f27f49a041 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -212,7 +212,7 @@ (define rust-librewolf rust) ; 1.75 is the default in Guix, 1.65 is the minimum. ;; Update this id with every update to its release date. ;; It's used for cache validation and therefore can lead to strange bugs. ;; ex: date '+%Y%m%d%H%M%S' -(define %librewolf-build-id "20241005085731") +(define %librewolf-build-id "20241010232659") (define-public librewolf (package @@ -223,7 +223,8 @@ (define-public librewolf (inherit (make-librewolf-source #:version version #:firefox-hash "0w4z3fq5zhm63a0wmhvmqrj263bvy962dir25q3z0x5hx6hjawh2" - #:librewolf-hash "0f80pihn375bdjhjmmg2v1w96wpn76zb60ycy39wafwh1dnzybrd")))) + #:librewolf-hash "0f80pihn375bdjhjmmg2v1w96wpn76zb60ycy39wafwh1dnzybrd")) + (patches (search-patches "librewolf-CVE-2024-9680.patch")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/patches/librewolf-CVE-2024-9680.patch b/gnu/packages/patches/librewolf-CVE-2024-9680.patch new file mode 100644 index 0000000000..0469823fbc --- /dev/null +++ b/gnu/packages/patches/librewolf-CVE-2024-9680.patch @@ -0,0 +1,244 @@ +Patch fetched from https://hg.mozilla.org/releases/mozilla-release/rev/d2a21d941ed5a73a37b3446caa4a49e74ffe854b + +# HG changeset patch +# User Emilio Cobos Álvarez +# Date 1728404712 0 +# Node ID d2a21d941ed5a73a37b3446caa4a49e74ffe854b +# Parent ca8fc4093e5d03c1a9e4482a95409d59cbafb017 +Bug 1923344 - r=smaug, a=dsmith + +Differential Revision: https://phabricator.services.mozilla.com/D224958 + +diff --git a/dom/animation/AnimationTimeline.cpp b/dom/animation/AnimationTimeline.cpp +--- a/dom/animation/AnimationTimeline.cpp ++++ b/dom/animation/AnimationTimeline.cpp +@@ -35,71 +35,64 @@ AnimationTimeline::AnimationTimeline(nsI + MOZ_ASSERT(mWindow); + } + + AnimationTimeline::~AnimationTimeline() { mAnimationOrder.clear(); } + + bool AnimationTimeline::Tick(TickState& aState) { + bool needsTicks = false; + +- nsTArray animationsToRemove; +- +- for (Animation* animation = mAnimationOrder.getFirst(); animation; +- animation = +- static_cast*>(animation)->getNext()) { ++ AutoTArray, 32> animationsToTick; ++ for (Animation* animation : mAnimationOrder) { + MOZ_ASSERT(mAnimations.Contains(animation), + "The sampling order list should be a subset of the hashset"); + MOZ_ASSERT(!animation->IsHiddenByContentVisibility(), + "The sampling order list should not contain any animations " + "that are hidden by content-visibility"); ++ animationsToTick.AppendElement(animation); ++ } + ++ for (Animation* animation : animationsToTick) { + // Skip any animations that are longer need associated with this timeline. + if (animation->GetTimeline() != this) { +- // If animation has some other timeline, it better not be also in the +- // animation list of this timeline object! +- MOZ_ASSERT(!animation->GetTimeline()); +- animationsToRemove.AppendElement(animation); ++ RemoveAnimation(animation); + continue; + } + + needsTicks |= animation->NeedsTicks(); +- // Even if |animation| doesn't need future ticks, we should still +- // Tick it this time around since it might just need a one-off tick in +- // order to dispatch events. ++ // Even if |animation| doesn't need future ticks, we should still Tick it ++ // this time around since it might just need a one-off tick in order to ++ // queue events. + animation->Tick(aState); +- + if (!animation->NeedsTicks()) { +- animationsToRemove.AppendElement(animation); ++ RemoveAnimation(animation); + } + } + +- for (Animation* animation : animationsToRemove) { +- RemoveAnimation(animation); +- } +- + return needsTicks; + } + + void AnimationTimeline::NotifyAnimationUpdated(Animation& aAnimation) { + if (mAnimations.EnsureInserted(&aAnimation)) { + if (aAnimation.GetTimeline() && aAnimation.GetTimeline() != this) { + aAnimation.GetTimeline()->RemoveAnimation(&aAnimation); + } + if (!aAnimation.IsHiddenByContentVisibility()) { + mAnimationOrder.insertBack(&aAnimation); + } + } + } + + void AnimationTimeline::RemoveAnimation(Animation* aAnimation) { +- MOZ_ASSERT(!aAnimation->GetTimeline() || aAnimation->GetTimeline() == this); +- if (static_cast*>(aAnimation)->isInList()) { ++ if (static_cast*>(aAnimation)->isInList() && ++ MOZ_LIKELY(!aAnimation->GetTimeline() || ++ aAnimation->GetTimeline() == this)) { ++ static_cast*>(aAnimation)->remove(); + MOZ_ASSERT(mAnimations.Contains(aAnimation), + "The sampling order list should be a subset of the hashset"); +- static_cast*>(aAnimation)->remove(); + } + mAnimations.Remove(aAnimation); + } + + void AnimationTimeline::NotifyAnimationContentVisibilityChanged( + Animation* aAnimation, bool aIsVisible) { + bool inList = + static_cast*>(aAnimation)->isInList(); +diff --git a/dom/animation/DocumentTimeline.cpp b/dom/animation/DocumentTimeline.cpp +--- a/dom/animation/DocumentTimeline.cpp ++++ b/dom/animation/DocumentTimeline.cpp +@@ -155,17 +155,22 @@ void DocumentTimeline::NotifyAnimationUp + "We should not register with the refresh driver if we are not" + " in the document's list of timelines"); + refreshDriver->EnsureAnimationUpdate(); + } + } + } + + void DocumentTimeline::TriggerAllPendingAnimationsNow() { ++ AutoTArray, 32> animationsToTrigger; + for (Animation* animation : mAnimationOrder) { ++ animationsToTrigger.AppendElement(animation); ++ } ++ ++ for (Animation* animation : animationsToTrigger) { + animation->TryTriggerNow(); + } + } + + void DocumentTimeline::WillRefresh() { + if (!mDocument->GetPresShell()) { + // If we're not displayed, don't tick animations. + return; +@@ -183,19 +188,16 @@ void DocumentTimeline::WillRefresh() { + } + // We already assert that GetRefreshDriver() is non-null at the beginning + // of this function but we check it again here to be sure that ticking + // animations does not have any side effects that cause us to lose the + // connection with the refresh driver, such as triggering the destruction + // of mDocument's PresShell. + if (nsRefreshDriver* refreshDriver = GetRefreshDriver()) { + refreshDriver->EnsureAnimationUpdate(); +- } else { +- MOZ_ASSERT_UNREACHABLE( +- "Refresh driver should still be valid at end of WillRefresh"); + } + } + + void DocumentTimeline::RemoveAnimation(Animation* aAnimation) { + AnimationTimeline::RemoveAnimation(aAnimation); + } + + void DocumentTimeline::NotifyAnimationContentVisibilityChanged( +diff --git a/dom/animation/ScrollTimelineAnimationTracker.cpp b/dom/animation/ScrollTimelineAnimationTracker.cpp +--- a/dom/animation/ScrollTimelineAnimationTracker.cpp ++++ b/dom/animation/ScrollTimelineAnimationTracker.cpp +@@ -8,23 +8,20 @@ + + #include "mozilla/dom/Document.h" + + namespace mozilla { + + NS_IMPL_CYCLE_COLLECTION(ScrollTimelineAnimationTracker, mPendingSet, mDocument) + + void ScrollTimelineAnimationTracker::TriggerPendingAnimations() { +- for (auto iter = mPendingSet.begin(), end = mPendingSet.end(); iter != end; +- ++iter) { +- dom::Animation* animation = *iter; +- ++ for (RefPtr& animation : ++ ToTArray, 32>>(mPendingSet)) { + MOZ_ASSERT(animation->GetTimeline() && + !animation->GetTimeline()->IsMonotonicallyIncreasing()); +- + // FIXME: Trigger now may not be correct because the spec says: + // If a user agent determines that animation is immediately ready, it may + // schedule the task (i.e. ResumeAt()) as a microtask such that it runs at + // the next microtask checkpoint, but it must not perform the task + // synchronously. + // Note: So, for now, we put the animation into the tracker, and trigger + // them immediately until the frames are ready. Using TriggerOnNextTick() + // for scroll-driven animations may have issues because we don't tick if +@@ -34,15 +31,13 @@ void ScrollTimelineAnimationTracker::Tri + // inactive. It's pretty hard to tell its future status, for example, it's + // possible that the scroll container is in display:none subtree but the + // animating element isn't the subtree, then we need to keep tracking the + // situation until the scroll container gets framed. so in general we make + // this animation be pending (i.e. not ready) if its scroll-timeline is + // inactive, and this also matches the current spec definition. + continue; + } +- +- // Note: Remove() is legitimately called once per entry during the loop. +- mPendingSet.Remove(iter); ++ mPendingSet.Remove(animation); + } + } + + } // namespace mozilla +diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp +--- a/layout/base/nsRefreshDriver.cpp ++++ b/layout/base/nsRefreshDriver.cpp +@@ -2290,18 +2290,25 @@ void nsRefreshDriver::DetermineProximity + ShouldCollect); + + for (const RefPtr& doc : documents) { + MOZ_KnownLive(doc)->DetermineProximityToViewportAndNotifyResizeObservers(); + } + } + + static CallState UpdateAndReduceAnimations(Document& aDocument) { +- for (DocumentTimeline* timeline : aDocument.Timelines()) { +- timeline->WillRefresh(); ++ { ++ AutoTArray, 32> timelinesToTick; ++ for (DocumentTimeline* timeline : aDocument.Timelines()) { ++ timelinesToTick.AppendElement(timeline); ++ } ++ ++ for (DocumentTimeline* tl : timelinesToTick) { ++ tl->WillRefresh(); ++ } + } + + if (nsPresContext* pc = aDocument.GetPresContext()) { + if (pc->EffectCompositor()->NeedsReducing()) { + pc->EffectCompositor()->ReduceAnimations(); + } + } + aDocument.EnumerateSubDocuments(UpdateAndReduceAnimations); +@@ -2321,17 +2328,18 @@ void nsRefreshDriver::UpdateAnimationsAn + // run these, however, until we have fully updated the animation state. As + // per the "update animations and send events" procedure[1], we should + // remove replaced animations and then run these microtasks before + // dispatching the corresponding animation events. + // + // [1]: + // https://drafts.csswg.org/web-animations-1/#update-animations-and-send-events + nsAutoMicroTask mt; +- UpdateAndReduceAnimations(*mPresContext->Document()); ++ RefPtr doc = mPresContext->Document(); ++ UpdateAndReduceAnimations(*doc); + } + + // Hold all AnimationEventDispatcher in mAnimationEventFlushObservers as + // a RefPtr<> array since each AnimationEventDispatcher might be destroyed + // during processing the previous dispatcher. + AutoTArray, 16> dispatchers; + dispatchers.AppendElements(mAnimationEventFlushObservers); + mAnimationEventFlushObservers.Clear(); + base-commit: 39df1ac928beeeb316980c5ecb5dfaae7053460d -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 11 06:31:00 2024 Received: (at 73735) by debbugs.gnu.org; 11 Oct 2024 10:31:00 +0000 Received: from localhost ([127.0.0.1]:33579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szCvE-0001QR-Ed for submit@debbugs.gnu.org; Fri, 11 Oct 2024 06:31:00 -0400 Received: from ditigal.xyz ([78.46.201.50]:39134 helo=mail.ditigal.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szCvB-0001Q7-An for 73735@debbugs.gnu.org; Fri, 11 Oct 2024 06:30:58 -0400 Received: by cerebrum (OpenSMTPD) with ESMTPSA id d43a27f9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 11 Oct 2024 10:30:36 +0000 (UTC) From: Rutherther To: 73735@debbugs.gnu.org Subject: Re: [PATCH] gnu: librewolf: Fix CVE-2024-9680. In-Reply-To: Date: Fri, 11 Oct 2024 12:30:35 +0200 Message-ID: <87o73r6ies.fsf@ditigal.xyz> MIME-Version: 1.0 Content-Type: text/plain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ditigal.xyz; i=@ditigal.xyz; q=dns/txt; s=20240917; t=1728642636; h=from : to : cc : subject : in-reply-to : date : message-id : mime-version : content-type : from; bh=ieOpUdnpnA0CSQDPsLRGB94HnTSol8mtR59/jly1PEU=; b=CfQzBOghF9c4hJxqjsZVfK1T7wnDS1bZOb8sloaDOs+Q3ZCHnW8jmGwAa10ResFvCuWP3 P1IEzkovHVWfpXbXCL7sB+oAsX9hsPxDR+d/oExK0eY4I0MZwdUipb/nPM3+qN3323mFoab /aKn6AAQE7EoMp7QmRV99kcUEueEeIA= X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 73735 Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Hilton, thanks for the patch. I think it can be closed now in favor of #73742 that updates librewolf to 131.0.2, which contains this fix as well. Regards, Rutherther From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 11 06:51:47 2024 Received: (at 73735-close) by debbugs.gnu.org; 11 Oct 2024 10:51:47 +0000 Received: from localhost ([127.0.0.1]:33632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szDFL-0002XU-4S for submit@debbugs.gnu.org; Fri, 11 Oct 2024 06:51:47 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:59090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szDFJ-0002XD-5X for 73735-close@debbugs.gnu.org; Fri, 11 Oct 2024 06:51:45 -0400 Date: Fri, 11 Oct 2024 18:41:07 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1728643886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=fml7aldJO8CC49N2a7IxL9Cu9flfdMKkoYRsH15BgbM=; b=1oH26LXBB1wEVe+A9zpO5vTAGZtsjSuoZSmMuaZR+5j573IMRm3ckDgbEkCvTMYBKHDYX4 Boc1AZuh+WS8R0pU2g/5yjqlKb8BpeF4lityfmJym0HvTzwp4YtienlN7ey+qE5EcESaI/ 0JQpJ8itB//UfUbqQg4RzgTKC2XU9AnGg/C9bkVekuhwH4+wVj55pA1/Upm+U0Irlkj1k3 wefIobDWrQAJDR5moI/EYdfVLTN2W4ql67BVzPJeDSYI7i2aYPAfSLmqWyLlBOYFe2igci YECS2q0UjiMcxIRxRC4egtLu09S0e5m9NTNjkdOZiBGbXsJ8K7ZGlZyRSPSrnQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Message-ID: <87set23osc.wl-hako@ultrarare.space> From: Hilton Chain To: 73735-close@debbugs.gnu.org Subject: Close: bug#73735: Acknowledgement ([PATCH] gnu: librewolf: Fix CVE-2024-9680.) In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 73735-close X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Closing in favor of . From unknown Thu Aug 14 21:44:34 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 08 Nov 2024 12:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator