folkslinux
/
VMware-Photon-OS
mirror of https://github.com/vmware/photon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libksba: Fix for CVE-2022-47629 

Change-Id: I826b288648bc221f3037bf2ceaf4dd1fd364b267
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/19071
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Harinadh Dommaraju <hdommaraju@vmware.com>
This commit is contained in:
Srish Srinivasan 2023-01-05 12:21:13 +05:30 committed by Harinadh Dommaraju
parent 6d27e65a60
commit 1d6687ab2a
2 changed files with 82 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
SPECS/libksba/0001-Fix-for-CVE-2022-47629.patch Normal file
View File

@ -0,0 +1,69 @@
From f61a5ea4e0f6a80fd4b28ef0174bee77793cf070 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 22 Nov 2022 16:36:46 +0100
Subject: [PATCH] Fix an integer overflow in the CRL signature parser.
* src/crl.c (parse_signature): N+N2 now checked for overflow.
* src/ocsp.c (parse_response_extensions): Do not accept too large
values.
(parse_single_extensions): Ditto.
--
The second patch is an extra safegourd not related to the reported
bug.
GnuPG-bug-id: 6284
Reported-by: Joseph Surin, elttam
Signed-off-by: Srish Srinivasan <ssrish@vmware.com>
---
src/crl.c | 2 +-
src/ocsp.c | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/crl.c b/src/crl.c
index 87a3fa3..9d3028e 100644
--- a/src/crl.c
+++ b/src/crl.c
@@ -1434,7 +1434,7 @@ parse_signature (ksba_crl_t crl)
&& !ti.is_constructed) )
return gpg_error (GPG_ERR_INV_CRL_OBJ);
n2 = ti.nhdr + ti.length;
- if (n + n2 >= DIM(tmpbuf))
+ if (n + n2 >= DIM(tmpbuf) || (n + n2) < n)
return gpg_error (GPG_ERR_TOO_LARGE);
memcpy (tmpbuf+n, ti.buf, ti.nhdr);
err = read_buffer (crl->reader, tmpbuf+n+ti.nhdr, ti.length);
diff --git a/src/ocsp.c b/src/ocsp.c
index 4b26f8d..c41234e 100644
--- a/src/ocsp.c
+++ b/src/ocsp.c
@@ -912,6 +912,12 @@ parse_response_extensions (ksba_ocsp_t ocsp,
else
ocsp->good_nonce = 1;
}
+ if (ti.length > (1<<24))
+ {
+ /* Bail out on much too large objects. */
+ err = gpg_error (GPG_ERR_BAD_BER);
+ goto leave;
+ }
ex = xtrymalloc (sizeof *ex + strlen (oid) + ti.length);
if (!ex)
{
@@ -979,6 +985,12 @@ parse_single_extensions (struct ocsp_reqitem_s *ri,
err = parse_octet_string (&data, &datalen, &ti);
if (err)
goto leave;
+ if (ti.length > (1<<24))
+ {
+ /* Bail out on much too large objects. */
+ err = gpg_error (GPG_ERR_BAD_BER);
+ goto leave;
+ }
ex = xtrymalloc (sizeof *ex + strlen (oid) + ti.length);
if (!ex)
{
--
2.35.5

23
SPECS/libksba/libksba.spec
View File

@ -1,7 +1,7 @@
Summary: Library for accessing X.509 and CMS data structure.
Name: libksba
Version: 1.3.5
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv3+
URL: https://www.gnupg.org/(fr)/download/index.html#libksba
Group: Security/Libraries.
@ -11,21 +11,22 @@ Vendor: VMware, Inc.
Distribution: Photon
BuildRequires: libgpg-error-devel >= 1.2
Patch0: 0001-Fix-for-CVE-2022-47629.patch
%description
Libksba is a library to make the tasks of working with X.509 certificates,
CMS data and related objects more easy. It provides a highlevel interface
to the implemented protocols and presents the data in a consistent way.
CMS data and related objects more easy. It provides a highlevel interface
to the implemented protocols and presents the data in a consistent way.
%prep
%setup -q
%autosetup -p1
%build
%configure --disable-static \
--prefix=%{_prefix}
make
%configure --disable-static
make %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} install
make %{?_smp_mflags} DESTDIR=%{buildroot} install
find %{buildroot}%{_libdir} -name '*.la' -delete
%check
@ -45,8 +46,10 @@ make %{?_smp_mflags} -k check
%exclude %{_datadir}/info/dir
%changelog
* Tue Apr 11 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.3.5-1
- Udpated to version 1.3.5
* Thu Jan 05 2023 Srish Srinivasan <ssrish@vmware.com> 1.3.5-2
- Fix for CVE-2022-47629
* Tue Apr 11 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.3.5-1
- Udpated to version 1.3.5
* Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 1.3.4-2
- BuildRequired libgpg-error-devel.
* Wed Jul 27 2016 Kumar Kaushik <kaushikk@vmware.com> 1.3.4-1