diff mbox series

[meta-oe,scarthgap,1/4] nss: patch CVE-2024-11704

Message ID 20261105232905.3707642-1-peter.marko@siemens.com
State New
Headers show
Series [meta-oe,scarthgap,1/4] nss: patch CVE-2024-11704 | expand

Commit Message

Peter Marko Nov. 5, 2026, 11:29 p.m. UTC 
From: Peter Marko <peter.marko@siemens.com>

Pick patch referencing [1].

[1] https://bugzilla.mozilla.org/show_bug.cgi?id=1899402

Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
 .../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 mbox series

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 <kaie@kuix.de>
+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 <peter.marko@siemens.com>
+---
+ 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"