From 8081d645353ed934a0158329f2f36ea49d663e19 Mon Sep 17 00:00:00 2001 From: "Bonnans, Laurent" Date: Fri, 19 Jul 2019 14:27:48 +0000 Subject: openssl: fix valgrind errors on v1.1.1c Running valgrind against code using Openssl v1.1.1c reports a large number of uninitialized memory errors. This fix from upstream solves this problem. Signed-off-by: Laurent Bonnans Signed-off-by: Richard Purdie --- .../0001-Fix-broken-change-from-b3d113e.patch | 35 ++++++++++++++++++++++ .../recipes-connectivity/openssl/openssl_1.1.1c.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix-broken-change-from-b3d113e.patch (limited to 'meta') diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-broken-change-from-b3d113e.patch b/meta/recipes-connectivity/openssl/openssl/0001-Fix-broken-change-from-b3d113e.patch new file mode 100644 index 0000000000..6b4789fc70 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-broken-change-from-b3d113e.patch @@ -0,0 +1,35 @@ +From 711a161f03ef9ed7cd149a22bf1203700c103e96 Mon Sep 17 00:00:00 2001 +From: Pauli +Date: Fri, 29 Mar 2019 09:24:07 +1000 +Subject: [PATCH] Fix broken change from b3d113e. + +Reviewed-by: Tim Hudson +(Merged from https://github.com/openssl/openssl/pull/8606) + +Running valgrind against code using Openssl v1.1.1c reports a large number of +uninitialized memory errors. This fix from upstream solves this problem. + +Upstream-Status: Backport [https://github.com/openssl/openssl/commit/711a161f03ef9ed7cd149a22bf1203700c103e96] +Signed-off-by: Laurent Bonnans +--- + crypto/rand/rand_lib.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c +index 23abbde156..a298b7515b 100644 +--- a/crypto/rand/rand_lib.c ++++ b/crypto/rand/rand_lib.c +@@ -235,8 +235,9 @@ size_t rand_drbg_get_nonce(RAND_DRBG *drbg, + struct { + void * instance; + int count; +- } data = { NULL, 0 }; ++ } data; + ++ memset(&data, 0, sizeof(data)); + pool = rand_pool_new(0, min_len, max_len); + if (pool == NULL) + return 0; +-- +2.20.1 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb index 377adb1785..75159ac725 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://0001-Fix-build-error-for-aarch64-big-endian.patch \ + file://0001-Fix-broken-change-from-b3d113e.patch \ " SRC_URI_append_class-nativesdk = " \ -- cgit 1.2.3-korg