summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2024-05-18 12:43:06 +0200
committerSteve Sakoman <steve@sakoman.com>2024-05-29 05:24:08 -0700
commit22e55c047c10076654e91d51faa628444a327623 (patch)
tree897c331eeba1a41542fb46f121f0f9525cb63553
parent6d2a4fcdba7c2f79fa52a07b6dd1dd001730cb0b (diff)
downloadpoky-22e55c047c10076654e91d51faa628444a327623.tar.gz
openssl: patch CVE-2024-4603
Advisory: https://github.com/advisories/GHSA-85xr-ghj6-6m46 (From OE-Core rev: 601b81350c0f8487439885a576c4d7d883619a6d) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch180
-rw-r--r--meta/recipes-connectivity/openssl/openssl_3.0.13.bb1
2 files changed, 181 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch
new file mode 100644
index 0000000000..b8e0b9fb7d
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch
@@ -0,0 +1,180 @@
1From 3559e868e58005d15c6013a0c1fd832e51c73397 Mon Sep 17 00:00:00 2001
2From: Tomas Mraz <tomas@openssl.org>
3Date: Wed, 8 May 2024 15:23:45 +0200
4Subject: [PATCH] Check DSA parameters for excessive sizes before validating
5
6This avoids overly long computation of various validation
7checks.
8
9Fixes CVE-2024-4603
10
11Reviewed-by: Paul Dale <ppzgs1@gmail.com>
12Reviewed-by: Matt Caswell <matt@openssl.org>
13Reviewed-by: Neil Horman <nhorman@openssl.org>
14Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
15(Merged from https://github.com/openssl/openssl/pull/24346)
16
17(cherry picked from commit 85ccbab216da245cf9a6503dd327072f21950d9b)
18
19<dropped CHANGES.md modifications as it would need backport of all previous changes>
20
21CVE: CVE-2024-4603
22Upstream-Status: Backport [https://github.com/openssl/openssl/commit/3559e868e58005d15c6013a0c1fd832e51c73397]
23Signed-off-by: Peter Marko <peter.marko@siemens.com>
24---
25 crypto/dsa/dsa_check.c | 44 ++++++++++++--
26 .../invalid/p10240_q256_too_big.pem | 57 +++++++++++++++++++
27 2 files changed, 97 insertions(+), 4 deletions(-)
28 create mode 100644 test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
29
30diff --git a/crypto/dsa/dsa_check.c b/crypto/dsa/dsa_check.c
31index fb0e9129a2..122449a7bf 100644
32--- a/crypto/dsa/dsa_check.c
33+++ b/crypto/dsa/dsa_check.c
34@@ -19,8 +19,34 @@
35 #include "dsa_local.h"
36 #include "crypto/dsa.h"
37
38+static int dsa_precheck_params(const DSA *dsa, int *ret)
39+{
40+ if (dsa->params.p == NULL || dsa->params.q == NULL) {
41+ ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS);
42+ *ret = FFC_CHECK_INVALID_PQ;
43+ return 0;
44+ }
45+
46+ if (BN_num_bits(dsa->params.p) > OPENSSL_DSA_MAX_MODULUS_BITS) {
47+ ERR_raise(ERR_LIB_DSA, DSA_R_MODULUS_TOO_LARGE);
48+ *ret = FFC_CHECK_INVALID_PQ;
49+ return 0;
50+ }
51+
52+ if (BN_num_bits(dsa->params.q) >= BN_num_bits(dsa->params.p)) {
53+ ERR_raise(ERR_LIB_DSA, DSA_R_BAD_Q_VALUE);
54+ *ret = FFC_CHECK_INVALID_PQ;
55+ return 0;
56+ }
57+
58+ return 1;
59+}
60+
61 int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
62 {
63+ if (!dsa_precheck_params(dsa, ret))
64+ return 0;
65+
66 if (checktype == OSSL_KEYMGMT_VALIDATE_QUICK_CHECK)
67 return ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params,
68 FFC_PARAM_TYPE_DSA, ret);
69@@ -39,6 +65,9 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
70 */
71 int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
72 {
73+ if (!dsa_precheck_params(dsa, ret))
74+ return 0;
75+
76 return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret)
77 && *ret == 0;
78 }
79@@ -50,6 +79,9 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
80 */
81 int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret)
82 {
83+ if (!dsa_precheck_params(dsa, ret))
84+ return 0;
85+
86 return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret)
87 && *ret == 0;
88 }
89@@ -58,8 +90,10 @@ int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret)
90 {
91 *ret = 0;
92
93- return (dsa->params.q != NULL
94- && ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret));
95+ if (!dsa_precheck_params(dsa, ret))
96+ return 0;
97+
98+ return ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret);
99 }
100
101 /*
102@@ -72,8 +106,10 @@ int ossl_dsa_check_pairwise(const DSA *dsa)
103 BN_CTX *ctx = NULL;
104 BIGNUM *pub_key = NULL;
105
106- if (dsa->params.p == NULL
107- || dsa->params.g == NULL
108+ if (!dsa_precheck_params(dsa, &ret))
109+ return 0;
110+
111+ if (dsa->params.g == NULL
112 || dsa->priv_key == NULL
113 || dsa->pub_key == NULL)
114 return 0;
115diff --git a/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
116new file mode 100644
117index 0000000000..e85e2953b7
118--- /dev/null
119+++ b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
120@@ -0,0 +1,57 @@
121+-----BEGIN DSA PARAMETERS-----
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
176+vKuje86bePD6kD/LH3wmkA==
177+-----END DSA PARAMETERS-----
178--
1792.30.2
180
diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.13.bb b/meta/recipes-connectivity/openssl/openssl_3.0.13.bb
index 3b253ddde0..87ab4047d9 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.0.13.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.0.13.bb
@@ -13,6 +13,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
13 file://afalg.patch \ 13 file://afalg.patch \
14 file://0001-Configure-do-not-tweak-mips-cflags.patch \ 14 file://0001-Configure-do-not-tweak-mips-cflags.patch \
15 file://CVE-2024-2511.patch \ 15 file://CVE-2024-2511.patch \
16 file://CVE-2024-4603.patch \
16 " 17 "
17 18
18SRC_URI:append:class-nativesdk = " \ 19SRC_URI:append:class-nativesdk = " \