From patchwork Sun Feb 19 19:30:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 19776 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95DEDC6FD18 for ; Sun, 19 Feb 2023 19:31:30 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web10.3854.1676835080159970372 for ; Sun, 19 Feb 2023 11:31:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=LnlfiTux; spf=pass (domain: gmail.com, ip: 209.85.221.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f43.google.com with SMTP id c17so729797wrx.0 for ; Sun, 19 Feb 2023 11:31:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dicmUlnZzdbjj7nhvg2TQMO2QHKiNkLqC/r+ns08Yp8=; b=LnlfiTuxLdrUfCijQxHJLXL+Ru7jmqrV1ZqFgDbpOPp9MPFjl29/9Wv78E4R+fpTFi xhTcbdsu7dk/ZD/QDpjW4T4DiSBLxokKIZwXO8+LqQltPitv4IVTOL9gL6NqgJ/Y273t u7BA1G/+mGbRIZhijMnjpc8rIhY6Csgc6wAFcZxwmGYbJicBQBkCVPxzSakwQ4PqaLpX fWElOzfic2jlc6/6XZ7GhJKm7O2djNiXpi5otyM4P4PS6b/XJlbF1Cj1lQFuVzVkCEiG ZIHoePatEQTyqRyhYom80frAOkf2hkmgY0Z2xtIKh1swXu8+ZPIlUWTSdKaJrxV9T+QF 2NFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dicmUlnZzdbjj7nhvg2TQMO2QHKiNkLqC/r+ns08Yp8=; b=0tOLEpxU8rNJTLkTS0Sh9MJ2nZpmsWvRzyMSTGFkIGlWw+KyHk04kPB6JaHlC9YOu0 PV9N6mMUjlL/MLa9rF/cU4tIdjMtkmYao9UBbuZONIzeuXRUqjBt2d93uRGMJRk2mEfJ bsw4E3WUSN4NlnLq5KXvWFImVUnOvmEMcGz8AsHR1OM9DfP5OX+1F5pCruzTb/dZwKlk l2dKl7/lTt9uidMvSf0FQZzJs5Yy8VYhrGws+3U/R2+bWBXJjGWcwlSomMzoIRqq4QC0 GgPh97+xPYKgwsZBoe4tSfjTMnwPsd3E+/mY1RDiOiID/aTi9wVflXCDPT6EAzS8udOn TFoQ== X-Gm-Message-State: AO0yUKU79wIKdQAkqiPNozEwLDZ/A6MKEPKNxoWj+VHtK2+8EpeFZhGG fomZ5Y5uXA/d7WzB0ih2TlzmLkY+WZQ= X-Google-Smtp-Source: AK7set+3fLF5B9sakA/2Oy2aWLvMqcYlVY2a05VkF2t9VncQbLW0xo6PN6sKmvlQ3NdLFxpeczwU+Q== X-Received: by 2002:adf:dd87:0:b0:2c3:ffd4:ec74 with SMTP id x7-20020adfdd87000000b002c3ffd4ec74mr511983wrl.59.1676835081468; Sun, 19 Feb 2023 11:31:21 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d10-20020adffbca000000b002c54c8e70b1sm3347478wrs.9.2023.02.19.11.31.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 11:31:21 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 25/39] openssl: upgrade 3.0.7 -> 3.0.8 Date: Sun, 19 Feb 2023 20:30:47 +0100 Message-Id: <20230219193101.338397-25-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230219193101.338397-1-alex@linutronix.de> References: <20230219193101.338397-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Feb 2023 19:31:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177368 Signed-off-by: Alexander Kanavin --- .../openssl/openssl/CVE-2022-3996.patch | 43 ------------------- .../{openssl_3.0.7.bb => openssl_3.0.8.bb} | 3 +- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch rename meta/recipes-connectivity/openssl/{openssl_3.0.7.bb => openssl_3.0.8.bb} (98%) diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch deleted file mode 100644 index 6d70b323d1..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001 -From: Pauli -Date: Fri, 11 Nov 2022 09:40:19 +1100 -Subject: [PATCH] x509: fix double locking problem - -This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the -redundant flag setting. - -Fixes #19643 - -Fixes LOW CVE-2022-3996 - -Reviewed-by: Dmitry Belyavskiy -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/19652) - -(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5) - -Upstream-Status: Backport [https://github.com/openssl/openssl/commit/7725e7bfe6f2ce8146b6552b44e0d226be7638e7] -CVE: CVE-2022-3996 -Signed-off-by: Vivek Kumbhar ---- - crypto/x509/pcy_map.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c -index 05406c6493..60dfd1e320 100644 ---- a/crypto/x509/pcy_map.c -+++ b/crypto/x509/pcy_map.c -@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps) - - ret = 1; - bad_mapping: -- if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) { -- x->ex_flags |= EXFLAG_INVALID_POLICY; -- CRYPTO_THREAD_unlock(x->lock); -- } - sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free); - return ret; - --- -2.30.2 - diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.7.bb b/meta/recipes-connectivity/openssl/openssl_3.0.8.bb similarity index 98% rename from meta/recipes-connectivity/openssl/openssl_3.0.7.bb rename to meta/recipes-connectivity/openssl/openssl_3.0.8.bb index 1842148592..8771884dda 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.0.7.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.0.8.bb @@ -12,14 +12,13 @@ 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-Configure-do-not-tweak-mips-cflags.patch \ - file://CVE-2022-3996.patch \ " SRC_URI:append:class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[sha256sum] = "83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e" +SRC_URI[sha256sum] = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e" inherit lib_package multilib_header multilib_script ptest perlnative MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"