diff options
Diffstat (limited to 'meta/recipes-support/libksba')
-rw-r--r-- | meta/recipes-support/libksba/libksba/CVE-2022-3515.patch | 47 | ||||
-rw-r--r-- | meta/recipes-support/libksba/libksba/CVE-2022-47629.patch | 69 | ||||
-rw-r--r-- | meta/recipes-support/libksba/libksba_1.3.5.bb | 10 |
3 files changed, 125 insertions, 1 deletions
diff --git a/meta/recipes-support/libksba/libksba/CVE-2022-3515.patch b/meta/recipes-support/libksba/libksba/CVE-2022-3515.patch new file mode 100644 index 0000000000..ff9f2f9275 --- /dev/null +++ b/meta/recipes-support/libksba/libksba/CVE-2022-3515.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 4b7d9cd4a018898d7714ce06f3faf2626c14582b Mon Sep 17 00:00:00 2001 | ||
2 | From: Werner Koch <wk@gnupg.org> | ||
3 | Date: Wed, 5 Oct 2022 14:19:06 +0200 | ||
4 | Subject: [PATCH] Detect a possible overflow directly in the TLV parser. | ||
5 | |||
6 | * src/ber-help.c (_ksba_ber_read_tl): Check for overflow of a commonly | ||
7 | used sum. | ||
8 | -- | ||
9 | |||
10 | It is quite common to have checks like | ||
11 | |||
12 | if (ti.nhdr + ti.length >= DIM(tmpbuf)) | ||
13 | return gpg_error (GPG_ERR_TOO_LARGE); | ||
14 | |||
15 | This patch detects possible integer overflows immmediately when | ||
16 | creating the TI object. | ||
17 | |||
18 | Reported-by: ZDI-CAN-18927, ZDI-CAN-18928, ZDI-CAN-18929 | ||
19 | |||
20 | |||
21 | Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libksba.git;a=patch;h=4b7d9cd4a018898d7714ce06f3faf2626c14582b] | ||
22 | CVE: CVE-2022-3515 | ||
23 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> | ||
24 | --- | ||
25 | src/ber-help.c | 6 ++++++ | ||
26 | 1 file changed, 6 insertions(+) | ||
27 | |||
28 | diff --git a/src/ber-help.c b/src/ber-help.c | ||
29 | index 81c31ed..56efb6a 100644 | ||
30 | --- a/src/ber-help.c | ||
31 | +++ b/src/ber-help.c | ||
32 | @@ -182,6 +182,12 @@ _ksba_ber_read_tl (ksba_reader_t reader, struct tag_info *ti) | ||
33 | ti->length = len; | ||
34 | } | ||
35 | |||
36 | + if (ti->length > ti->nhdr && (ti->nhdr + ti->length) < ti->length) | ||
37 | + { | ||
38 | + ti->err_string = "header+length would overflow"; | ||
39 | + return gpg_error (GPG_ERR_EOVERFLOW); | ||
40 | + } | ||
41 | + | ||
42 | /* Without this kludge some example certs can't be parsed */ | ||
43 | if (ti->class == CLASS_UNIVERSAL && !ti->tag) | ||
44 | ti->length = 0; | ||
45 | -- | ||
46 | 2.11.0 | ||
47 | |||
diff --git a/meta/recipes-support/libksba/libksba/CVE-2022-47629.patch b/meta/recipes-support/libksba/libksba/CVE-2022-47629.patch new file mode 100644 index 0000000000..b09d0eb557 --- /dev/null +++ b/meta/recipes-support/libksba/libksba/CVE-2022-47629.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | From b17444b3c47e32c77a3ba5335ae30ccbadcba3cf Mon Sep 17 00:00:00 2001 | ||
2 | From: Werner Koch <wk@gnupg.org> | ||
3 | Date: Tue, 22 Nov 2022 16:36:46 +0100 | ||
4 | Subject: [PATCH] Fix an integer overflow in the CRL signature parser. | ||
5 | |||
6 | * src/crl.c (parse_signature): N+N2 now checked for overflow. | ||
7 | |||
8 | * src/ocsp.c (parse_response_extensions): Do not accept too large | ||
9 | values. | ||
10 | (parse_single_extensions): Ditto. | ||
11 | -- | ||
12 | |||
13 | The second patch is an extra safegourd not related to the reported | ||
14 | bug. | ||
15 | |||
16 | GnuPG-bug-id: 6284 | ||
17 | Reported-by: Joseph Surin, elttam | ||
18 | CVE: CVE-2022-47629 | ||
19 | https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libksba.git;a=commit;h=f61a5ea4e0f6a80fd4b28ef0174bee77793cf070 | ||
20 | Upstream-Status: Backport | ||
21 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> | ||
22 | --- | ||
23 | src/crl.c | 2 +- | ||
24 | src/ocsp.c | 12 ++++++++++++ | ||
25 | 2 files changed, 13 insertions(+), 1 deletion(-) | ||
26 | |||
27 | diff --git a/src/crl.c b/src/crl.c | ||
28 | index 87a3fa3..9d3028e 100644 | ||
29 | --- a/src/crl.c | ||
30 | +++ b/src/crl.c | ||
31 | @@ -1434,7 +1434,7 @@ parse_signature (ksba_crl_t crl) | ||
32 | && !ti.is_constructed) ) | ||
33 | return gpg_error (GPG_ERR_INV_CRL_OBJ); | ||
34 | n2 = ti.nhdr + ti.length; | ||
35 | - if (n + n2 >= DIM(tmpbuf)) | ||
36 | + if (n + n2 >= DIM(tmpbuf) || (n + n2) < n) | ||
37 | return gpg_error (GPG_ERR_TOO_LARGE); | ||
38 | memcpy (tmpbuf+n, ti.buf, ti.nhdr); | ||
39 | err = read_buffer (crl->reader, tmpbuf+n+ti.nhdr, ti.length); | ||
40 | diff --git a/src/ocsp.c b/src/ocsp.c | ||
41 | index 4b26f8d..c41234e 100644 | ||
42 | --- a/src/ocsp.c | ||
43 | +++ b/src/ocsp.c | ||
44 | @@ -912,6 +912,12 @@ parse_response_extensions (ksba_ocsp_t ocsp, | ||
45 | else | ||
46 | ocsp->good_nonce = 1; | ||
47 | } | ||
48 | + if (ti.length > (1<<24)) | ||
49 | + { | ||
50 | + /* Bail out on much too large objects. */ | ||
51 | + err = gpg_error (GPG_ERR_BAD_BER); | ||
52 | + goto leave; | ||
53 | + } | ||
54 | ex = xtrymalloc (sizeof *ex + strlen (oid) + ti.length); | ||
55 | if (!ex) | ||
56 | { | ||
57 | @@ -979,6 +985,12 @@ parse_single_extensions (struct ocsp_reqitem_s *ri, | ||
58 | err = parse_octet_string (&data, &datalen, &ti); | ||
59 | if (err) | ||
60 | goto leave; | ||
61 | + if (ti.length > (1<<24)) | ||
62 | + { | ||
63 | + /* Bail out on much too large objects. */ | ||
64 | + err = gpg_error (GPG_ERR_BAD_BER); | ||
65 | + goto leave; | ||
66 | + } | ||
67 | ex = xtrymalloc (sizeof *ex + strlen (oid) + ti.length); | ||
68 | if (!ex) | ||
69 | { | ||
diff --git a/meta/recipes-support/libksba/libksba_1.3.5.bb b/meta/recipes-support/libksba/libksba_1.3.5.bb index 336d7f8177..5293aa91e1 100644 --- a/meta/recipes-support/libksba/libksba_1.3.5.bb +++ b/meta/recipes-support/libksba/libksba_1.3.5.bb | |||
@@ -1,4 +1,9 @@ | |||
1 | SUMMARY = "Easy API to create and parse X.509 and CMS related objects" | 1 | SUMMARY = "Easy API to create and parse X.509 and CMS related objects" |
2 | DESCRIPTION = "A library to make the tasks of working with X.509 certificates, \ | ||
3 | CMS data and related objects more easy. It provides a highlevel interface to \ | ||
4 | the implemented protocols and presents the data in a consistent way. The \ | ||
5 | library does not rely on another cryptographic library but provides \ | ||
6 | hooks for easy integration with Libgcrypt. " | ||
2 | HOMEPAGE = "http://www.gnupg.org/related_software/libksba/" | 7 | HOMEPAGE = "http://www.gnupg.org/related_software/libksba/" |
3 | LICENSE = "GPLv3+ & (GPLv2+ | LGPLv3+)" | 8 | LICENSE = "GPLv3+ & (GPLv2+ | LGPLv3+)" |
4 | LICENSE_${PN} = "GPLv2+ | LGPLv3+" | 9 | LICENSE_${PN} = "GPLv2+ | LGPLv3+" |
@@ -17,7 +22,10 @@ inherit autotools binconfig-disabled pkgconfig texinfo | |||
17 | 22 | ||
18 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" | 23 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" |
19 | SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ | 24 | SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ |
20 | file://ksba-add-pkgconfig-support.patch" | 25 | file://ksba-add-pkgconfig-support.patch \ |
26 | file://CVE-2022-47629.patch \ | ||
27 | file://CVE-2022-3515.patch \ | ||
28 | " | ||
21 | 29 | ||
22 | SRC_URI[md5sum] = "8302a3e263a7c630aa7dea7d341f07a2" | 30 | SRC_URI[md5sum] = "8302a3e263a7c630aa7dea7d341f07a2" |
23 | SRC_URI[sha256sum] = "41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340" | 31 | SRC_URI[sha256sum] = "41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340" |