From patchwork Fri Sep 22 09:59:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Chee Yang" X-Patchwork-Id: 30981 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 45E1DCD4F49 for ; Fri, 22 Sep 2023 10:19:30 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.18544.1695377960065652485 for ; Fri, 22 Sep 2023 03:19:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=JVurLxPY; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: chee.yang.lee@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695377960; x=1726913960; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=FW6GCSXS5DaWLc/mQxntVwQ7312tsQQ11qtx3FYdUtU=; b=JVurLxPYWcl94eHWtWtcgqKQxdP9Gk1lX3lQufH+q+fQ9uRicrM6TI4O tq7VO3UZZHl6zh2TkAa8cp3Oh99pj1GOM65/QbImfc3dteugQRITBcv1y OiVpBX034rZ6W4D90PjPIxbCV/6GIsVUIjso7fhZ4+9v7WNDgjO0v8WP8 jzKqhpfOR0oOc2113kGL4U0yTBkxLAiI5YSOONvDLQJl7nbJCy8sRwCfB UY7XuLSojA0BMKkezucst8kwcBFjG/0CGyitZCVhmaneoPAvOBVjlK7hS 0qRaIg/CzB9ScStYFxt8pBVOCezNxoV+Odm0Z8B222u32xtKr1QvnO44c A==; X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="383542990" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="383542990" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2023 03:19:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="817729063" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="817729063" Received: from andromeda02.png.intel.com ([10.221.253.198]) by fmsmga004.fm.intel.com with ESMTP; 22 Sep 2023 03:19:18 -0700 From: chee.yang.lee@intel.com To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 1/5] irssi: 1.4.2 -> 1.4.4 Date: Fri, 22 Sep 2023 17:59:37 +0800 Message-Id: <20230922095941.3958983-1-chee.yang.lee@intel.com> X-Mailer: git-send-email 2.37.3 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 ; Fri, 22 Sep 2023 10:19:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105050 From: Lee Chee Yang 1.4.4 The Irssi team released this 2023-03-31 Changes Expose location of signals.txt via pkg-config (codeberg!1, #1439, #1446, Additions Levels can now be inverted using ^ prefix in the /WINDOW (HIDE)LEVEL commands (#1428) Support receiving monospace (#1370, #1442). By Linus Heckemann Fixes Fix config broken by /WINDOW LOGFILE without parameter (#1392, #1432) Fix broken /LASTLOG -window switch (#1418, #1424, regression introduced in #1398) Fix logic in how actions are printed for other protocols (codeberg!3, Fix stale special collector use after free (#1456). Reported by ednash Help and message fixes (#1421, #1429, #1431, #1434, #1438, #1452, #1453, 1.4.3 The Irssi team released this 2022-10-31 Fixes Fix freeze on Alt+arrows (#1416, #1417) Fix crash on /upgrade (#1399, #1419) Fix saving of -disallow_starttls (#1401, #1420) Fix libnv detection on FreeBSD (freebsd#265397, #1407). By Guido Falsi and Kristof Provost Minor help and script fixes (#1380, #1393, #1411, #1413, #1414, #1415) Signed-off-by: Lee Chee Yang --- .../irssi/{irssi_1.4.2.bb => irssi_1.4.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-connectivity/irssi/{irssi_1.4.2.bb => irssi_1.4.4.bb} (87%) diff --git a/meta-oe/recipes-connectivity/irssi/irssi_1.4.2.bb b/meta-oe/recipes-connectivity/irssi/irssi_1.4.4.bb similarity index 87% rename from meta-oe/recipes-connectivity/irssi/irssi_1.4.2.bb rename to meta-oe/recipes-connectivity/irssi/irssi_1.4.4.bb index 455561f613..52de589dd8 100644 --- a/meta-oe/recipes-connectivity/irssi/irssi_1.4.2.bb +++ b/meta-oe/recipes-connectivity/irssi/irssi_1.4.4.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55fdc1113306167d6ea2561404ce02f8" DEPENDS = "glib-2.0 ncurses openssl" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" -SRC_URI[sha256sum] = "79a4765d2dfe153c440a1775b074d5d0682b96814c7cf92325b5e15ce50e26a8" +SRC_URI[sha256sum] = "fefe9ec8c7b1475449945c934a2360ab12693454892be47a6d288c63eb107ead" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" From patchwork Fri Sep 22 09:59:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Chee Yang" X-Patchwork-Id: 30977 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 3F562CD4F53 for ; Fri, 22 Sep 2023 10:19:30 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.18544.1695377960065652485 for ; Fri, 22 Sep 2023 03:19:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=ev8OwRZB; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: chee.yang.lee@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695377960; x=1726913960; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=TT/9l7BMAnIIlpnnAR5cXTc3VrPh/JTiQt1lKQgQfyQ=; b=ev8OwRZBa1s7IZpWvh88vJMfEhRTRTGMAf3h4VxbykfztY4Nz2Y/PuxD 3IktMF/f75cKpUisN5qd2UgaD+JCxMTr6p4fkOvsjVvm8V87jX1ewfj5z /c4btq+W2NrgxUdR1xE/yzlfaDvXCtcroX/FxDAjhplgpz75ljECJMoac zAo6g545V+vWVr5jLL2Ya5LkPA3IaIeyIhrsO1xp+24noJsSpGUlWTMg6 TMVPibyVzkJkaB6RkL5mXSDk/FnCgY8iaC9Urns+KqwA3D+yPfe4YTjFd t3JVyN2FxdCqIvefqIeJaQutPIdiuwqH+64wGiv1q1NoIIuvJJxWh7m0J g==; X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="383542992" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="383542992" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2023 03:19:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="817729064" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="817729064" Received: from andromeda02.png.intel.com ([10.221.253.198]) by fmsmga004.fm.intel.com with ESMTP; 22 Sep 2023 03:19:19 -0700 From: chee.yang.lee@intel.com To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 2/5] iniparser: Fix CVE-2023-33461 Date: Fri, 22 Sep 2023 17:59:38 +0800 Message-Id: <20230922095941.3958983-2-chee.yang.lee@intel.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230922095941.3958983-1-chee.yang.lee@intel.com> References: <20230922095941.3958983-1-chee.yang.lee@intel.com> 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 ; Fri, 22 Sep 2023 10:19:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105051 From: Lee Chee Yang Signed-off-by: Lee Chee Yang --- .../iniparser/iniparser/CVE-2023-33461.patch | 48 +++++++++++++++++++ .../iniparser/iniparser_4.1.bb | 4 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/iniparser/iniparser/CVE-2023-33461.patch diff --git a/meta-oe/recipes-support/iniparser/iniparser/CVE-2023-33461.patch b/meta-oe/recipes-support/iniparser/iniparser/CVE-2023-33461.patch new file mode 100644 index 0000000000..db5fb06aac --- /dev/null +++ b/meta-oe/recipes-support/iniparser/iniparser/CVE-2023-33461.patch @@ -0,0 +1,48 @@ +CVE: CVE-2023-33461 +Upstream-Status: Backport [https://github.com/ndevilla/iniparser/pull/146/commits/ace9871f65d11b5d73f0b9ee8cf5d2807439442d] +Signed-off-by: Lee Chee Yang + + +From ace9871f65d11b5d73f0b9ee8cf5d2807439442d Mon Sep 17 00:00:00 2001 +From: Antonio +Date: Fri, 2 Jun 2023 15:03:10 -0300 +Subject: [PATCH] Handle null return from iniparser_getstring + +Fix handling of NULL returns from iniparser_getstring in +iniparser_getboolean, iniparser_getlongint and iniparser_getdouble, +avoiding a crash. +--- + src/iniparser.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/iniparser.c b/src/iniparser.c +index f1d1658..dbceb20 100644 +--- a/src/iniparser.c ++++ b/src/iniparser.c +@@ -456,7 +456,7 @@ long int iniparser_getlongint(const dictionary * d, const char * key, long int n + const char * str ; + + str = iniparser_getstring(d, key, INI_INVALID_KEY); +- if (str==INI_INVALID_KEY) return notfound ; ++ if (str==NULL || str==INI_INVALID_KEY) return notfound ; + return strtol(str, NULL, 0); + } + +@@ -511,7 +511,7 @@ double iniparser_getdouble(const dictionary * d, const char * key, double notfou + const char * str ; + + str = iniparser_getstring(d, key, INI_INVALID_KEY); +- if (str==INI_INVALID_KEY) return notfound ; ++ if (str==NULL || str==INI_INVALID_KEY) return notfound ; + return atof(str); + } + +@@ -553,7 +553,7 @@ int iniparser_getboolean(const dictionary * d, const char * key, int notfound) + const char * c ; + + c = iniparser_getstring(d, key, INI_INVALID_KEY); +- if (c==INI_INVALID_KEY) return notfound ; ++ if (c==NULL || c==INI_INVALID_KEY) return notfound ; + if (c[0]=='y' || c[0]=='Y' || c[0]=='1' || c[0]=='t' || c[0]=='T') { + ret = 1 ; + } else if (c[0]=='n' || c[0]=='N' || c[0]=='0' || c[0]=='f' || c[0]=='F') { diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.1.bb b/meta-oe/recipes-support/iniparser/iniparser_4.1.bb index f9e1530161..5e42cdcb06 100644 --- a/meta-oe/recipes-support/iniparser/iniparser_4.1.bb +++ b/meta-oe/recipes-support/iniparser/iniparser_4.1.bb @@ -10,7 +10,9 @@ PV .= "+git${SRCPV}" SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https;branch=master \ file://0001-iniparser.pc-Make-libpath-a-variable.patch \ - file://Add-CMake-support.patch" + file://Add-CMake-support.patch \ + file://CVE-2023-33461.patch \ +" SRCREV= "deb85ad4936d4ca32cc2260ce43323d47936410d" From patchwork Fri Sep 22 09:59:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Chee Yang" X-Patchwork-Id: 30978 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 3AE9CCD4F52 for ; Fri, 22 Sep 2023 10:19:30 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.18544.1695377960065652485 for ; Fri, 22 Sep 2023 03:19:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=T/JNkU7X; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: chee.yang.lee@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695377961; x=1726913961; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=GSBj/qQIB7N75MAawaHt87WtZc7+NVxTD0iMy8WOsnY=; b=T/JNkU7XMavT4tZuTyFBf6U7zenc/KOHhICQw2ja+SEvgfIButoXT1yi c+wJ8bf3a/QV1junFv2RJDGS+Rhsywst/4EIdjaCoI4PvOpui/Jdjm/H0 TORn4IFpWMa2X6TQNiDUU0h3mH2TbTNS8dkzcDKWJ7eX6oyjgIqD9PUcZ ZlKJMi1J1MXWpIppW3Rzx09M+PU/vY7Pz9qX0EnndWgwz4dsun5MkPJyj 4Yj+WyI4Pgi6teiwwEfPU/1sTDJNrrTOOCHp3zj2xz7Hhbp3+YTjYIom0 jtRdRYYNuSBfuDeTvaXBjmJJxKNeQyY5iaAiyDWlT6gq/dkCbb6+VJKZ3 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="383542998" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="383542998" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2023 03:19:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="817729065" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="817729065" Received: from andromeda02.png.intel.com ([10.221.253.198]) by fmsmga004.fm.intel.com with ESMTP; 22 Sep 2023 03:19:20 -0700 From: chee.yang.lee@intel.com To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 3/5] opensc: fix CVE-2023-2977 Date: Fri, 22 Sep 2023 17:59:39 +0800 Message-Id: <20230922095941.3958983-3-chee.yang.lee@intel.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230922095941.3958983-1-chee.yang.lee@intel.com> References: <20230922095941.3958983-1-chee.yang.lee@intel.com> 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 ; Fri, 22 Sep 2023 10:19:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105052 From: Lee Chee Yang Signed-off-by: Lee Chee Yang --- .../opensc/files/CVE-2023-2977.patch | 54 +++++++++++++++++++ .../recipes-support/opensc/opensc_0.23.0.bb | 1 + 2 files changed, 55 insertions(+) create mode 100644 meta-oe/recipes-support/opensc/files/CVE-2023-2977.patch diff --git a/meta-oe/recipes-support/opensc/files/CVE-2023-2977.patch b/meta-oe/recipes-support/opensc/files/CVE-2023-2977.patch new file mode 100644 index 0000000000..165fc316bf --- /dev/null +++ b/meta-oe/recipes-support/opensc/files/CVE-2023-2977.patch @@ -0,0 +1,54 @@ +CVE: CVE-2023-2977 +Upstream-Status: Backport [ https://github.com/OpenSC/OpenSC/commit/81944d1529202bd28359bede57c0a15deb65ba8a ] +Signed-off-by: Lee Chee Yang + + +From 81944d1529202bd28359bede57c0a15deb65ba8a Mon Sep 17 00:00:00 2001 +From: fullwaywang +Date: Mon, 29 May 2023 10:38:48 +0800 +Subject: [PATCH] pkcs15init: correct left length calculation to fix buffer + overrun bug. Fixes #2785 + +--- + src/pkcs15init/pkcs15-cardos.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/pkcs15init/pkcs15-cardos.c b/src/pkcs15init/pkcs15-cardos.c +index 9715cf390f..f41f73c349 100644 +--- a/src/pkcs15init/pkcs15-cardos.c ++++ b/src/pkcs15init/pkcs15-cardos.c +@@ -872,7 +872,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card) + sc_apdu_t apdu; + u8 rbuf[SC_MAX_APDU_BUFFER_SIZE]; + int r; +- const u8 *p = rbuf, *q; ++ const u8 *p = rbuf, *q, *pp; + size_t len, tlen = 0, ilen = 0; + + sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0xca, 0x01, 0x88); +@@ -888,13 +888,13 @@ static int cardos_have_verifyrc_package(sc_card_t *card) + return 0; + + while (len != 0) { +- p = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen); +- if (p == NULL) ++ pp = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen); ++ if (pp == NULL) + return 0; + if (card->type == SC_CARD_TYPE_CARDOS_M4_3) { + /* the verifyRC package on CardOS 4.3B use Manufacturer ID 0x01 */ + /* and Package Number 0x07 */ +- q = sc_asn1_find_tag(card->ctx, p, tlen, 0x01, &ilen); ++ q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x01, &ilen); + if (q == NULL || ilen != 4) + return 0; + if (q[0] == 0x07) +@@ -902,7 +902,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card) + } else if (card->type == SC_CARD_TYPE_CARDOS_M4_4) { + /* the verifyRC package on CardOS 4.4 use Manufacturer ID 0x03 */ + /* and Package Number 0x02 */ +- q = sc_asn1_find_tag(card->ctx, p, tlen, 0x03, &ilen); ++ q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x03, &ilen); + if (q == NULL || ilen != 4) + return 0; + if (q[0] == 0x02) diff --git a/meta-oe/recipes-support/opensc/opensc_0.23.0.bb b/meta-oe/recipes-support/opensc/opensc_0.23.0.bb index f68107df87..b3fc1f0458 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.23.0.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.23.0.bb @@ -16,6 +16,7 @@ SRCREV = "5497519ea6b4af596628f8f8f2f904bacaa3148f" SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https \ file://0001-pkcs11-tool-Fix-private-key-import.patch \ file://0002-pkcs11-tool-Log-more-information-on-OpenSSL-errors.patch \ + file://CVE-2023-2977.patch \ " DEPENDS = "virtual/libiconv openssl" From patchwork Fri Sep 22 09:59:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Chee Yang" X-Patchwork-Id: 30979 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 53378CD4F57 for ; Fri, 22 Sep 2023 10:19:30 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.18544.1695377960065652485 for ; Fri, 22 Sep 2023 03:19:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=U5fMFXA4; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: chee.yang.lee@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695377962; x=1726913962; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=PlLTunGcGceN0tGR+eFkFfTlgh3l2o8lUOqvJOSCWKU=; b=U5fMFXA4zb/U/ZMC3kWShwnkcBh5ZszbJZU9ZPVLPLQJnNAhNx6rQC2C OnqZzETx+cvTc/4B669rHVnMfIBL31MYh1NswFt2dg2Q4F5iZ0mlvm85q xiSxLtkcPcL4/jXcsjlMY1GYN8UbX8yH05Lk2fSN9ZF5v4+zfy3ssAIZh 7fVxjyhfXm0bu9iIPTVBTkgbpECFpwwGvXvvBOEOehv8FyLUzHT2iQCQA QkXay7xKRFqS36ZPjXLQtkUirueFRESmqrsQ3wCQlQea5Oqm/CTNBylhL rt82fmp6DVLUN88MY0dap3Y5ItHs13YnTkgz1lKMKAStX4dAARcp8sjG2 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="383542999" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="383542999" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2023 03:19:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="817729066" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="817729066" Received: from andromeda02.png.intel.com ([10.221.253.198]) by fmsmga004.fm.intel.com with ESMTP; 22 Sep 2023 03:19:21 -0700 From: chee.yang.lee@intel.com To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 4/5] x11vnc: Fix CVE-2020-29074 Date: Fri, 22 Sep 2023 17:59:40 +0800 Message-Id: <20230922095941.3958983-4-chee.yang.lee@intel.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230922095941.3958983-1-chee.yang.lee@intel.com> References: <20230922095941.3958983-1-chee.yang.lee@intel.com> 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 ; Fri, 22 Sep 2023 10:19:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105053 From: Lee Chee Yang Signed-off-by: Lee Chee Yang --- .../x11vnc/files/CVE-2020-29074.patch | 27 +++++++++++++++++++ .../recipes-graphics/x11vnc/x11vnc_0.9.16.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta-oe/recipes-graphics/x11vnc/files/CVE-2020-29074.patch diff --git a/meta-oe/recipes-graphics/x11vnc/files/CVE-2020-29074.patch b/meta-oe/recipes-graphics/x11vnc/files/CVE-2020-29074.patch new file mode 100644 index 0000000000..fbdb9123cc --- /dev/null +++ b/meta-oe/recipes-graphics/x11vnc/files/CVE-2020-29074.patch @@ -0,0 +1,27 @@ +CVE: CVE-2020-29074 +Upstream-Status: Backport [https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a ] +Signed-off-by: Lee Chee Yang + + +From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gu=C3=A9nal=20DAVALAN?= +Date: Wed, 18 Nov 2020 08:40:45 +0100 +Subject: [PATCH] scan: limit access to shared memory segments to current user + +--- + src/scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/scan.c b/src/scan.c +index 43e00d20..12994d52 100644 +--- a/src/scan.c ++++ b/src/scan.c +@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, XImage **ximg_ptr, int w, int h, + + #if HAVE_XSHM + shm->shmid = shmget(IPC_PRIVATE, +- xim->bytes_per_line * xim->height, IPC_CREAT | 0777); ++ xim->bytes_per_line * xim->height, IPC_CREAT | 0600); + + if (shm->shmid == -1) { + rfbErr("shmget(%s) failed.\n", name); diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb index 92b3ac5f67..3633bbc26b 100644 --- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb @@ -11,6 +11,7 @@ PV .= "+git${SRCPV}" SRC_URI = "git://github.com/LibVNC/x11vnc;branch=master;protocol=https \ file://starting-fix.patch \ + file://CVE-2020-29074.patch \ " S = "${WORKDIR}/git" From patchwork Fri Sep 22 09:59:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Chee Yang" X-Patchwork-Id: 30980 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 5758DCD4F58 for ; Fri, 22 Sep 2023 10:19:30 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.18544.1695377960065652485 for ; Fri, 22 Sep 2023 03:19:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=lkZahuND; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: chee.yang.lee@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695377963; x=1726913963; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=gh9n+a3kTgo9/wI9U9HQIadDOjwLM44969tD+7jEn6I=; b=lkZahuNDIL9P5ZldbLvFawmBx62VIUrKEAUSBoSIQzl4EKnaSvSHtUJl hkqCO5BCx4CWaWzBTfzM15urIf8jFOJjDNMaSPJ3valff3uaffqQ65kmT IWuSUuDoYfh6AeKdoULJYAGy97BRWx0Txzs3vqLMeGXQkQhUiP2VPEoty Tj4FvZ2VtiEPcoX7IuOqfJzp7m8fECe38ghBW/jmwiOOUWKcdxarxOGWl Pb6gBm5KR3MmB96Xc8cCaQQnfvKspOMnZLrn0bA6wOWGbwSMcjZj3vDnV 2gb67fxyTBe0W4dMXq5W2GsHWuDJrgQHkGWZiTsanMjrLdo4tV1Z8O5uK Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="383543004" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="383543004" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2023 03:19:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="817729067" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="817729067" Received: from andromeda02.png.intel.com ([10.221.253.198]) by fmsmga004.fm.intel.com with ESMTP; 22 Sep 2023 03:19:22 -0700 From: chee.yang.lee@intel.com To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 5/5] libvncserver: update to 0.9.14 Date: Fri, 22 Sep 2023 17:59:41 +0800 Message-Id: <20230922095941.3958983-5-chee.yang.lee@intel.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230922095941.3958983-1-chee.yang.lee@intel.com> References: <20230922095941.3958983-1-chee.yang.lee@intel.com> 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 ; Fri, 22 Sep 2023 10:19:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105054 From: Lee Chee Yang 0.9.14 represents a gradual improvement over 0.9.13 with lots of developments all over the place. 40 issues and pull requests were closed/merged with this release. Highlights on the LibVNCServer side are a refined multi-threaded implementation, support for Unicode clipboard data diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb similarity index 97% rename from meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb rename to meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb index 93f6951739..50bdad57d5 100644 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb @@ -45,7 +45,7 @@ FILES:libvncclient = "${libdir}/libvncclient.*" inherit cmake SRC_URI = "git://github.com/LibVNC/libvncserver;branch=master;protocol=https" -SRCREV = "2aa20dad4c23c18948d3f63b33f9dfec1f837729" +SRCREV = "10e9eb75f73e973725dc75c373de5d89807af028" S = "${WORKDIR}/git"