From patchwork Thu Nov 5 23:29:05 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 103198 Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net [185.136.65.225]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.9382.1793921364149987538 for ; Thu, 05 Nov 2026 15:29:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=KbgVNoRj; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.225, mailfrom: fm-256628-2026110523292259e55ada6a000207ec-8rtr9h@rts-flowmailer.siemens.com) Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 2026110523292259e55ada6a000207ec for ; Fri, 06 Nov 2026 00:29:22 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=aqtEk0VVTHPpX75mpmkxTLQGqrqNuSFaaESWIt+CTWk=; b=KbgVNoRj2SmwxZFDXlKw7o+sTgokKk0iTzgJARA0UUP56Uad2j+tcr1SgaMB22070NYJGu o9l8YFOk+Sd+lbmVmuZ/+u6xVIcnsiygc87lYUw+Nirzk1GQ7JIhcch6HyjiUGtpg/y2mABJ +TXzQdS0Gd7BXCyfW0TKomF10Pn5acPE2L/76ZsJGSAvIp6g4WTIBO56eW5h9kVxSgN84j37 DmWr9az6o1r2deR+LpVDzN+jcBY5kNXyVLsw1o0UukQrxUfi6yzz3HZfB6qSAePDwrJV22Mw PhpUsTN0wxWxVPTDcvLL3QOm7yW6NEGtR+YwGdUywR2XvxMolYewBLyQ==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][scarthgap][PATCH 1/4] nss: patch CVE-2024-11704 Date: Fri, 6 Nov 2026 00:29:05 +0100 Message-ID: <20261105232905.3707642-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Thu, 05 Nov 2026 23:29:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/131958 From: Peter Marko Pick patch referencing [1]. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1899402 Signed-off-by: Peter Marko --- .../images/meta-networking-image-ptest.bb | 2 +- .../nss/nss/CVE-2024-11704.patch | 30 +++++++++++++++++++ meta-oe/recipes-support/nss/nss_3.98.bb | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/nss/nss/CVE-2024-11704.patch diff --git a/meta-networking/recipes-core/images/meta-networking-image-ptest.bb b/meta-networking/recipes-core/images/meta-networking-image-ptest.bb index b6238d61003..874af9c6bda 100644 --- a/meta-networking/recipes-core/images/meta-networking-image-ptest.bb +++ b/meta-networking/recipes-core/images/meta-networking-image-ptest.bb @@ -33,7 +33,7 @@ QB_MEM:virtclass-mcextend-nftables = "-m 2048" TEST_SUITES = "ping ssh parselogs ptest" # Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places -PTEST_EXPECT_FAILURE = "1" +#PTEST_EXPECT_FAILURE = "1" python () { if not d.getVar("MCNAME"): diff --git a/meta-oe/recipes-support/nss/nss/CVE-2024-11704.patch b/meta-oe/recipes-support/nss/nss/CVE-2024-11704.patch new file mode 100644 index 00000000000..0f8c4dc4477 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/CVE-2024-11704.patch @@ -0,0 +1,30 @@ +From 355276751baea8b557e1c850fd6eb044fa11f52a Mon Sep 17 00:00:00 2001 +From: Kai Engert +Date: Thu, 26 Sep 2024 21:22:17 +0200 +Subject: [PATCH] Bug 1899402 - Correctly destroy bulkkey in error scenario. + r=jschanck + +Differential Revision: https://phabricator.services.mozilla.com/D223837 + +--HG-- +extra : rebase_source : d06a6bb8d51bb844c814c5ee682a1b24de3e2e69 + +CVE: CVE-2024-11704 +Upstream-Status: Backport [https://github.com/mozilla/nss/commit/355276751baea8b557e1c850fd6eb044fa11f52a] +Signed-off-by: Peter Marko +--- + nss/lib/pkcs7/p7decode.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/nss/lib/pkcs7/p7decode.c b/nss/lib/pkcs7/p7decode.c +index 7a01f3671..02be982f6 100644 +--- a/nss/lib/pkcs7/p7decode.c ++++ b/nss/lib/pkcs7/p7decode.c +@@ -542,6 +542,7 @@ sec_pkcs7_decoder_start_decrypt(SEC_PKCS7DecoderContext *p7dcx, int depth, + * We are done with (this) bulkkey now. + */ + PK11_FreeSymKey(bulkkey); ++ bulkkey = NULL; + + if (decryptobj == NULL) { + p7dcx->error = PORT_GetError(); diff --git a/meta-oe/recipes-support/nss/nss_3.98.bb b/meta-oe/recipes-support/nss/nss_3.98.bb index 8cff9372f1b..d180346b396 100644 --- a/meta-oe/recipes-support/nss/nss_3.98.bb +++ b/meta-oe/recipes-support/nss/nss_3.98.bb @@ -37,6 +37,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/$ file://CVE-2026-2781.patch \ file://0008-Bug-2083709-Remove-eMudhra-emSign-Root-CA-C1-and-emS.patch \ file://0009-Bug-2084101-Remove-eMudhra-emSign-Root-CA-G3-from-NS.patch \ + file://CVE-2024-11704.patch \ " SRC_URI[sha256sum] = "f549cc33d35c0601674bfacf7c6ad683c187595eb4125b423238d3e9aa4209ce" From patchwork Thu Nov 5 23:23:12 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 103196 Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.9203.1793921113518837701 for ; Thu, 05 Nov 2026 15:25:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=malViW6Y; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-256628-2026110523251020d48e00cc000207da-cvkshr@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 2026110523251020d48e00cc000207da for ; Fri, 06 Nov 2026 00:25:10 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=O4ECox6IMVEV7jcgo6x4jdIYDn4+n9zk2MftXKgJlxQ=; b=malViW6YaDFNFRNPBR3nW4oWqY6hUzmus7uFTeZyZKBJ8U4kZ5U0wTEUygm67CvUoRZBIq TLoFDPYDFcx+5h5k4A17mlzekDJo0uLa6islF6dbXNuFM6NSmAWSmKWwwVr09mdgYVsYjPpk Qu0muEL9uL3x+B8gwps/KzEysZ7s23eug6axCuxBfl7jGAgNtHQ+n2IoemjZie8E5Q3n1BE0 1FuMUpdglXu/E9rz8gAQRJ6EgnnFmFVqPLcWC4HvuCHyEra4xe7ugrXCx3l8iqeotRQRXyrd 4wR7o88bbQk2hIBsvAslCm3KGxezn8eTas4wVlo6QqYhIQi+/YgmAZZQ==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][scarthgap][PATCH 2/4] nss: patch CVE-2024-11705 Date: Fri, 6 Nov 2026 00:23:12 +0100 Message-ID: <20261105232314.3699451-2-peter.marko@siemens.com> In-Reply-To: <20261105232314.3699451-1-peter.marko@siemens.com> References: <20261105232314.3699451-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Thu, 05 Nov 2026 23:25:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/131955 From: Peter Marko Pick patch referencing [1]. It was modified because hunk 1 was only introduced in [2] not et available in version 3.98. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1921768 [2] https://github.com/mozilla/nss/commit/9adf6e998915668f86d38436ed494ec7a468a9de Signed-off-by: Peter Marko --- .../nss/nss/CVE-2024-11705.patch | 43 +++++++++++++++++++ meta-oe/recipes-support/nss/nss_3.98.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta-oe/recipes-support/nss/nss/CVE-2024-11705.patch diff --git a/meta-oe/recipes-support/nss/nss/CVE-2024-11705.patch b/meta-oe/recipes-support/nss/nss/CVE-2024-11705.patch new file mode 100644 index 00000000000..707f4b08dd2 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/CVE-2024-11705.patch @@ -0,0 +1,43 @@ +From c59fad13330727ff65ce015055bc28cece4e38f7 Mon Sep 17 00:00:00 2001 +From: John Schanck +Date: Mon, 30 Sep 2024 17:01:39 +0000 +Subject: [PATCH] Bug 1921768 - allow null phKey in NSC_DeriveKey. r=rrelyea + +Differential Revision: https://phabricator.services.mozilla.com/D224134 + +--HG-- +extra : moz-landing-system : lando + +CVE: CVE-2024-11705 +Upstream-Status: Backport [https://github.com/mozilla/nss/commit/c59fad13330727ff65ce015055bc28cece4e38f7] +Signed-off-by: Peter Marko +--- + nss/lib/softoken/pkcs11c.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/nss/lib/softoken/pkcs11c.c b/nss/lib/softoken/pkcs11c.c +index f06c2b43c..76665e5a4 100644 +--- a/nss/lib/softoken/pkcs11c.c ++++ b/nss/lib/softoken/pkcs11c.c +@@ -7273,8 +7273,9 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession, + /* + * now lets create an object to hang the attributes off of + */ +- if (phKey) ++ if (phKey) { + *phKey = CK_INVALID_HANDLE; ++ } + + key = sftk_NewObject(slot); /* fill in the handle later */ + if (key == NULL) { +@@ -8820,7 +8821,9 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession, + crv = sftk_handleObject(key, session); + session->lastOpWasFIPS = key->isFIPS; + sftk_FreeSession(session); +- *phKey = key->handle; ++ if (phKey) { ++ *phKey = key->handle; ++ } + sftk_FreeObject(key); + } + return crv; diff --git a/meta-oe/recipes-support/nss/nss_3.98.bb b/meta-oe/recipes-support/nss/nss_3.98.bb index d180346b396..8be7072ee50 100644 --- a/meta-oe/recipes-support/nss/nss_3.98.bb +++ b/meta-oe/recipes-support/nss/nss_3.98.bb @@ -38,6 +38,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/$ file://0008-Bug-2083709-Remove-eMudhra-emSign-Root-CA-C1-and-emS.patch \ file://0009-Bug-2084101-Remove-eMudhra-emSign-Root-CA-G3-from-NS.patch \ file://CVE-2024-11704.patch \ + file://CVE-2024-11705.patch \ " SRC_URI[sha256sum] = "f549cc33d35c0601674bfacf7c6ad683c187595eb4125b423238d3e9aa4209ce" From patchwork Thu Nov 5 23:23:13 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 103197 Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.9204.1793921116595203196 for ; Thu, 05 Nov 2026 15:25:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=AJ6vIxJp; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-256628-20261105232514c546e42c5d0002073e-dwz4xj@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20261105232514c546e42c5d0002073e for ; Fri, 06 Nov 2026 00:25:14 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=E0/scWT579WFAIqBrz+uhEfBIZCmPvI09IqsFkV6NS8=; b=AJ6vIxJpxBiRMjlZ5IaplMemoJvGv2UVWZpLCzpqAkFH5oipo+sb7zrZYv2oJAFWR/LJUZ BxhscSiI8fXj1MtJ/1hWKB/yFo9/0t4A67imPIIKH+tDoAZ6FpnxncQEfk/SrX7iF6ef9dbg tCwtKguJJaye6VcULFVK8tyvLYTmKCmhfVttQkDARpEe06yZUav1gpYiMQLztk7hQ8xN8DGM 1O27LNLKkHCRZG7nNbyoC/AhBI+agzGmsjTp9Ca8CdppJYp4GDnn/ah+m6ucuADITc2vkXDG GTyc90zM9kbyr4mNCc4mv+U4YOtUm6RW0/fZm98/ZbyJGpm4NlhlTXnw==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][scarthgap][PATCH 3/4] nss: patch CVE-2024-11706 Date: Fri, 6 Nov 2026 00:23:13 +0100 Message-ID: <20261105232314.3699451-3-peter.marko@siemens.com> In-Reply-To: <20261105232314.3699451-1-peter.marko@siemens.com> References: <20261105232314.3699451-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Thu, 05 Nov 2026 23:25:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/131956 From: Peter Marko Pick patch referencing [1]. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1923767 Signed-off-by: Peter Marko --- .../nss/nss/CVE-2024-11706.patch | 35 +++++++++++++++++++ meta-oe/recipes-support/nss/nss_3.98.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-oe/recipes-support/nss/nss/CVE-2024-11706.patch diff --git a/meta-oe/recipes-support/nss/nss/CVE-2024-11706.patch b/meta-oe/recipes-support/nss/nss/CVE-2024-11706.patch new file mode 100644 index 00000000000..6ec92052adf --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/CVE-2024-11706.patch @@ -0,0 +1,35 @@ +From aa9e1c7cd91cc1d4c205bc73bfc40855ec0af2f9 Mon Sep 17 00:00:00 2001 +From: John Schanck +Date: Mon, 21 Oct 2024 21:22:36 +0000 +Subject: [PATCH] Bug 1923767 - pk12util: improve error handling in + p12U_ReadPKCS12File. r=nss-reviewers,nkulatova + +Differential Revision: https://phabricator.services.mozilla.com/D225165 + +--HG-- +extra : moz-landing-system : lando + +CVE: CVE-2024-11706 +Upstream-Status: Backport [https://github.com/mozilla/nss/commit/aa9e1c7cd91cc1d4c205bc73bfc40855ec0af2f9] +Signed-off-by: Peter Marko +--- + nss/cmd/pk12util/pk12util.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/cmd/pk12util/pk12util.c b/nss/cmd/pk12util/pk12util.c +index f84002ca0..2baab969f 100644 +--- a/nss/cmd/pk12util/pk12util.c ++++ b/nss/cmd/pk12util/pk12util.c +@@ -449,10 +449,10 @@ p12U_ReadPKCS12File(SECItem *uniPwp, char *in_file, PK11SlotInfo *slot, + + /* revert the option setting */ + if (forceUnicode != pk12uForceUnicode) { +- rv = NSS_OptionSet(__NSS_PKCS12_DECODE_FORCE_UNICODE, pk12uForceUnicode); +- if (rv != SECSuccess) { ++ if (SECSuccess != NSS_OptionSet(__NSS_PKCS12_DECODE_FORCE_UNICODE, pk12uForceUnicode)) { + SECU_PrintError(progName, "PKCS12 decoding failed to set option"); + pk12uErrno = PK12UERR_DECODEVERIFY; ++ rv = SECFailure; + } + } + /* rv has been set at this point */ diff --git a/meta-oe/recipes-support/nss/nss_3.98.bb b/meta-oe/recipes-support/nss/nss_3.98.bb index 8be7072ee50..9bebd1c6c4d 100644 --- a/meta-oe/recipes-support/nss/nss_3.98.bb +++ b/meta-oe/recipes-support/nss/nss_3.98.bb @@ -39,6 +39,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/$ file://0009-Bug-2084101-Remove-eMudhra-emSign-Root-CA-G3-from-NS.patch \ file://CVE-2024-11704.patch \ file://CVE-2024-11705.patch \ + file://CVE-2024-11706.patch \ " SRC_URI[sha256sum] = "f549cc33d35c0601674bfacf7c6ad683c187595eb4125b423238d3e9aa4209ce" From patchwork Thu Nov 5 23:23:14 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 103195 Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net [185.136.65.228]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.9308.1793921116968052630 for ; Thu, 05 Nov 2026 15:25:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=Qryrghrb; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.228, mailfrom: fm-256628-20261105232515cb3c6afc6e00020799-ms2qff@rts-flowmailer.siemens.com) Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 20261105232515cb3c6afc6e00020799 for ; Fri, 06 Nov 2026 00:25:15 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=Rq7JeIjVPY/qhj5rh1HRsxwAKMRBykRPBu/oYnCBzW0=; b=Qryrghrb3DJV8F2Nj3f8cQlA0eyUgih5A0GnkuOkN6HIcLX4aQg+5gLN2mDcwXDGZRlq2D iXGDMY2pjY64dma9dqbfmeXLMbPZLF7Fb6wvhimQa4laDa1k+seZGNsbmMIZbtgW0UelZozE ZtDOE5PnttPn8w9NWWSAw7haZ6SxaQskCqNaQ+jEMb5lRGby5SoGOKe1DHhVezS82+y+qt+l VuEqvUyewnCjYY5ccW9UsOFcbpPeJ9i0CmMyF48UB1Fyndr+X+yayZSNvJrHS6TwrHTlSUQk EwcHHZwWiKXzC9r9FBxFf2iq0e4zhoYqjBL3JwW5ZaOMLNdc6Y2piPgA==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][scarthgap][PATCH 4/4] nss: patch CVE-2024-7531 Date: Fri, 6 Nov 2026 00:23:14 +0100 Message-ID: <20261105232314.3699451-4-peter.marko@siemens.com> In-Reply-To: <20261105232314.3699451-1-peter.marko@siemens.com> References: <20261105232314.3699451-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Thu, 05 Nov 2026 23:25:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/131957 From: Peter Marko Pick patch referencing [1]. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1905691 Signed-off-by: Peter Marko --- .../nss/nss/CVE-2024-7531.patch | 69 +++++++++++++++++++ meta-oe/recipes-support/nss/nss_3.98.bb | 1 + 2 files changed, 70 insertions(+) create mode 100644 meta-oe/recipes-support/nss/nss/CVE-2024-7531.patch diff --git a/meta-oe/recipes-support/nss/nss/CVE-2024-7531.patch b/meta-oe/recipes-support/nss/nss/CVE-2024-7531.patch new file mode 100644 index 00000000000..38135295a8c --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/CVE-2024-7531.patch @@ -0,0 +1,69 @@ +From e9e4ca24ff6f8b118853db8fc1f9dd4d7653e229 Mon Sep 17 00:00:00 2001 +From: Anna Weine +Date: Wed, 17 Jul 2024 16:16:57 +0000 +Subject: [PATCH] Bug 1905691 - ChaChaXor to return after the function + r=nss-reviewers,jschanck + +Differential Revision: https://phabricator.services.mozilla.com/D215892 + +--HG-- +extra : moz-landing-system : lando + +CVE: CVE-2024-7531 +Upstream-Status: Backport [https://github.com/mozilla/nss/commit/e9e4ca24ff6f8b118853db8fc1f9dd4d7653e229] +Signed-off-by: Peter Marko +--- + nss/lib/freebl/chacha20poly1305.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/nss/lib/freebl/chacha20poly1305.c b/nss/lib/freebl/chacha20poly1305.c +index a83f76df0..47aa18ba8 100644 +--- a/nss/lib/freebl/chacha20poly1305.c ++++ b/nss/lib/freebl/chacha20poly1305.c +@@ -210,12 +210,14 @@ ChaCha20Xor(uint8_t *output, uint8_t *block, uint32_t len, uint8_t *k, + #ifndef NSS_DISABLE_AVX2 + if (avx2_support()) { + Hacl_Chacha20_Vec256_chacha20_encrypt_256(len, output, block, k, nonce, ctr); ++ return; + } + #endif + + #ifndef NSS_DISABLE_SSE3 + if (ssse3_support() && sse4_1_support() && avx_support()) { + Hacl_Chacha20_Vec128_chacha20_encrypt_128(len, output, block, k, nonce, ctr); ++ return; + } + #endif + +@@ -223,10 +225,12 @@ ChaCha20Xor(uint8_t *output, uint8_t *block, uint32_t len, uint8_t *k, + !defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX) + if (ppc_crypto_support()) { + chacha20vsx(len, output, block, k, nonce, ctr); +- } else ++ return; ++ } + #endif + { + Hacl_Chacha20_chacha20_encrypt(len, output, block, k, nonce, ctr); ++ return; + } + } + #endif /* NSS_DISABLE_CHACHAPOLY */ +@@ -446,8 +450,6 @@ ChaCha20Poly1305_Encrypt(const ChaCha20Poly1305Context *ctx, + goto finish; + } + #endif +- +- else + #elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__) && \ + !defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX) + if (ppc_crypto_support()) { +@@ -455,7 +457,7 @@ ChaCha20Poly1305_Encrypt(const ChaCha20Poly1305Context *ctx, + (uint8_t *)ctx->key, (uint8_t *)nonce, adLen, (uint8_t *)ad, inputLen, + (uint8_t *)input, output, outTag); + goto finish; +- } else ++ } + #endif + { + Hacl_Chacha20Poly1305_32_aead_encrypt( diff --git a/meta-oe/recipes-support/nss/nss_3.98.bb b/meta-oe/recipes-support/nss/nss_3.98.bb index 9bebd1c6c4d..34a24bb74de 100644 --- a/meta-oe/recipes-support/nss/nss_3.98.bb +++ b/meta-oe/recipes-support/nss/nss_3.98.bb @@ -40,6 +40,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/$ file://CVE-2024-11704.patch \ file://CVE-2024-11705.patch \ file://CVE-2024-11706.patch \ + file://CVE-2024-7531.patch \ " SRC_URI[sha256sum] = "f549cc33d35c0601674bfacf7c6ad683c187595eb4125b423238d3e9aa4209ce"