From patchwork Sat Feb 11 17:05:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 19368 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 39D14C636CC for ; Sat, 11 Feb 2023 17:06:06 +0000 (UTC) Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by mx.groups.io with SMTP id smtpd.web10.13399.1676135164890336737 for ; Sat, 11 Feb 2023 09:06:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qI0171ln; spf=pass (domain: gmail.com, ip: 209.85.167.182, mailfrom: akuster808@gmail.com) Received: by mail-oi1-f182.google.com with SMTP id c15so7032812oic.8 for ; Sat, 11 Feb 2023 09:06:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NFEHRJuk4cn9eu8kSmUNdIH03R+1WMOvllya4ZwsYUA=; b=qI0171lnzoQuLezBakf02MdT1kHUxDW9Vl8qKyRdxg1KfGwu7bVYZv1IgoC6pLD7R9 HPzufk9lgoG+x2ISKWt8NVyy3Y+TG1EuqUAvrRRc8v+nl2u5brSPQI7hEr/TAXbUWhuO NoFUZR53WPFaG8N05hppsBPFL/yfXwqFDrTb8WFD2MfKHTn3Ax3KR9SKvaJ3E9VZ/ia6 zQB8gLbmfrKNNxT9mvq+qFmyn2ZURF5FhhDx72s8uqMi4jwx6JXYHlyrn6zIp2Bemf25 KYHLqQRUG8kPwT8ucmIEgYVEBEZSiEkUqxz+0V+ZcewUpPtaaVQQz085ft/pPtNtcX/K M2kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NFEHRJuk4cn9eu8kSmUNdIH03R+1WMOvllya4ZwsYUA=; b=S/KCYKlrDZqg1SJqQ18ItjXRLyJXoP0h+TdiMGfOnoOSDx3HHSzb+yLav/rboV7sfP LYoUjUNrfaM2fp7ScS8U59IgJPUN3jZSPgD8LZG7wtWjk3UGLkLHSS8+yPMMSUXYNJc6 eoDJwk/2DBVFJwWh30LBzvn5YQWhJ5X1yEIeCy97gKYCytGnyB5DzCwN81afrtjrlhtB Lk36S5jJuNWbe7oKFrWI+1epSNbrLwEQ0lR17Ti874iep8zfEJa6hK1Bz2xltKx9u8IA RVdnEGkoD1LxNyXUdVBlXKgoEUWRVl7SNFPqDExvoQG7aWSHAWCrumBG13VVyJJQ7PaN aK7Q== X-Gm-Message-State: AO0yUKU1qnKYHEpT/mZ4OJIMZMlgwRJPaGCffzNljlksmHP1oXsDQHhc 2N3D7jt6dxGXzLSqXr+ppVCFwT+iJOU= X-Google-Smtp-Source: AK7set8dIeqKl74TAoCvywHpeYezwPiY+eOeBe/aoYEGeKWYsWM8jRlegOJF8aTAUY0i1wDca+iiDQ== X-Received: by 2002:a05:6808:a9c:b0:378:89a7:2f4f with SMTP id q28-20020a0568080a9c00b0037889a72f4fmr8710918oij.3.1676135163911; Sat, 11 Feb 2023 09:06:03 -0800 (PST) Received: from keaua.attlocal.net ([2600:1700:9190:ba10:6c32:d739:9179:1de7]) by smtp.gmail.com with ESMTPSA id p203-20020aca5bd4000000b0037d8670526esm275932oib.52.2023.02.11.09.06.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 09:06:02 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Wang Mingyu , Khem Raj Subject: [meta-oe][langdale][PATCH 1/6] python3-django: upgrade 4.1 -> 4.1.3 Date: Sat, 11 Feb 2023 12:05:56 -0500 Message-Id: <20230211170601.3988339-1-akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 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 ; Sat, 11 Feb 2023 17:06:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101036 From: Wang Mingyu Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit 1e4fd5514d2daf4b9b233bed42683aebc78d9fcf) Signed-off-by: Armin Kuster --- .../python/{python3-django_4.1.bb => python3-django_4.1.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-django_4.1.bb => python3-django_4.1.3.bb} (58%) diff --git a/meta-python/recipes-devtools/python/python3-django_4.1.bb b/meta-python/recipes-devtools/python/python3-django_4.1.3.bb similarity index 58% rename from meta-python/recipes-devtools/python/python3-django_4.1.bb rename to meta-python/recipes-devtools/python/python3-django_4.1.3.bb index 44ea5394da..6d800982af 100644 --- a/meta-python/recipes-devtools/python/python3-django_4.1.bb +++ b/meta-python/recipes-devtools/python/python3-django_4.1.3.bb @@ -1,7 +1,7 @@ require python-django.inc inherit setuptools3 -SRC_URI[sha256sum] = "032f8a6fc7cf05ccd1214e4a2e21dfcd6a23b9d575c6573cacc8c67828dbe642" +SRC_URI[sha256sum] = "678bbfc8604eb246ed54e2063f0765f13b321a50526bdc8cb1f943eda7fa31f1" RDEPENDS:${PN} += "\ ${PYTHON_PN}-sqlparse \ From patchwork Sat Feb 11 17:05:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 19367 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 3BBEAC61DA4 for ; Sat, 11 Feb 2023 17:06:06 +0000 (UTC) Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by mx.groups.io with SMTP id smtpd.web11.13426.1676135165782082607 for ; Sat, 11 Feb 2023 09:06:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eV9DWoyA; spf=pass (domain: gmail.com, ip: 209.85.167.176, mailfrom: akuster808@gmail.com) Received: by mail-oi1-f176.google.com with SMTP id dt8so7080737oib.0 for ; Sat, 11 Feb 2023 09:06:05 -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=0YvE0AJsotUsASDvhcESwnm5/NzTvbi3QqREZggjgoQ=; b=eV9DWoyAgfxD2W3a6dTtXbKL/dqH29TPL2cbCMmrDl44qNqhAXT1/11fOeYMoTXwuf +TURHg5AvMvwBv+4xCoXygDvOhBn865jUUwI9WVWoN3SpGHopBeH0avamNn+0ezHENbB bjSjQmvJ9X9mwQi5HBRKAIgHveJd/l+9v6Bunj/JVtw5/wnYa/r/ZR7go6KZb4hdjaup FSdFgl6N0/00TYac3ZhpVlW/hykF9VzmhpEmouC2yWxsXaFtPe6RMTGwZpMBRosAqror SL0BC3AQnedcjNLeOSh7kEfAr8GOj0IofX0nyruHWrEG/rWGSiCBGxwl4bX5GKgmIouU Q6wA== 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=0YvE0AJsotUsASDvhcESwnm5/NzTvbi3QqREZggjgoQ=; b=vVK4Vwz6wdjOk83YB0qyk1Jt8HsOf8yqcG623G9/voFDOiuWkVACW64qy1YAIDxEXQ vLGL8wyyexTak57EBv+7GNMPe2S9o7xWHYpMC3pr5+rQUNmmrpPZ2VFt2kK68Vsir/xn 6kv2V5aSBslR5EDqpGwXzx3crrnqIIW/sc8IypmZJo89jYCGCpR1VwnjaQnB34YlmMJs NUvnJ3n+dd1vt7TVjN44PDA8C+qw68J5K+M5IbdqAvqYOsobKcxuZNUbN8SKZEQ1eDY2 b34wSU6/DY8y6mAvGu+w4E8Lm/AaXdUOTTbDy9KLkwvEUUHAgpb9gQHI8LelD8U/gV3b ZrWg== X-Gm-Message-State: AO0yUKWnU/xiZFmBFEnGYFn8/5aW5fdo+9ds0iipaVwjSn9QddYjLoBE O6Pb5KMaohCFsuSb+dljW6BA59ah9zo= X-Google-Smtp-Source: AK7set+zmFaNNo92U762i3C26zo+TpD5dDN6CfQan5In1GGZqmv+WB+yaS0pE2rVk+UpmrDH2lT88A== X-Received: by 2002:aca:bdc3:0:b0:37a:2bf0:5017 with SMTP id n186-20020acabdc3000000b0037a2bf05017mr4913604oif.5.1676135164912; Sat, 11 Feb 2023 09:06:04 -0800 (PST) Received: from keaua.attlocal.net ([2600:1700:9190:ba10:6c32:d739:9179:1de7]) by smtp.gmail.com with ESMTPSA id p203-20020aca5bd4000000b0037d8670526esm275932oib.52.2023.02.11.09.06.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 09:06:04 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Wang Mingyu , Khem Raj Subject: [meta-oe][langdale][PATCH 2/6] python3-django: upgrade 4.1.3 -> 4.1.6 Date: Sat, 11 Feb 2023 12:05:57 -0500 Message-Id: <20230211170601.3988339-2-akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230211170601.3988339-1-akuster808@gmail.com> References: <20230211170601.3988339-1-akuster808@gmail.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 ; Sat, 11 Feb 2023 17:06:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101037 From: Wang Mingyu Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit c3b0591ddd0c65bc9a75a06dc599a7e90c760dbb) Signed-off-by: Armin Kuster --- .../python/{python3-django_4.1.3.bb => python3-django_4.1.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-django_4.1.3.bb => python3-django_4.1.6.bb} (58%) diff --git a/meta-python/recipes-devtools/python/python3-django_4.1.3.bb b/meta-python/recipes-devtools/python/python3-django_4.1.6.bb similarity index 58% rename from meta-python/recipes-devtools/python/python3-django_4.1.3.bb rename to meta-python/recipes-devtools/python/python3-django_4.1.6.bb index 6d800982af..e54398c456 100644 --- a/meta-python/recipes-devtools/python/python3-django_4.1.3.bb +++ b/meta-python/recipes-devtools/python/python3-django_4.1.6.bb @@ -1,7 +1,7 @@ require python-django.inc inherit setuptools3 -SRC_URI[sha256sum] = "678bbfc8604eb246ed54e2063f0765f13b321a50526bdc8cb1f943eda7fa31f1" +SRC_URI[sha256sum] = "bceb0fe1a386781af0788cae4108622756cd05e7775448deec04a71ddf87685d" RDEPENDS:${PN} += "\ ${PYTHON_PN}-sqlparse \ From patchwork Sat Feb 11 17:05:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 19370 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 1F9C2C636CC for ; Sat, 11 Feb 2023 17:06:16 +0000 (UTC) Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by mx.groups.io with SMTP id smtpd.web10.13402.1676135166825713635 for ; Sat, 11 Feb 2023 09:06:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=pyOBc3NT; spf=pass (domain: gmail.com, ip: 209.85.167.179, mailfrom: akuster808@gmail.com) Received: by mail-oi1-f179.google.com with SMTP id bi19so7055377oib.2 for ; Sat, 11 Feb 2023 09:06:06 -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=7aqJOxM2dUSlf/dUIL+F36BDQkSxbPDx7kTmrgKbV7o=; b=pyOBc3NTIQQB0L1IxCgwty1YDJBh+RmQtEI6jtHCVNIUv3pQjGj4uWjbU+aflVLvNC Z9zwEdsYPvXkwRlYL5qvPjXDMIVzJbrxDt4BV4tGQObAeuml6+g6lk6TitPnGYRXWGg2 T3a6yxETPKb/siTJSgVoQBdl7J69OU+6Xj8h1KOBHPTuAdcREH97d6hE0rb1pCkMJvle rnzudx1sPwec9S3el13jVNbzvmambOw7urbbMoIvKc8XbmGcaTP0aYi+CzPJXuNLSdv+ EBwfkutLBVOcC/Yhi9FHcpF7D8bwYd2UK5XKwsP+NwL0G5M6v2JMZ+06fGugyds556tQ 7LXw== 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=7aqJOxM2dUSlf/dUIL+F36BDQkSxbPDx7kTmrgKbV7o=; b=tbmwKU3LVfbOxnzjalbvnAdoX5zg2ASeHGB3CRD4kQpnFNdlBEr1EmD+Pv7wQUc2TE HwsE9FCSHGEG4eHQJu6ACCGKnIkHIMEEZHH5We92QYazNGXE1aru5Wa59WqTk2BZEEUg oLhCkXzMB8lpKTL+redZeDs3WQYkNrjJhJ2bg0n8Fx8Le+XVBP/Mj2Z/mRAnTlOq7tqN GqcN+g5qumGF6pubmYSzVBRmaUpR91AaTPTOK0JS7092jeTZAWhlpvBpNsm1A7tamWRi 9OsyGqwaCYW9NFgEnUKyZpt6WpMuu7VbHmWDUt5Nhms6W8l31sJueyecBGu7wmUO0a4/ hmtw== X-Gm-Message-State: AO0yUKW/p01hrbUJK7DGKI2qMIWF8yf/LZAhXaBpuctTJoW/DKz3jaHQ 1DOICiwpwogLzP3A7eVgh90u7Ke42iw= X-Google-Smtp-Source: AK7set/YvsY5ItjmqrNMwYfPsqwljfI0TdrcpqUX8JnVassjFp6aBrQNkdeeduSFemZigYe6izxdEA== X-Received: by 2002:a05:6808:494:b0:371:fe1:8943 with SMTP id z20-20020a056808049400b003710fe18943mr3404767oid.6.1676135166020; Sat, 11 Feb 2023 09:06:06 -0800 (PST) Received: from keaua.attlocal.net ([2600:1700:9190:ba10:6c32:d739:9179:1de7]) by smtp.gmail.com with ESMTPSA id p203-20020aca5bd4000000b0037d8670526esm275932oib.52.2023.02.11.09.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 09:06:05 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][langdale][PATCH 3/6] net-snmp: Fix build with clang16 Date: Sat, 11 Feb 2023 12:05:58 -0500 Message-Id: <20230211170601.3988339-3-akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230211170601.3988339-1-akuster808@gmail.com> References: <20230211170601.3988339-1-akuster808@gmail.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 ; Sat, 11 Feb 2023 17:06:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101038 From: Khem Raj Signed-off-by: Khem Raj (cherry picked from commit ee0de616df82937191613c85f9df7e872b99ed6f) Signed-off-by: Armin Kuster --- ...eturn-attribute-to-netsnmp_pci_error.patch | 32 +++++++++++++++++++ .../net-snmp/net-snmp_5.9.3.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch new file mode 100644 index 0000000000..6fbace75a5 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch @@ -0,0 +1,32 @@ +From 5719f40db65a72624a0b0f08e546d12bf823bd1e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 18 Jan 2023 14:38:44 -0800 +Subject: [PATCH] Add noreturn attribute to netsnmp_pci_error() + +Fixes build with clang16 +| mibgroup/if-mib/data_access/interface_linux.c:152:23: error: incompatible function pointer types assigning to 'void (*)(char *, ...) __attribute__((noreturn))' from 'void (char *, ...)' [-Wincompatible-function-pointer-types] +| pci_access->error = netsnmp_pci_error; +| ^ ~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + agent/mibgroup/if-mib/data_access/interface_linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agent/mibgroup/if-mib/data_access/interface_linux.c b/agent/mibgroup/if-mib/data_access/interface_linux.c +index c6cc54e..12eb865 100644 +--- a/agent/mibgroup/if-mib/data_access/interface_linux.c ++++ b/agent/mibgroup/if-mib/data_access/interface_linux.c +@@ -31,7 +31,7 @@ static struct pci_access *pci_access; + /* Avoid letting libpci call exit(1) when no PCI bus is available. */ + static int do_longjmp =0; + static jmp_buf err_buf; +-static void ++__attribute__((noreturn)) static void + netsnmp_pci_error(char *msg, ...) + { + va_list args; +-- +2.39.1 + diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb index 7af5147566..78d711fbfd 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb @@ -26,6 +26,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://net-snmp-fix-for-disable-des.patch \ file://reproducibility-have-printcap.patch \ file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \ + file://0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch \ " SRC_URI[sha256sum] = "2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a" From patchwork Sat Feb 11 17:05:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 19371 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 2551CC6379F for ; Sat, 11 Feb 2023 17:06:16 +0000 (UTC) Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) by mx.groups.io with SMTP id smtpd.web11.13430.1676135168999540762 for ; Sat, 11 Feb 2023 09:06:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=au+z7YKP; spf=pass (domain: gmail.com, ip: 209.85.167.173, mailfrom: akuster808@gmail.com) Received: by mail-oi1-f173.google.com with SMTP id bd6so7027566oib.6 for ; Sat, 11 Feb 2023 09:06:08 -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=sgAry9Dv0qtGcWhKvpB1WKqrn2HKEL7/0jNeVa4Dv+k=; b=au+z7YKPVlqi4dWci+uY1xY2FTejC1NcjTKV0dvNmH5A3j03teeHITX83e4NOFA1jB FMq1geNkWZWihiSu+0OoJHBMYfWy2B+HbZ/Diyu0MnkecsrB+//hGe81jGlWJWfZ/Dfn k+DV3tqlS13kn+nqbJJWqqoyhF1TUj6G+cnnQkqO0RvplYB4vuKZzDtT1N6dpaJ03Swo JDOXjAWTmzlm7FDX2qdlMgEYAeqBG7Ay5vJJ0uxlIXPlucriCCsXsyLs4ssiRUst0SRM gLtop9qo2zXU/iy+Efc/HYI2gNdQj4SbMLmTn5p3yZaX1Uzit7yQCLwNIRPaO8fJ+CFp 3N7w== 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=sgAry9Dv0qtGcWhKvpB1WKqrn2HKEL7/0jNeVa4Dv+k=; b=zqJZwyjp6c2Aw4Jh01ESQgeoBAVSRx7hELDeNC8wahimd7dsvIrtImMMkLUXMT4/85 lZMrHND0+QgndRaiHOnCoYvp6erj2Ljd2MLy3lY+fyXVXIO9YzerkAr/m2vm2Hf1Oyy5 hGp2Dgk13UTMjg8jLH8awrfAMo/OztbF7oD43K9+MgCztHcx+/ZMBwCoVzBuhmhnKTak T1tr6SXNcaAg62Ko5UiZb9A0XjK+91huocM1HE+eNy/+3ytvbIwRKGgtRMcUFlJMGkUK fs6wKpDRXKbi7Ur2Nv19LshbZDyCwBhxel69Uxmb9E0ydq7xZL1qkpviFKOWys6aS8I1 tsBQ== X-Gm-Message-State: AO0yUKVrzA4pYwZuBo9NgHfLthIoifkZL+MRSIJwzf2h3UTqL1Eho/Ha jxdNPRE8TGn1VNlDR/kvY+0CdYRX0LY= X-Google-Smtp-Source: AK7set9Xxe5N9sjeKgHzQFqDp/UiEvFlmKJGn2rIhVoIf5ds9u5gDEhOio+MDMCCD+RNoiQRby/UTw== X-Received: by 2002:a05:6808:2105:b0:37a:2bf0:5018 with SMTP id r5-20020a056808210500b0037a2bf05018mr7537211oiw.6.1676135168067; Sat, 11 Feb 2023 09:06:08 -0800 (PST) Received: from keaua.attlocal.net ([2600:1700:9190:ba10:6c32:d739:9179:1de7]) by smtp.gmail.com with ESMTPSA id p203-20020aca5bd4000000b0037d8670526esm275932oib.52.2023.02.11.09.06.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 09:06:06 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Narpat Mali , Khem Raj Subject: [meta-oe][langdale][PATCH 4/6] net-snmp: CVE-2022-44792 & CVE-2022-44793 Fix NULL Pointer Exception Date: Sat, 11 Feb 2023 12:05:59 -0500 Message-Id: <20230211170601.3988339-4-akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230211170601.3988339-1-akuster808@gmail.com> References: <20230211170601.3988339-1-akuster808@gmail.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 ; Sat, 11 Feb 2023 17:06:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101039 From: Narpat Mali References: https://nvd.nist.gov/vuln/detail/CVE-2022-44792 https://nvd.nist.gov/vuln/detail/CVE-2022-44793 Signed-off-by: Narpat Mali Signed-off-by: Khem Raj (cherry picked from commit 5ae6f9434f44a57389a3f52dce17da6fe5928e1f) Signed-off-by: Armin Kuster --- .../CVE-2022-44792-CVE-2022-44793.patch | 121 ++++++++++++++++++ .../net-snmp/net-snmp_5.9.3.bb | 1 + 2 files changed, 122 insertions(+) create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2022-44792-CVE-2022-44793.patch diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2022-44792-CVE-2022-44793.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2022-44792-CVE-2022-44793.patch new file mode 100644 index 0000000000..b18d4dc292 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2022-44792-CVE-2022-44793.patch @@ -0,0 +1,121 @@ +From d13302656d9ff0807c5defe18623adc947f43a2b Mon Sep 17 00:00:00 2001 +From: Narpat Mali +Date: Wed, 8 Feb 2023 13:15:39 +0000 +Subject: [PATCH] agent: Disallow SET requests with any NULL varbind Merge pull + request #490 from fenner/set-null + +fixes: #474 and #475 + +CVE: CVE-2022-44792, CVE-2022-44793 + +Upstream-Status: Backport [https://github.com/net-snmp/net-snmp/commit/be804106fd0771a7d05236cff36e199af077af57] + +Signed-off-by: Narpat Mali +--- + agent/snmp_agent.c | 32 +++++++++++++++++++ + apps/snmpset.c | 1 + + .../default/T0142snmpv2csetnull_simple | 31 ++++++++++++++++++ + 3 files changed, 64 insertions(+) + create mode 100644 testing/fulltests/default/T0142snmpv2csetnull_simple + +diff --git a/agent/snmp_agent.c b/agent/snmp_agent.c +index 867d0c1..3f678fe 100644 +--- a/agent/snmp_agent.c ++++ b/agent/snmp_agent.c +@@ -3719,12 +3719,44 @@ netsnmp_handle_request(netsnmp_agent_session *asp, int status) + return 1; + } + ++static int ++check_set_pdu_for_null_varbind(netsnmp_agent_session *asp) ++{ ++ int i; ++ netsnmp_variable_list *v = NULL; ++ ++ for (i = 1, v = asp->pdu->variables; v != NULL; i++, v = v->next_variable) { ++ if (v->type == ASN_NULL) { ++ /* ++ * Protect SET implementations that do not protect themselves ++ * against wrong type. ++ */ ++ DEBUGMSGTL(("snmp_agent", "disallowing SET with NULL var for varbind %d\n", i)); ++ asp->index = i; ++ return SNMP_ERR_WRONGTYPE; ++ } ++ } ++ return SNMP_ERR_NOERROR; ++} ++ + int + handle_pdu(netsnmp_agent_session *asp) + { + int status, inclusives = 0; + netsnmp_variable_list *v = NULL; + ++#ifndef NETSNMP_NO_WRITE_SUPPORT ++ /* ++ * Check for ASN_NULL in SET request ++ */ ++ if (asp->pdu->command == SNMP_MSG_SET) { ++ status = check_set_pdu_for_null_varbind(asp); ++ if (status != SNMP_ERR_NOERROR) { ++ return status; ++ } ++ } ++#endif /* NETSNMP_NO_WRITE_SUPPORT */ ++ + /* + * for illegal requests, mark all nodes as ASN_NULL + */ +diff --git a/apps/snmpset.c b/apps/snmpset.c +index 48e14bd..d542713 100644 +--- a/apps/snmpset.c ++++ b/apps/snmpset.c +@@ -182,6 +182,7 @@ main(int argc, char *argv[]) + case 'x': + case 'd': + case 'b': ++ case 'n': /* undocumented */ + #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES + case 'I': + case 'U': +diff --git a/testing/fulltests/default/T0142snmpv2csetnull_simple b/testing/fulltests/default/T0142snmpv2csetnull_simple +new file mode 100644 +index 0000000..0f1b8f3 +--- /dev/null ++++ b/testing/fulltests/default/T0142snmpv2csetnull_simple +@@ -0,0 +1,31 @@ ++#!/bin/sh ++ ++. ../support/simple_eval_tools.sh ++ ++HEADER SNMPv2c set of system.sysContact.0 with NULL varbind ++ ++SKIPIF NETSNMP_DISABLE_SET_SUPPORT ++SKIPIF NETSNMP_NO_WRITE_SUPPORT ++SKIPIF NETSNMP_DISABLE_SNMPV2C ++SKIPIFNOT USING_MIBII_SYSTEM_MIB_MODULE ++ ++# ++# Begin test ++# ++ ++# standard V2C configuration: testcomunnity ++snmp_write_access='all' ++. ./Sv2cconfig ++STARTAGENT ++ ++CAPTURE "snmpget -On $SNMP_FLAGS -c testcommunity -v 2c $SNMP_TRANSPORT_SPEC:$SNMP_TEST_DEST$SNMP_SNMPD_PORT .1.3.6.1.2.1.1.4.0" ++ ++CHECK ".1.3.6.1.2.1.1.4.0 = STRING:" ++ ++CAPTURE "snmpset -On $SNMP_FLAGS -c testcommunity -v 2c $SNMP_TRANSPORT_SPEC:$SNMP_TEST_DEST$SNMP_SNMPD_PORT .1.3.6.1.2.1.1.4.0 n x" ++ ++CHECK "Reason: wrongType" ++ ++STOPAGENT ++ ++FINISHED +-- +2.34.1 + diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb index 78d711fbfd..f40fb8bbd6 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb @@ -27,6 +27,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://reproducibility-have-printcap.patch \ file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \ file://0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch \ + file://CVE-2022-44792-CVE-2022-44793.patch \ " SRC_URI[sha256sum] = "2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a" From patchwork Sat Feb 11 17:06:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 19369 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 20B2AC61DA4 for ; Sat, 11 Feb 2023 17:06:16 +0000 (UTC) Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by mx.groups.io with SMTP id smtpd.web10.13402.1676135166825713635 for ; Sat, 11 Feb 2023 09:06:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jLLmkBgN; spf=pass (domain: gmail.com, ip: 209.85.167.179, mailfrom: akuster808@gmail.com) Received: by mail-oi1-f179.google.com with SMTP id bi19so7055459oib.2 for ; Sat, 11 Feb 2023 09:06:09 -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=MmkziysIAno7nDQTD67dT5bm9W8Gr/nJKgn563QiyZc=; b=jLLmkBgN7b9eYUuR5zUrdgp/bg5MNpR1aixJe18XFCPE13RXusrdIVIK9Fj7o92nSB GeIAUrQNFBdrE7DuhgQXsg8B9puAHrjRQB3KktfxmcXvpnOPX7o/HtMYo3Lm1VWM80Vk gin07Q7i1o5wtHWE02g6guMKHTxM+2sfni92pAHLCBIlqwMXXRFHuMQUWXJNdp5vDPGq Lqc7UNYfgwO+qMyW3ShSOhcNgPLSHF4Sv3va1qPdCKLosSLvnsGOEMN4EgAeThdUEU6j /kFTJpImvhp5IsizDYh32qDd3n241qxxaBzPTh/iEXtIvHNcp/msS2UM5C7GadPCnRfP N3ng== 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=MmkziysIAno7nDQTD67dT5bm9W8Gr/nJKgn563QiyZc=; b=x6osz/uEucSsjoE3C+deiuwa4sZzUzHc0XHKWv+V3ZOzg1+UpeFiSrjNzplG4d+jd9 E6Ez1h/h7aDwdjYSS/GLWy0idZvaL2OkRPVxMFmP57D/3OORKI4jb34VgpjU8SEa8eir l1tVjZ3VJ2e9MvITu67v2mBkPHq50K8Qv2rdapjyBQx66CEN6m2FeAMpmkQkU+K3Ct7v pci7vuX4Of++/LMR/MQeL5Gr3LBY6e7UNmNPL1wPScYMdxr6gD1FRRsUrd5JXBgfhRyd qTsvsUh9+GomWOVSke94+0TQK4xVW6kjxapO65kFmtITwXfkz76eeEQQY5qGL4bJqxSo 1Jkg== X-Gm-Message-State: AO0yUKVn0he0AeEnW2G4SKRGWMoMypPDLi9PZtl32tGJAnjc5GhWCy41 y2Tzt7APs/MQn4JZswVYqgmGzN6/sT0= X-Google-Smtp-Source: AK7set/te2p4q/rh41X+JfUlSNYVzuoUAQ/ER4m8RXuJUn2fju5vDX0Sz2wAvmkCZ/SZnRTXTA5cdA== X-Received: by 2002:aca:1217:0:b0:37b:4f74:d3c7 with SMTP id 23-20020aca1217000000b0037b4f74d3c7mr8608615ois.37.1676135169277; Sat, 11 Feb 2023 09:06:09 -0800 (PST) Received: from keaua.attlocal.net ([2600:1700:9190:ba10:6c32:d739:9179:1de7]) by smtp.gmail.com with ESMTPSA id p203-20020aca5bd4000000b0037d8670526esm275932oib.52.2023.02.11.09.06.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 09:06:08 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Joe Slater , Khem Raj Subject: [meta-oe][langdale][PATCH 5/6] phoronix-test-suite: fix CVE-2022-40704 Date: Sat, 11 Feb 2023 12:06:00 -0500 Message-Id: <20230211170601.3988339-5-akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230211170601.3988339-1-akuster808@gmail.com> References: <20230211170601.3988339-1-akuster808@gmail.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 ; Sat, 11 Feb 2023 17:06:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101040 From: Joe Slater CVE fix added after latest release (10.8.4). Signed-off-by: Joe Slater Signed-off-by: Khem Raj (cherry picked from commit 32a0ff55166ae67931d48825e669893718663040) Signed-off-by: Armin Kuster --- .../files/CVE-2022-40704.patch | 46 +++++++++++++++++++ .../phoronix-test-suite_10.8.4.bb | 5 +- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-benchmark/phoronix-test-suite/files/CVE-2022-40704.patch diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/files/CVE-2022-40704.patch b/meta-oe/recipes-benchmark/phoronix-test-suite/files/CVE-2022-40704.patch new file mode 100644 index 0000000000..8b6405b4ad --- /dev/null +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/files/CVE-2022-40704.patch @@ -0,0 +1,46 @@ +From d3880d9d3ba795138444da83f1153c3c3ac27640 Mon Sep 17 00:00:00 2001 +From: Michael Larabel +Date: Sat, 23 Jul 2022 07:32:43 -0500 +Subject: [PATCH] phoromatic: Explicitly check both $_GET abd $_POST in + phoromatic_quit_if_invalid_input_found() + +Fixes: https://github.com/phoronix-test-suite/phoronix-test-suite/issues/650#issuecomment-1193116678 + +Upstream-Status: Backport +CVE: CVE-2022-40704 + +Reference to upstream patch: +https://github.com/phoronix-test-suite/phoronix-test-suite/commit/d3880d9d3ba795138444da83f1153c3c3ac27640 + +Signed-off-by: Li Wang +--- + pts-core/phoromatic/phoromatic_functions.php | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/pts-core/phoromatic/phoromatic_functions.php b/pts-core/phoromatic/phoromatic_functions.php +index 74ccc5444c..c2313dcdea 100644 +--- a/pts-core/phoromatic/phoromatic_functions.php ++++ b/pts-core/phoromatic/phoromatic_functions.php +@@ -37,9 +37,20 @@ function phoromatic_quit_if_invalid_input_found($input_keys = null) + { + foreach($input_keys as $key) + { +- if(isset($_REQUEST[$key]) && !empty($_REQUEST[$key])) ++ if(isset($_GET[$key]) && !empty($_GET[$key])) + { +- foreach(pts_arrays::to_array($_REQUEST[$key]) as $val_to_check) ++ foreach(pts_arrays::to_array($_GET[$key]) as $val_to_check) ++ { ++ if(stripos($val_to_check, $invalid_string) !== false) ++ { ++ echo 'Exited due to invalid input ( ' . $invalid_string . ') attempted: ' . htmlspecialchars($val_to_check); ++ exit; ++ } ++ } ++ } ++ if(isset($_POST[$key]) && !empty($_POST[$key])) ++ { ++ foreach(pts_arrays::to_array($_POST[$key]) as $val_to_check) + { + if(stripos($val_to_check, $invalid_string) !== false) + { diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb index be9756d9a7..8de3314b3c 100644 --- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb @@ -5,7 +5,10 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "console/tests" -SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" +SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz \ + file://CVE-2022-40704.patch \ + " + SRC_URI[sha256sum] = "1f2092d536c0a3193efc53e4a50f3cee65c0ef1a78d31e5404f1c663fff7b7f4" S = "${WORKDIR}/phoronix-test-suite" From patchwork Sat Feb 11 17:06:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 19372 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 2E15CC636D4 for ; Sat, 11 Feb 2023 17:06:16 +0000 (UTC) Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by mx.groups.io with SMTP id smtpd.web11.13426.1676135165782082607 for ; Sat, 11 Feb 2023 09:06:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=by+MpImL; spf=pass (domain: gmail.com, ip: 209.85.167.176, mailfrom: akuster808@gmail.com) Received: by mail-oi1-f176.google.com with SMTP id dt8so7080897oib.0 for ; Sat, 11 Feb 2023 09:06:12 -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=OSjG0IBpi8FkDbjsaZsTZOf9Ezjg9OoSEXaxuT50RmI=; b=by+MpImLPYtIIe2zUsZUmpo1VQMijDSM9V8gHbxxHNNDkX6FkBYzouk9DL1m32+p+k udo5SOm6ZX77MO32n+FeZ5s2wr0q5luicIivtN70ED4u1rdTdR+3gBdIwi3dE4GLublK iIwg8mG8NkCGINngRxvHSweomkKzYfkp8BdzVSwiXr6t0W4JIqPDbFQi+iotA5uiKSwV JoRsWCGPZyfE/hc0fd4ZbSB3K5pnaKf66jevdiMkb5B6IRcCyfK1cNje7CZKx8DwuE/h 38GbyrHh4tmz0Iwivd2mN0N5088v4ETrMXLK3qD/QD3G9Te8tB9pxRUilyYmef+R3ZUu oHzQ== 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=OSjG0IBpi8FkDbjsaZsTZOf9Ezjg9OoSEXaxuT50RmI=; b=M7Qm/btAwTmAYi5y1BXfb9sCo/xK1/EE0VY1xUkXJJnpdEpuNgFCP91ACFuwQMW35O S/UG/H6pC5Nh0STnUSJ541gNi2OVGSXB3jcpKb3upmOoewOO1eHajsifQ6HKQrw7DroB 1ROI7U1s1Pd8Hn3k71hTtKwveGbnesBSMahiF8HnXDGS4grjev4n9yRU4LCKGESiKyeh 93UrY/dBovCyqSXGyR5VYpf60fVP/vreLwlWQx30vm/ulgFkzilZdS6E7Z8ajYoB2jK+ iTmYQaXBn0HlDWMS88gQUGmw5sNHLUu8vYspGlwmBNM1fx0PejtJxt3yv+6MStzCeNSA 7aqw== X-Gm-Message-State: AO0yUKW4ipKqoAK5AwqAuAFULjg+N6A+ZnDTfeQIk6O6LXBQkMjbOlnu VcUIwjFO4/Wz/6SkoCP4jUE2pUrbFS4= X-Google-Smtp-Source: AK7set8rWS8Tu++FK1RFYScw7WS3QiPaH811AoX9IlapbPWQkBnocDFKEdZorwUGducxJU8GjGhawA== X-Received: by 2002:a54:470a:0:b0:37a:fcd6:5c09 with SMTP id k10-20020a54470a000000b0037afcd65c09mr7770744oik.49.1676135171233; Sat, 11 Feb 2023 09:06:11 -0800 (PST) Received: from keaua.attlocal.net ([2600:1700:9190:ba10:6c32:d739:9179:1de7]) by smtp.gmail.com with ESMTPSA id p203-20020aca5bd4000000b0037d8670526esm275932oib.52.2023.02.11.09.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 09:06:10 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Chee Yang Lee , Khem Raj Subject: [meta-oe][langdale][PATCH 6/6] tinyproxy: fix CVE-2022-40468 Date: Sat, 11 Feb 2023 12:06:01 -0500 Message-Id: <20230211170601.3988339-6-akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230211170601.3988339-1-akuster808@gmail.com> References: <20230211170601.3988339-1-akuster808@gmail.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 ; Sat, 11 Feb 2023 17:06:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101041 From: Chee Yang Lee Signed-off-by: Chee Yang Lee Signed-off-by: Khem Raj (cherry picked from commit 795ccdd86cad05c425adae15af27797f42f33c56) Signed-off-by: Armin Kuster --- .../tinyproxy/tinyproxy/CVE-2022-40468.patch | 33 +++++++++++++++++++ .../tinyproxy/tinyproxy_1.11.1.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2022-40468.patch diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2022-40468.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2022-40468.patch new file mode 100644 index 0000000000..4e2157ca75 --- /dev/null +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2022-40468.patch @@ -0,0 +1,33 @@ +From 3764b8551463b900b5b4e3ec0cd9bb9182191cb7 Mon Sep 17 00:00:00 2001 +From: rofl0r +Date: Thu, 8 Sep 2022 15:18:04 +0000 +Subject: [PATCH] prevent junk from showing up in error page in invalid + requests + +fixes #457 + +https://github.com/tinyproxy/tinyproxy/commit/3764b8551463b900b5b4e3ec0cd9bb9182191cb7 +Upstream-Status: Backport +CVE: CVE-2022-40468 +Signed-off-by: Chee Yang Lee +--- + src/reqs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/reqs.c b/src/reqs.c +index bce69819..45db118d 100644 +--- a/src/reqs.c ++++ b/src/reqs.c +@@ -343,8 +343,12 @@ static struct request_s *process_request (struct conn_s *connptr, + goto fail; + } + ++ /* zero-terminate the strings so they don't contain junk in error page */ ++ request->method[0] = url[0] = request->protocol[0] = 0; ++ + ret = sscanf (connptr->request_line, "%[^ ] %[^ ] %[^ ]", + request->method, url, request->protocol); ++ + if (ret == 2 && !strcasecmp (request->method, "GET")) { + request->protocol[0] = 0; + diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb index 86f57d88ff..999deff4de 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb @@ -7,6 +7,7 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz file://disable-documentation.patch \ file://tinyproxy.service \ file://tinyproxy.conf \ + file://CVE-2022-40468.patch \ " SRC_URI[sha256sum] = "1574acf7ba83c703a89e98bb2758a4ed9fda456f092624b33cfcf0ce2d3b2047"