From 277128e71aa91972bf1cb687193a41471e4a4911 Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Tue, 29 Oct 2024 23:12:39 +0100 Subject: nss: patch CVE-2024-6609 Pick the same patch as Debian took for bullseye. There is no direct backport to version prior 3.102 because commit NSS_3_101_BETA2-12-g8d94c529b [1] rewrote this code. Applied patch was proposed for old versions in [2] and already applied in Debian bullseye. I could not find suitable upstream status, inappropriate is the best I could pick from offered possibilities. [1] https://github.com/nss-dev/nss/commit/8d94c529b333194d080c4885ddd3a40e6c296ae9< [2] https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/t9JmsYkujWM/m/HjKuk-ngBAAJ Signed-off-by: Peter Marko Signed-off-by: Armin Kuster --- .../recipes-support/nss/nss/CVE-2024-6609.patch | 30 ++++++++++++++++++++++ meta-oe/recipes-support/nss/nss_3.98.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta-oe/recipes-support/nss/nss/CVE-2024-6609.patch diff --git a/meta-oe/recipes-support/nss/nss/CVE-2024-6609.patch b/meta-oe/recipes-support/nss/nss/CVE-2024-6609.patch new file mode 100644 index 0000000000..38932cc237 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/CVE-2024-6609.patch @@ -0,0 +1,30 @@ +From 41550b24b92c4a5971da9842e5e9f2b452aceca8 Tue Oct 29 22:44:57 2024 +From: Peter Marko +Date: Tue, 29 Oct 2024 22:44:57 +0100 +Subject: [PATCH] fix CVE-2024-6609 + +CVE: CVE-2024-6609 +Upstream-Status: Inappropriate [upstream ticket: https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/t9JmsYkujWM/m/HjKuk-ngBAAJ] +Signed-off-by: Peter Marko +--- + nss/lib/freebl/ec.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/nss/lib/freebl/ec.c b/nss/lib/freebl/ec.c +index 73a625a..c9490da 100644 +--- a/nss/lib/freebl/ec.c ++++ b/nss/lib/freebl/ec.c +@@ -302,6 +302,10 @@ done: + + cleanup: + mp_clear(&k); ++ if (err < MP_OKAY) { ++ MP_TO_SEC_ERROR(err); ++ rv = SECFailure; ++ } + if (rv) { + PORT_FreeArena(arena, PR_TRUE); + } +-- +2.30.2 + diff --git a/meta-oe/recipes-support/nss/nss_3.98.bb b/meta-oe/recipes-support/nss/nss_3.98.bb index b3ad6133b6..9218b4d30b 100644 --- a/meta-oe/recipes-support/nss/nss_3.98.bb +++ b/meta-oe/recipes-support/nss/nss_3.98.bb @@ -33,6 +33,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/$ file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ file://CVE-2024-6602.patch \ + file://CVE-2024-6609.patch \ " SRC_URI[sha256sum] = "f549cc33d35c0601674bfacf7c6ad683c187595eb4125b423238d3e9aa4209ce" -- cgit v1.2.3-54-g00ecf