packages/nss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!11 nss: fix core dump when sigd-signerInfos is NULL

Browse Source 
Merge pull request !11 from guoxiaoqi/next
This commit is contained in:
openeuler-ci-bot 2020-04-30 14:45:11 +08:00 committed by Gitee
commit 5eeecd8093
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fix-core-dump-when-sigd-signerInfos-is-NULL.patch Normal file
View File

@ -0,0 +1,26 @@
From 0641f1a9351fdb06d7e5d19a48ad7fe6175713e7 Mon Sep 17 00:00:00 2001
From: guoxiaoqi <guoxiaoqi2@huawei.com>
Date: Thu, 30 Apr 2020 09:40:20 +0800
Subject: [PATCH] fix core dump when sigd->signerInfos is NULL
Signed-off-by: guoxiaoqi <guoxiaoqi2@huawei.com>
---
nss/lib/smime/cmssigdata.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nss/lib/smime/cmssigdata.c b/nss/lib/smime/cmssigdata.c
index 7dd6ea4..32a8166 100644
--- a/nss/lib/smime/cmssigdata.c
+++ b/nss/lib/smime/cmssigdata.c
@@ -476,7 +476,7 @@ NSS_CMSSignedData_SignerInfoCount(NSSCMSSignedData *sigd)
NSSCMSSignerInfo *
NSS_CMSSignedData_GetSignerInfo(NSSCMSSignedData *sigd, int i)
{
- if (!sigd) {
+ if (!sigd || !sigd->signerInfos) {
PORT_SetError(SEC_ERROR_INVALID_ARGS);
return NULL;
}
--
1.8.3.1

8
nss.spec
View File

@ -12,7 +12,7 @@
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: %{nss_version} Version: %{nss_version}
Release: 11 Release: 12
License: MPLv2.0 License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Provides: nss-system-init Provides: nss-system-init
@ -41,6 +41,7 @@ Patch0: nss-539183.patch
Patch1: Bug-1412829-reject-empty-supported_signature_algorit.patch Patch1: Bug-1412829-reject-empty-supported_signature_algorit.patch
Patch2: Bug-1507135-Add-additional-null-checks-to-CMS-messag.patch Patch2: Bug-1507135-Add-additional-null-checks-to-CMS-messag.patch
Patch3: Bug-1507174-Add-additional-null-checks-to-other-CMS-.patch Patch3: Bug-1507174-Add-additional-null-checks-to-other-CMS-.patch
Patch4: fix-core-dump-when-sigd-signerInfos-is-NULL.patch
%description %description
Network Security Services (NSS) is a set of libraries designed to Network Security Services (NSS) is a set of libraries designed to
@ -131,6 +132,8 @@ pushd nss
%patch3 -p1 %patch3 -p1
popd popd
%patch4 -p1
%build %build
export NSS_FORCE_FIPS=1 export NSS_FORCE_FIPS=1
@ -545,6 +548,9 @@ update-crypto-policies
%doc %{_mandir}/man* %doc %{_mandir}/man*
%changelog %changelog
* Thu Apr 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.40.1-12
- fix core dump when sigd-signerInfos is NULL
* Sat Mar 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.40.1-11 * Sat Mar 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.40.1-11
- add BuildRequires of gdb; build without test - add BuildRequires of gdb; build without test