已合并
fix CVE-2026-12318 #185
m0_74032979创建于 5 天前
fix CVE-2026-12318 #185
已合并
共 2 个文件变更+47-9
| @@ -0,0 +1,30 @@ | |||
| 1 | +From bd0c42028c8eae5b9cbdb4f5b0ee59bc07cba2de Mon Sep 17 00:00:00 2001 | ||
| 2 | +From: John Schanck <jschanck@mozilla.com> | ||
| 3 | +Date: Wed, 22 Apr 2026 20:52:22 +0000 | ||
| 4 | +Subject: [PATCH] Bug 2023478 - improve handling of escape sequences in | ||
| 5 | + pk11uri_ParseAttributes. r=nss-reviewers,keeler | ||
| 6 | + | ||
| 7 | +Link: https://hg-edge.mozilla.org/projects/nss/rev/bd0c42028c8eae5b9cbdb4f5b0ee59bc07cba2de | ||
| 8 | +--- | ||
| 9 | + lib/util/pkcs11uri.c | 4 ++-- | ||
| 10 | + 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 11 | + | ||
| 12 | +diff --git a/lib/util/pkcs11uri.c b/lib/util/pkcs11uri.c | ||
| 13 | +index e0c4077..b3b90ce 100644 | ||
| 14 | +--- a/lib/util/pkcs11uri.c | ||
| 15 | ++++ b/lib/util/pkcs11uri.c | ||
| 16 | + pk11uri_ParseAttributes(const char **string, | ||
| 17 | + } | ||
| 18 | + if (*p == '%') { | ||
| 19 | + const char ch2 = *++p; | ||
| 20 | +- if (strchr(PK11URI_HEXDIG, ch2) != NULL) { | ||
| 21 | ++ if (ch2 != '\0' && strchr(PK11URI_HEXDIG, ch2) != NULL) { | ||
| 22 | + const char ch3 = *++p; | ||
| 23 | +- if (strchr(PK11URI_HEXDIG, ch3) != NULL) | ||
| 24 | ++ if (ch3 != '\0' && strchr(PK11URI_HEXDIG, ch3) != NULL) | ||
| 25 | + continue; | ||
| 26 | + } | ||
| 27 | + } | ||
| 28 | +-- | ||
| 29 | +2.43.0 | ||
| 30 | + | ||
| @@ -26,7 +26,7 @@ | |||
| 26 | Summary: Network Security Services | 26 | Summary: Network Security Services |
| 27 | Name: nss | 27 | Name: nss |
| 28 | Version: %{nss_version} | 28 | Version: %{nss_version} |
| 29 | -Release: 10 | 29 | +Release: 11 |
| 30 | License: MPLv2.0 | 30 | License: MPLv2.0 |
| 31 | URL: http://www.mozilla.org/projects/security/pki/nss/ | 31 | URL: http://www.mozilla.org/projects/security/pki/nss/ |
| 32 | Provides: nss-system-init | 32 | Provides: nss-system-init |
| @@ -54,6 +54,7 @@ Source16: setup-nsssysinit.sh | |||
| 54 | 54 | ||
| 55 | # Backport: CVE fixes | 55 | # Backport: CVE fixes |
| 56 | Patch6000: backport-CVE-2026-16389.patch | 56 | Patch6000: backport-CVE-2026-16389.patch |
| 57 | +Patch6001: backport-CVE-2026-12318.patch | ||
| 57 | 58 | ||
| 58 | # Feature: support sm2 and sm3 | 59 | # Feature: support sm2 and sm3 |
| 59 | Patch9000: Feature-nss-add-implement-of-SM3-digest-algorithm.patch | 60 | Patch9000: Feature-nss-add-implement-of-SM3-digest-algorithm.patch |
| @@ -146,14 +147,15 @@ Help document for NSS | |||
| 146 | %setup -q -n %{name}-%{nss_archive_version} | 147 | %setup -q -n %{name}-%{nss_archive_version} |
| 147 | 148 | ||
| 148 | pushd nss | 149 | pushd nss |
| 149 | -%patch6000 -p1 | 150 | +%patch -P 6000 -p1 |
| 150 | -%patch9000 -p1 | 151 | +%patch -P 6001 -p1 |
| 151 | -%patch9001 -p1 | 152 | +%patch -P 9000 -p1 |
| 152 | -%patch9002 -p1 | 153 | +%patch -P 9001 -p1 |
| 153 | -%patch9003 -p1 | 154 | +%patch -P 9002 -p1 |
| 154 | -%patch9004 -p1 | 155 | +%patch -P 9003 -p1 |
| 155 | -%patch9005 -p1 | 156 | +%patch -P 9004 -p1 |
| 156 | -%patch9006 -p1 | 157 | +%patch -P 9005 -p1 |
| 158 | +%patch -P 9006 -p1 | ||
| 157 | popd | 159 | popd |
| 158 | 160 | ||
| 159 | %build | 161 | %build |
| @@ -577,6 +579,12 @@ update-crypto-policies &>/dev/null||: | |||
| 577 | %doc %{_mandir}/man* | 579 | %doc %{_mandir}/man* |
| 578 | 580 | ||
| 579 | %changelog | 581 | %changelog |
| 582 | +* Thu Sep 3 2026 zhengzongmin <zhengzongmin@xufion.com> - 3.94.0-11 | ||
| 583 | +- Type:CVE | ||
| 584 | +- ID:CVE-2026-12318 | ||
| 585 | +- SUG:NA | ||
| 586 | +- DESC:fix CVE-2026-12318 | ||
| 587 | + | ||
| 580 | * Sun Aug 2 2026 Qin Fandong <qinfandong@kylinos.cn> - 3.94.0-10 | 588 | * Sun Aug 2 2026 Qin Fandong <qinfandong@kylinos.cn> - 3.94.0-10 |
| 581 | - Type:CVE | 589 | - Type:CVE |
| 582 | - ID:CVE-2026-16389 | 590 | - ID:CVE-2026-16389 |