From patchwork Mon Mar 4 15:23:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 40439 X-Patchwork-Delegate: steve@sakoman.com 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 752AFC54E5A for ; Mon, 4 Mar 2024 15:23:30 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web10.101639.1709565804611612508 for ; Mon, 04 Mar 2024 07:23:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=aPWIHJeY; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-299d3b09342so3420948a91.2 for ; Mon, 04 Mar 2024 07:23:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1709565804; x=1710170604; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xSJnFiMl9fHGbO0sRFKWORSR71HMQX49/TvPYqlwlSk=; b=aPWIHJeYMGC+kXnr8Y5xs9REEwH3uQegVJbehu+fEgycbWTTExzlqXC0X4gsWQM5qG nkYH1Oot2sgCl/A20Cubz+ZYg/BHr50Iya23o3LlWjprPTsx3Naf5o0n5B6cmD5C1tZD NaU+j++0D+FULchhxK8cEbSj+L/0aNAzoXRlcS+a2GwOrCodmC0fsGtsLkesg3Lx44Ex 6xuHVJR2dMpCx8tpHv9o6S6Jvhmxn0PFiU99Rkn+rGc0qEFvF9xS5JHsBsi9QwJACmJ6 BQ7vZg+Ng80pFbVBNfJpURCrM/AJXmxCIT9TLy+P/mmj/b5S3RoTXqP7sZCkqm89toZb tYLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709565804; x=1710170604; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xSJnFiMl9fHGbO0sRFKWORSR71HMQX49/TvPYqlwlSk=; b=o4cpJEMtZpp5koRTKXMy9viIMs9QXaTfUVMUIyk6YzigSbizZ0lgafm/osTB4EwjNm LU1ygDgAXck9oEFqseyrfM3+Ts8LKRtmy/J6bUo7CWTOvYdf5vHERqAMhz2Vykfh6nnM w3jn4Bp45olyk4sXy9vez6qxUPIIHdD9tLSL6zEh5tT4UhkodP8rjbzNAw5YlNOVVP0z vM9oLYSOeRav9tyL/UMF1Nzr/CQP7czdSHQLX7Q3cOZJMZtmoLOi2Q3ObwbY7aRPODJI uvQGxor3HhB6j4Rlg5XrXrGXY+Wb6PwgwQiHVLnAsfMPW/lcVS6oZLSd3xpFpoCzfEmR oVoQ== X-Gm-Message-State: AOJu0YzN77gLnqy0uPz2QfJgFh+yBpGmsD8lLC+VGnCHRH0OnSyy7d8E DCvaqH6aq7YL4grkPBt+tS3qIhQ3ABQwqVcMltMXKWMikbLZtHeCtM/bph0SU7nxek91xJCeqEu OtzA= X-Google-Smtp-Source: AGHT+IEMg7zimkxiB7QFYRyxlsy4PLw9Cy/V0heoTUvP4P8VP55g+T1w5iN/gpzHeqDe2MaJDAmnpg== X-Received: by 2002:a17:90a:b382:b0:29a:da46:8d27 with SMTP id e2-20020a17090ab38200b0029ada468d27mr8079115pjr.0.1709565803940; Mon, 04 Mar 2024 07:23:23 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id 1-20020a17090a0f0100b0029981c0d5c5sm8898968pjy.19.2024.03.04.07.23.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:23:23 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/11] less: Fix for CVE-2022-48624 Date: Mon, 4 Mar 2024 05:23:06 -1000 Message-Id: <8d91ab209398a8415009bc3093d407bf8871dafd.1709565668.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Mon, 04 Mar 2024 15:23:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196599 From: Vijay Anusuri Upstream-Status: Backport [https://github.com/gwsw/less/commit/c6ac6de49698be84d264a0c4c0c40bb870b10144] Signed-off-by: Vijay Anusuri Signed-off-by: Steve Sakoman --- .../less/less/CVE-2022-48624.patch | 41 +++++++++++++++++++ meta/recipes-extended/less/less_600.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-extended/less/less/CVE-2022-48624.patch diff --git a/meta/recipes-extended/less/less/CVE-2022-48624.patch b/meta/recipes-extended/less/less/CVE-2022-48624.patch new file mode 100644 index 0000000000..409730bd4f --- /dev/null +++ b/meta/recipes-extended/less/less/CVE-2022-48624.patch @@ -0,0 +1,41 @@ +From c6ac6de49698be84d264a0c4c0c40bb870b10144 Mon Sep 17 00:00:00 2001 +From: Mark Nudelman +Date: Sat, 25 Jun 2022 11:54:43 -0700 +Subject: [PATCH] Shell-quote filenames when invoking LESSCLOSE. + +Upstream-Status: Backport [https://github.com/gwsw/less/commit/c6ac6de49698be84d264a0c4c0c40bb870b10144] +CVE: CVE-2022-48624 +Signed-off-by: Vijay Anusuri +--- + filename.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/filename.c b/filename.c +index 5824e385..dff20c08 100644 +--- a/filename.c ++++ b/filename.c +@@ -972,6 +972,8 @@ close_altfile(altfilename, filename) + { + #if HAVE_POPEN + char *lessclose; ++ char *qfilename; ++ char *qaltfilename; + FILE *fd; + char *cmd; + int len; +@@ -986,9 +988,13 @@ close_altfile(altfilename, filename) + error("LESSCLOSE ignored; must contain no more than 2 %%s", NULL_PARG); + return; + } +- len = (int) (strlen(lessclose) + strlen(filename) + strlen(altfilename) + 2); ++ qfilename = shell_quote(filename); ++ qaltfilename = shell_quote(altfilename); ++ len = (int) (strlen(lessclose) + strlen(qfilename) + strlen(qaltfilename) + 2); + cmd = (char *) ecalloc(len, sizeof(char)); +- SNPRINTF2(cmd, len, lessclose, filename, altfilename); ++ SNPRINTF2(cmd, len, lessclose, qfilename, qaltfilename); ++ free(qaltfilename); ++ free(qfilename); + fd = shellcmd(cmd); + free(cmd); + if (fd != NULL) diff --git a/meta/recipes-extended/less/less_600.bb b/meta/recipes-extended/less/less_600.bb index f68281ac93..f88127a9e3 100644 --- a/meta/recipes-extended/less/less_600.bb +++ b/meta/recipes-extended/less/less_600.bb @@ -27,6 +27,7 @@ DEPENDS = "ncurses" SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ file://CVE-2022-46663.patch \ + file://CVE-2022-48624.patch \ " SRC_URI[sha256sum] = "6633d6aa2b3cc717afb2c205778c7c42c4620f63b1d682f3d12c98af0be74d20" From patchwork Mon Mar 4 15:23:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 40441 X-Patchwork-Delegate: steve@sakoman.com 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 6D552C54E55 for ; Mon, 4 Mar 2024 15:23:30 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.101494.1709565806481296267 for ; Mon, 04 Mar 2024 07:23:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=imIjtmeh; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-29aa8c4710bso3321440a91.1 for ; Mon, 04 Mar 2024 07:23:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1709565806; x=1710170606; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MsO+jZ1esW/vi28f+tIstnzjeXoJCE+eqLwSGuEZXVk=; b=imIjtmeh0JqzVCHgU8uqNnuzaqXtkcUuQcFpBymEQ4CBRo8NPMmaxzQAWaBOQEVQfX vmdQcNeLRbF4htr/t+XiJX9XHrsro1HxZ9LfC5IqzTEpLkCnHV9wHdC2SbXAZs7nyO// DLqUlnEvljKBItcRvjcqT/ECYN1mcr5EWizX0Qj1ks6KcKLpu8/yj/VawOIOuH8k+5SR KG65cBr8+2uamNg+pOEK8tWzbrTg5l9InbSYkl9G5LGioQRRvoOi8jvGyh74Yq55D3mP kSUeM7kIVoHYPbQsb0owdOaqDF6PqGNfmhKro7SOBqKMICu0I5Rz89W3Mxv3WqocfJND nwEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709565806; x=1710170606; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MsO+jZ1esW/vi28f+tIstnzjeXoJCE+eqLwSGuEZXVk=; b=UGnmxNcsFfHCcrAQ3XPmImZBNQmwN+AMPjW7hdaRVUhm7X5gaa/NJSTW5GkNUe+XGZ JKhAyVU5wUcBDXRLPWGztpF+Gpef6NnEYg/3P4e2QgV3xJE1n0UrMWnOVC8uXYOKuD6a qyiMr4uAJLoV74DXZP5SiPgAlMHVdPWfPd/sS39rQ+OLjyju4OyxvguIhsQiAiSizvad sXKOkhXs1SxybMDNzaqlHeXqb4z3IEECnvjFQXUf0W8BTkH0Drh2e7xB4GZHvh562eHs V2/2wll2mZPtfA3liHa148KQyBpTNndFe2/k6OpOQX9NvatFnAWQJ6kOqGnddem7DF57 19VQ== X-Gm-Message-State: AOJu0YwzuJtpnrawZYkxOgVMDLjhlbVur8awmPMLujNruJTEVP8GeQvV D82pJQw9iP77v2nxo7LK/rRCDActWQD5iZAnF9K2X85IfUaQcgXCV249Jk+34v0Nia/6O7jEWlu v5xk= X-Google-Smtp-Source: AGHT+IEh8yQEXcsN43AUd+As4qoxclcLez/1j8s2z7FgNoAgB6HwkjpHMVL3eln3cAbS9cqsN8h+kA== X-Received: by 2002:a17:90b:50e:b0:29a:9dd1:d45b with SMTP id r14-20020a17090b050e00b0029a9dd1d45bmr11989556pjz.3.1709565805779; Mon, 04 Mar 2024 07:23:25 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id 1-20020a17090a0f0100b0029981c0d5c5sm8898968pjy.19.2024.03.04.07.23.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:23:25 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/11] glibc: ignore CVE-2023-0687 Date: Mon, 4 Mar 2024 05:23:07 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Mon, 04 Mar 2024 15:23:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196600 From: Peter Marko This CVE was backported to glibc 2.35 branch 9 months ago. NVD recently updated CPE and it appeared in kirkstone cve reports. https://sourceware.org/git/?p=glibc.git;a=log;h=refs/heads/release/2.35/master gmon: Fix allocated buffer overflow (bug 29444) https://sourceware.org/git/?p=glibc.git;a=commit;h=f2820e478c68a73a38f81512cc38beeee220212a Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc_2.35.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc_2.35.bb b/meta/recipes-core/glibc/glibc_2.35.bb index 21cd99dfdd..3ec6610d01 100644 --- a/meta/recipes-core/glibc/glibc_2.35.bb +++ b/meta/recipes-core/glibc/glibc_2.35.bb @@ -24,7 +24,7 @@ CVE_CHECK_IGNORE += "CVE-2019-1010025" CVE_CHECK_IGNORE += "CVE-2023-4527" # To avoid these in cve-check reports since the recipe version did not change -CVE_CHECK_IGNORE += "CVE-2023-4813 CVE-2023-4806 CVE-2023-4911 CVE-2023-5156" +CVE_CHECK_IGNORE += "CVE-2023-0687 CVE-2023-4813 CVE-2023-4806 CVE-2023-4911 CVE-2023-5156" DEPENDS += "gperf-native bison-native" From patchwork Mon Mar 4 15:23:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 40440 X-Patchwork-Delegate: steve@sakoman.com 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 64994C48BF6 for ; Mon, 4 Mar 2024 15:23:30 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web11.101495.1709565807993781055 for ; Mon, 04 Mar 2024 07:23:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=MMEtfC24; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-299e4b352cdso3014681a91.0 for ; Mon, 04 Mar 2024 07:23:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1709565807; x=1710170607; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MFnHwK8joqKnJZBUZipiUuWA+Nd8hxF9ZBIQ8iJ7/hU=; b=MMEtfC24BjCzt8jZhyDJEjGbcjrLQBgLbmwDWw8rR33TLmy7TnlWUyL0uCAwVy2bSn u2QdBiFs89KvAe+nIFetaeoY0zWYafAOp7GwFNhLvta7D6E3uaCSA6lXvzZFvY+9bnto Jwixvxtt3QrNDSW/DOh/yPrg5mAM+9LAIY0WY5N5oOfF41llS04cXSV5r4ek7LEPvwBC acLaf1UfnCkzAFL2KPS4ehhlZtOID2XiYRmEFHK9FkYam3bSy8YPV+QXDqDwuPB2QC/T yCl4DplnGHepDIvWmJF4gbh1JARz7xL5doOIzoQ0fi7cGmU3oGT5OcdgETz6Cl6j4lqE Ah4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709565807; x=1710170607; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MFnHwK8joqKnJZBUZipiUuWA+Nd8hxF9ZBIQ8iJ7/hU=; b=VJZzP6TDzJax/mNKbbvjY7wgN2Q262lovta1AL+YmcvtUW5s81p0MLKpU5TF/LDYZw FsTcNKyqwtUlMUUcrFdDPxgL/FTt8plzmw54FFnDabqQVzm5SFTQGLK4cj4hs4yk1mbL u0MZq8SrLUZc01ynheuzAO6JoQKSYrUM67MTl6yM70VNH1HqN7sMqWbP7en6Z3x+DfpA o4z+cpK41P2RL1Ddnb1BKFDiQsaRjZmvIoOjlBjL1tmdJKVc2toA/d4tV9vdYIksx0TO gKybq+CvmX76cCPUkH86tcjvHMVO7wJcHNiz0bR1tjxjQiazvSnj6ZoPdgkIZxd3/dkf dDGA== X-Gm-Message-State: AOJu0YwTsO5atgC8lvav+7ziZmlInlsye91Cg/xsFDXxPaYa3fh6mD1g QoABUmLT2lWUvy/hiUmpQH4wzBz+dw2pLqy9uuzgVl5TkX/qFu9lsiXDovxRAP8w1uuiJpXlPOE q1to= X-Google-Smtp-Source: AGHT+IGO24eu/u1o8Ml2+lkG0PBbmWz6kZIodntAtaFfYxA24hv1a586eBxS6JCbYT1qc/jqy+KmJA== X-Received: by 2002:a17:90a:8a07:b0:29b:2c12:6b6f with SMTP id w7-20020a17090a8a0700b0029b2c126b6fmr6204795pjn.16.1709565807210; Mon, 04 Mar 2024 07:23:27 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id 1-20020a17090a0f0100b0029981c0d5c5sm8898968pjy.19.2024.03.04.07.23.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:23:26 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/11] qemu: Fix for CVE-2024-24474 Date: Mon, 4 Mar 2024 05:23:08 -1000 Message-Id: <71600de72c602e6d1ae2c3b13af6c59440affdb6.1709565668.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Mon, 04 Mar 2024 15:23:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196601 From: Vijay Anusuri Upstream-Status: Backport [https://github.com/qemu/qemu/commit/77668e4b9bca03a856c27ba899a2513ddf52bb52] Signed-off-by: Vijay Anusuri Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2024-24474.patch | 44 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2024-24474.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index c5fb9b1eab..18752af274 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -103,6 +103,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2021-3638.patch \ file://CVE-2023-1544.patch \ file://CVE-2023-5088.patch \ + file://CVE-2024-24474.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2024-24474.patch b/meta/recipes-devtools/qemu/qemu/CVE-2024-24474.patch new file mode 100644 index 0000000000..e890fe56cf --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2024-24474.patch @@ -0,0 +1,44 @@ +From 77668e4b9bca03a856c27ba899a2513ddf52bb52 Mon Sep 17 00:00:00 2001 +From: Mark Cave-Ayland +Date: Wed, 13 Sep 2023 21:44:09 +0100 +Subject: [PATCH] esp: restrict non-DMA transfer length to that of available + data + +In the case where a SCSI layer transfer is incorrectly terminated, it is +possible for a TI command to cause a SCSI buffer overflow due to the +expected transfer data length being less than the available data in the +FIFO. When this occurs the unsigned async_len variable underflows and +becomes a large offset which writes past the end of the allocated SCSI +buffer. + +Restrict the non-DMA transfer length to be the smallest of the expected +transfer length and the available FIFO data to ensure that it is no longer +possible for the SCSI buffer overflow to occur. + +Signed-off-by: Mark Cave-Ayland +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1810 +Reviewed-by: Thomas Huth +Message-ID: <20230913204410.65650-3-mark.cave-ayland@ilande.co.uk> +Signed-off-by: Paolo Bonzini + +Upstream-Status: Backport [https://github.com/qemu/qemu/commit/77668e4b9bca03a856c27ba899a2513ddf52bb52] +CVE: CVE-2024-24474 +Signed-off-by: Vijay Anusuri +--- + hw/scsi/esp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c +index 4218a6a96054..9b11d8c5738a 100644 +--- a/hw/scsi/esp.c ++++ b/hw/scsi/esp.c +@@ -759,7 +759,8 @@ static void esp_do_nodma(ESPState *s) + } + + if (to_device) { +- len = MIN(fifo8_num_used(&s->fifo), ESP_FIFO_SZ); ++ len = MIN(s->async_len, ESP_FIFO_SZ); ++ len = MIN(len, fifo8_num_used(&s->fifo)); + esp_fifo_pop_buf(&s->fifo, s->async_buf, len); + s->async_buf += len; + s->async_len -= len; From patchwork Mon Mar 4 15:23:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 40438 X-Patchwork-Delegate: steve@sakoman.com 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 545F7C5478C for ; Mon, 4 Mar 2024 15:23:30 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web10.101641.1709565809214330562 for ; Mon, 04 Mar 2024 07:23:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=XDLpleTW; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2997a92e23bso2758736a91.3 for ; Mon, 04 Mar 2024 07:23:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1709565808; x=1710170608; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ZX8tKOxoDDMOLNT48N45wxGGxLgcFnS07hpckVCLkg4=; b=XDLpleTWtc67davy5zUfV6tsz4g/vCgcMW7npJu6BBd0fUMlDr6jSuFUK3sczJbp0s feceZCv/SGzaIYILYBGiCOxD9JFaJWv5P4t2K3JKU5mMOD7FjwUgSy5UQG5O7kBhNrdo 7nt/xvq+Ue6Rn6VHSVhjjdoAop6rsaTKgYTrvr96UMtWcA6zDHG3QWUCeKsyalNYvkJv A7CXZGbp9+804rAw89G1IvrC4UyyNmezpDUtaBCtLzkjdkhC6pqyz+i+MHmwbbnu1yn+ PIHZEI7tHvpwf8Y0madT9asTQPxbylpdZAXPScmynu1/QaKPCsc7AXm8QFy9HvvClLvP EuUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709565808; x=1710170608; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZX8tKOxoDDMOLNT48N45wxGGxLgcFnS07hpckVCLkg4=; b=bnbbcuGjonLOQVkXzez3R4k+3mR8zfFRNBZZHTVowdLoqkMLzY9YznuTqhpwz4S3lt z+zqz2lMOGhuIA+niSJ/U0krs6iM8PMpGHBGlIXGYopMknbrxtSW6GdTuZSkeE/0KLNx 0hVrbAXhBCQnhshMCmWGNKk0X4xZ0FO1c6nFlPMzPxpxswcJENDnyZDwE3e9cHNnkHdH i8kFA2onGgil9z/TWt/1n9ptSAWMUInKYJtUO/eegBRySrdf6dZZbCoLlMwyeMfzsXKd 6rQmeqTxVK4/ohCvC9I4sg9ZKAz8YPaImcbS3ln3xgtd3VbQIBOqHm9e53MqldSBwxom +Scw== X-Gm-Message-State: AOJu0YxCal8/3N2Chjt8ZKgI5TjwfcunpLF4OYulqzQYgUZFD6NPwQ0z WQN8xZ9OTwcM0XNk/p2fXBMrE3T9p5JMnpGD8D0nCuoTyafF1hIvS96hBh8L/QLH9U5vcggfEP4 icN0= X-Google-Smtp-Source: AGHT+IEnUYYUXIKO3prl4KRqTgSo/IVnxXKXt4/T9QlxE95UVBeFo+U0j00kSIixOMLp/ClVNLkzlw== X-Received: by 2002:a17:90a:3d45:b0:29b:125c:a97a with SMTP id o5-20020a17090a3d4500b0029b125ca97amr6205974pjf.43.1709565808517; Mon, 04 Mar 2024 07:23:28 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id 1-20020a17090a0f0100b0029981c0d5c5sm8898968pjy.19.2024.03.04.07.23.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:23:28 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/11] qemu: Backport fix CVE-2023-6693 Date: Mon, 4 Mar 2024 05:23:09 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Mon, 04 Mar 2024 15:23:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196602 From: Vivek Kumbhar Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/2220e8189fb94068dbad333228659fbac819abb0] Signed-off-by: Vivek Kumbhar Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2023-6693.patch | 74 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2023-6693.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 18752af274..d3e6ced988 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -104,6 +104,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2023-1544.patch \ file://CVE-2023-5088.patch \ file://CVE-2024-24474.patch \ + file://CVE-2023-6693.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2023-6693.patch b/meta/recipes-devtools/qemu/qemu/CVE-2023-6693.patch new file mode 100644 index 0000000000..b91f2e6902 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2023-6693.patch @@ -0,0 +1,74 @@ +From 2220e8189fb94068dbad333228659fbac819abb0 Mon Sep 17 00:00:00 2001 +From: Jason Wang +Date: Tue, 2 Jan 2024 11:29:01 +0800 +Subject: [PATCH] virtio-net: correctly copy vnet header when flushing TX + +When HASH_REPORT is negotiated, the guest_hdr_len might be larger than +the size of the mergeable rx buffer header. Using +virtio_net_hdr_mrg_rxbuf during the header swap might lead a stack +overflow in this case. Fixing this by using virtio_net_hdr_v1_hash +instead. + +Reported-by: Xiao Lei +Cc: Yuri Benditovich +Cc: qemu-stable@nongnu.org +Cc: Mauro Matteo Cascella +Fixes: CVE-2023-6693 +Fixes: e22f0603fb2f ("virtio-net: reference implementation of hash report") +Reviewed-by: Michael Tokarev +Signed-off-by: Jason Wang + +Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/2220e8189fb94068dbad333228659fbac819abb0] +CVE: CVE-2023-6693 +Signed-off-by: Vivek Kumbhar +--- + hw/net/virtio-net.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c +index e1f474883..42e66697f 100644 +--- a/hw/net/virtio-net.c ++++ b/hw/net/virtio-net.c +@@ -600,6 +600,11 @@ static void virtio_net_set_mrg_rx_bufs(VirtIONet *n, int mergeable_rx_bufs, + + n->mergeable_rx_bufs = mergeable_rx_bufs; + ++ /* ++ * Note: when extending the vnet header, please make sure to ++ * change the vnet header copying logic in virtio_net_flush_tx() ++ * as well. ++ */ + if (version_1) { + n->guest_hdr_len = hash_report ? + sizeof(struct virtio_net_hdr_v1_hash) : +@@ -2520,7 +2525,7 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q) + ssize_t ret; + unsigned int out_num; + struct iovec sg[VIRTQUEUE_MAX_SIZE], sg2[VIRTQUEUE_MAX_SIZE + 1], *out_sg; +- struct virtio_net_hdr_mrg_rxbuf mhdr; ++ struct virtio_net_hdr_v1_hash vhdr; + + elem = virtqueue_pop(q->tx_vq, sizeof(VirtQueueElement)); + if (!elem) { +@@ -2537,7 +2542,7 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q) + } + + if (n->has_vnet_hdr) { +- if (iov_to_buf(out_sg, out_num, 0, &mhdr, n->guest_hdr_len) < ++ if (iov_to_buf(out_sg, out_num, 0, &vhdr, n->guest_hdr_len) < + n->guest_hdr_len) { + virtio_error(vdev, "virtio-net header incorrect"); + virtqueue_detach_element(q->tx_vq, elem, 0); +@@ -2545,8 +2550,8 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q) + return -EINVAL; + } + if (n->needs_vnet_hdr_swap) { +- virtio_net_hdr_swap(vdev, (void *) &mhdr); +- sg2[0].iov_base = &mhdr; ++ virtio_net_hdr_swap(vdev, (void *) &vhdr); ++ sg2[0].iov_base = &vhdr; + sg2[0].iov_len = n->guest_hdr_len; + out_num = iov_copy(&sg2[1], ARRAY_SIZE(sg2) - 1, + out_sg, out_num, +-- +2.34.1 From patchwork Mon Mar 4 15:23:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 40443 X-Patchwork-Delegate: steve@sakoman.com 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 75860C5478C for ; Mon, 4 Mar 2024 15:23:40 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web11.101496.1709565810862274174 for ; Mon, 04 Mar 2024 07:23:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=AlP6GYGZ; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-5d4a1e66750so3430749a12.0 for ; Mon, 04 Mar 2024 07:23:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1709565810; x=1710170610; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=1sb84XiNmPcz+p3oDaq2vnOTgISFP4QYkOYSvolqDX8=; b=AlP6GYGZFd5ETa99hRlxlh40d8eaKWAqBVY510SRpbEClLAp+dEA/tbcaD+/MnfVC5 iaWW8pHsSUY7y2MAc8Jx6h4G6c9tnyy+UnpGX+vwLEqKtzf/22CzOW0VeHnBbVdOXNg/ xbKtBlElXxqa/nWPcSY0EAsh2ZvRx2+aTWOQqQqBdLn3MzH859uVhDYGymafJKApNz1M +qc5V3xx8jX8e8+B+MvB1+ATrZneNYVSWCy0e5RMXQCRDvm5vNAVvYlMaGivYznHkqW+ 45yoci0+86OTkF+Ym+WVnc+LJOPyrp9MdQ4E3far61mcU92cIiI/5Ccj7Df3WTvFrA4q vrXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709565810; x=1710170610; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1sb84XiNmPcz+p3oDaq2vnOTgISFP4QYkOYSvolqDX8=; b=wdzC9Gh2QLCGqB/N5HW/HZrUllbVUa+hJ2ogXYPyicMIYCpSQGbjOiCetNndxd47UU NtPCS1p7LM6r+kih7A2Jh4nAMxCaE9utPYvxoQ/qARRLLK3U62JVGcpLaTCzAU35Ln1H 1bFgnYo2wUzrdMNLkWIZPh3/Y9LPC3GWyoIIz9aXAEu7TTORFdaT4A23CGwe/x/ZcDpW 6HekV91AnoolRH0lJ9KvztOtzjb4j/kC48bj5JM8PP0+vR90pXtmqvl6OemG44Rafabf xaf744FC0Qy2moND1EqNlCoksS4cdhk1h/cU7TJXRrJf4MZbwL50Bl3zc9fihmUxPH/U 08gw== X-Gm-Message-State: AOJu0YxZNYuUUSUkib+FVJ0NK/zscurCuTFXgIhPN0mX/YplyVCnMcJE YRXnXQAJY1fXF9OphoDBfvKiG9sXf1+JwWjIL4hbVMGfBND/Hh9Ty88MQ3Z6bW+rCL3tte1Pq88 PGhU= X-Google-Smtp-Source: AGHT+IHFoLzc0V5g+sF4qOXy+P2GQJk23OezgB7qjZKrrywdKR6J0VneoyEZr5+0QwmqfRy/LSq0vg== X-Received: by 2002:a17:90a:d48c:b0:29a:bb75:d727 with SMTP id s12-20020a17090ad48c00b0029abb75d727mr5854296pju.44.1709565809950; Mon, 04 Mar 2024 07:23:29 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id 1-20020a17090a0f0100b0029981c0d5c5sm8898968pjy.19.2024.03.04.07.23.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:23:29 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/11] qemu: Fix CVE-2023-42467 Date: Mon, 4 Mar 2024 05:23:10 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Mon, 04 Mar 2024 15:23:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196603 From: Poonam Jadhav 1. scsi-disk: allow MODE SELECT block descriptor to set the block size Link: https://github.com/qemu/qemu/commit/356c4c441ec01910314c5867c680bef80d1dd373 The MODE SELECT command can contain an optional block descriptor that can be used to set the device block size. If the block descriptor is present then update the block size on the SCSI device accordingly. This allows CDROMs to be used with A/UX which requires a CDROM drive which is capable of switching from a 2048 byte sector size to a 512 byte sector size. 2. scsi-disk: ensure block size is non-zero and changes limited to bits 8-15 Link: https://github.com/qemu/qemu/commit/55794c904df723109b228da28b5db778e0df3110 The existing code assumes that the block size can be generated from p[1] << 8 in multiple places which ignores the top and bottom 8 bits. If the block size is allowed to be set to an arbitrary value then this causes a mismatch between the value written by the guest in the block descriptor and the value subsequently read back using READ CAPACITY causing the guest to generate requests that can crash QEMU. For now restrict block size changes to bits 8-15 and also ignore requests to set the block size to 0 which causes the SCSI emulation to crash in at least one place with a divide by zero error. 3. Disallow block sizes smaller than 512 [CVE-2023-42467] Link: https://gitlab.com/qemu-project/qemu/-/commit/7cfcc79b0ab800959716738aff9419f53fc68c9c We are doing things like nb_sectors /= (s->qdev.blocksize / BDRV_SECTOR_SIZE); in the code here (e.g. in scsi_disk_emulate_mode_sense()), so if the blocksize is smaller than BDRV_SECTOR_SIZE (=512), this crashes with a division by 0 exception. Thus disallow block sizes of 256 bytes to avoid this situation. Signed-off-by: Poonam Jadhav Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 3 + .../qemu/qemu/CVE-2023-42467.patch | 46 +++++++++++++ ...lock-desriptor-to-set-the-block-size.patch | 54 +++++++++++++++ ...ero-and-changes-limited-to-bits-8-15.patch | 67 +++++++++++++++++++ 4 files changed, 170 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch create mode 100644 meta/recipes-devtools/qemu/qemu/scsi-disk-allow-MODE-SELECT-block-desriptor-to-set-the-block-size.patch create mode 100644 meta/recipes-devtools/qemu/qemu/scsi-disk-ensure-block-size-is-non-zero-and-changes-limited-to-bits-8-15.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index d3e6ced988..ad6b310137 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -105,6 +105,9 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2023-5088.patch \ file://CVE-2024-24474.patch \ file://CVE-2023-6693.patch \ + file://scsi-disk-allow-MODE-SELECT-block-desriptor-to-set-the-block-size.patch \ + file://scsi-disk-ensure-block-size-is-non-zero-and-changes-limited-to-bits-8-15.patch \ + file://CVE-2023-42467.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch b/meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch new file mode 100644 index 0000000000..d53683faa7 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch @@ -0,0 +1,46 @@ +From 7cfcc79b0ab800959716738aff9419f53fc68c9c Mon Sep 17 00:00:00 2001 +From: Thomas Huth +Date: Mon, 25 Sep 2023 11:18:54 +0200 +Subject: [PATCH] hw/scsi/scsi-disk: Disallow block sizes smaller than 512 + [CVE-2023-42467] + +We are doing things like + + nb_sectors /= (s->qdev.blocksize / BDRV_SECTOR_SIZE); + +in the code here (e.g. in scsi_disk_emulate_mode_sense()), so if +the blocksize is smaller than BDRV_SECTOR_SIZE (=512), this crashes +with a division by 0 exception. Thus disallow block sizes of 256 +bytes to avoid this situation. + +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1813 +CVE: 2023-42467 +Signed-off-by: Thomas Huth +Message-ID: <20230925091854.49198-1-thuth@redhat.com> +Signed-off-by: Paolo Bonzini + +CVE: CVE-2023-42467 +Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/7cfcc79b0ab800959716738aff9419f53fc68c9c] +Signed-off-by: Poonam Jadhav +--- + hw/scsi/scsi-disk.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c +index e0d79c7966c..477ee2bcd47 100644 +--- a/hw/scsi/scsi-disk.c ++++ b/hw/scsi/scsi-disk.c +@@ -1628,9 +1628,10 @@ static void scsi_disk_emulate_mode_select(SCSIDiskReq *r, uint8_t *inbuf) + * Since the existing code only checks/updates bits 8-15 of the block + * size, restrict ourselves to the same requirement for now to ensure + * that a block size set by a block descriptor and then read back by +- * a subsequent SCSI command will be the same ++ * a subsequent SCSI command will be the same. Also disallow a block ++ * size of 256 since we cannot handle anything below BDRV_SECTOR_SIZE. + */ +- if (bs && !(bs & ~0xff00) && bs != s->qdev.blocksize) { ++ if (bs && !(bs & ~0xfe00) && bs != s->qdev.blocksize) { + s->qdev.blocksize = bs; + trace_scsi_disk_mode_select_set_blocksize(s->qdev.blocksize); + } +-- diff --git a/meta/recipes-devtools/qemu/qemu/scsi-disk-allow-MODE-SELECT-block-desriptor-to-set-the-block-size.patch b/meta/recipes-devtools/qemu/qemu/scsi-disk-allow-MODE-SELECT-block-desriptor-to-set-the-block-size.patch new file mode 100644 index 0000000000..d8e48d07dd --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/scsi-disk-allow-MODE-SELECT-block-desriptor-to-set-the-block-size.patch @@ -0,0 +1,54 @@ +From 356c4c441ec01910314c5867c680bef80d1dd373 Mon Sep 17 00:00:00 2001 +From: Mark Cave-Ayland +Date: Wed, 22 Jun 2022 11:53:12 +0100 +Subject: [PATCH] scsi-disk: allow MODE SELECT block descriptor to set the + block size + +The MODE SELECT command can contain an optional block descriptor that can be used +to set the device block size. If the block descriptor is present then update the +block size on the SCSI device accordingly. + +This allows CDROMs to be used with A/UX which requires a CDROM drive which is +capable of switching from a 2048 byte sector size to a 512 byte sector size. + +Signed-off-by: Mark Cave-Ayland +Message-Id: <20220622105314.802852-13-mark.cave-ayland@ilande.co.uk> +Signed-off-by: Paolo Bonzini + +Comment: Patch is refreshed +Upstream-Status: Backport [https://github.com/qemu/qemu/commit/356c4c441ec01910314c5867c680bef80d1dd373] +Signed-off-by: Poonam Jadhav +--- + hw/scsi/scsi-disk.c | 6 ++++++ + hw/scsi/trace-events | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c +index db27e834dae3..f5cdb9ad4b54 100644 +--- a/hw/scsi/scsi-disk.c ++++ b/hw/scsi/scsi-disk.c +@@ -1616,6 +1616,12 @@ static void scsi_disk_emulate_mode_select(SCSIDiskReq *r, uint8_t *inbuf) + goto invalid_param; + } + ++ /* Allow changing the block size */ ++ if (bd_len && p[6] != (s->qdev.blocksize >> 8)) { ++ s->qdev.blocksize = p[6] << 8; ++ trace_scsi_disk_mode_select_set_blocksize(s->qdev.blocksize); ++ } ++ + len -= bd_len; + p += bd_len; + +diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events +index 8e927ff62de1..ab238293f0da 100644 +--- a/hw/scsi/trace-events ++++ b/hw/scsi/trace-events +@@ -338,6 +338,7 @@scsi_disk_dma_command_READ(uint64_t lba, uint32_t len) "Read (sector %" PRId64 ", count %u)" + scsi_disk_dma_command_WRITE(const char *cmd, uint64_t lba, int len) "Write %s(sector %" PRId64 ", count %u)" + scsi_disk_new_request(uint32_t lun, uint32_t tag, const char *line) "Command: lun=%d tag=0x%x data=%s" + scsi_disk_aio_sgio_command(uint32_t tag, uint8_t cmd, uint64_t lba, int len, uint32_t timeout) "disk aio sgio: tag=0x%x cmd=0x%x (sector %" PRId64 ", count %d) timeout=%u" ++scsi_disk_mode_select_set_blocksize(int blocksize) "set block size to %d" + + # scsi-generic.c + scsi_generic_command_complete_noio(void *req, uint32_t tag, int statuc) "Command complete %p tag=0x%x status=%d" diff --git a/meta/recipes-devtools/qemu/qemu/scsi-disk-ensure-block-size-is-non-zero-and-changes-limited-to-bits-8-15.patch b/meta/recipes-devtools/qemu/qemu/scsi-disk-ensure-block-size-is-non-zero-and-changes-limited-to-bits-8-15.patch new file mode 100644 index 0000000000..1e1be683fc --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/scsi-disk-ensure-block-size-is-non-zero-and-changes-limited-to-bits-8-15.patch @@ -0,0 +1,67 @@ +From 55794c904df723109b228da28b5db778e0df3110 Mon Sep 17 00:00:00 2001 +From: Mark Cave-Ayland +Date: Sat, 30 Jul 2022 13:26:56 +0100 +Subject: [PATCH] scsi-disk: ensure block size is non-zero and changes limited + to bits 8-15 + +The existing code assumes that the block size can be generated from p[1] << 8 +in multiple places which ignores the top and bottom 8 bits. If the block size +is allowed to be set to an arbitrary value then this causes a mismatch +between the value written by the guest in the block descriptor and the value +subsequently read back using READ CAPACITY causing the guest to generate +requests that can crash QEMU. + +For now restrict block size changes to bits 8-15 and also ignore requests to +set the block size to 0 which causes the SCSI emulation to crash in at least +one place with a divide by zero error. + +Fixes: 356c4c441e ("scsi-disk: allow MODE SELECT block descriptor to set the block size") +Closes: https://gitlab.com/qemu-project/qemu/-/issues/1112 +Signed-off-by: Mark Cave-Ayland +Message-Id: <20220730122656.253448-3-mark.cave-ayland@ilande.co.uk> +Signed-off-by: Paolo Bonzini + +Comment: Patch is refreshed +Upstream-Status: Backport [https://github.com/qemu/qemu/commit/55794c904df723109b228da28b5db778e0df3110] +Signed-off-by: Poonam Jadhav +--- + hw/scsi/scsi-disk.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c +index 3027ac3b1ed6..efee6739f9ad 100644 +--- a/hw/scsi/scsi-disk.c ++++ b/hw/scsi/scsi-disk.c +@@ -1532,7 +1532,7 @@ static void scsi_disk_emulate_mode_select(SCSIDiskReq *r, uint8_t *inbuf) + int cmd = r->req.cmd.buf[0]; + int len = r->req.cmd.xfer; + int hdr_len = (cmd == MODE_SELECT ? 4 : 8); +- int bd_len; ++ int bd_len, bs; + int pass; + + /* We only support PF=1, SP=0. */ +@@ -1617,9 +1617,19 @@ static void scsi_disk_emulate_mode_select(SCSIDiskReq *r, uint8_t *inbuf) + } + + /* Allow changing the block size */ +- if (bd_len && p[6] != (s->qdev.blocksize >> 8)) { +- s->qdev.blocksize = p[6] << 8; +- trace_scsi_disk_mode_select_set_blocksize(s->qdev.blocksize); ++ if (bd_len) { ++ bs = p[5] << 16 | p[6] << 8 | p[7]; ++ ++ /* ++ * Since the existing code only checks/updates bits 8-15 of the block ++ * size, restrict ourselves to the same requirement for now to ensure ++ * that a block size set by a block descriptor and then read back by ++ * a subsequent SCSI command will be the same ++ */ ++ if (bs && !(bs & ~0xff00) && bs != s->qdev.blocksize) { ++ s->qdev.blocksize = bs; ++ trace_scsi_disk_mode_select_set_blocksize(s->qdev.blocksize); ++ } + } + + len -= bd_len; + From patchwork Mon Mar 4 15:23:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 40444 X-Patchwork-Delegate: steve@sakoman.com 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 8547CC54E4A for ; Mon, 4 Mar 2024 15:23:40 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web10.101642.1709565812145978734 for ; Mon, 04 Mar 2024 07:23:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=cZK7Y4Qi; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-5c66b093b86so4440315a12.0 for ; Mon, 04 Mar 2024 07:23:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1709565811; x=1710170611; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AcEAsSw8v7JPRwm97O2VU3iPiPApBQOpVzoSc2fjIAk=; b=cZK7Y4QiBbmaRGvSe47KSh7k8aKmYxnnFtUo71pdBRL318Q70mD2BITnSisAkwCLCG IfeldHiHQNdXCFGQQ3B+PwQHJonAJ0eoWoOarBjlyPwFwfrilN9lPxKFtpb4agFNgN1A 2su5jwxOfB9T2qIpnJLDUPuwOAmxf6UdTt4Klw1Ono3oRVL9UDda1XzJ8INCmcSjINCI F4BfxXbieU+1h6tSg8wMQ82PWd2BiEfuW94OoTW2palzhPXVlEwLRH4LwdXhWGbyGfHO De8qWc1W9YcHjXs2QNx1g9ZZKTTpRtDpSSUMbLbevW76jDDFrzeWXmSmjJ9nIKQGBNzK /njg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709565811; x=1710170611; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AcEAsSw8v7JPRwm97O2VU3iPiPApBQOpVzoSc2fjIAk=; b=GogkkSgAQas299wiN/PWyN6ss7df5jSu5ftTYfjY3W0UuhBLa6nHhENePuWVe69u8m nBBYK2sgIUWB7AzFFn7k+ZV+T74sb4jt4ExKPyXxp5U6GV3T1KPSYHZ0WEotIYVcLFP5 +8yGEl4iKbraHYCxY/Cm2O9daZqmMFXEla7sBYtzKCtnFKqmNbT5uh4RzAMB7Hdj2CeY cZNRTm6AH2DVK50a6kiFYiS53kjZ3yoPnw5e7ajxFkl5/4yp2wrEY2Y7GsWddXhx82qL ItaYcEEOuN3uOPPTcQy9T0n0+f2G2XsjV54YHrOjKOGbTflnmh1KpY6wl4DLturT1LYT 5suQ== X-Gm-Message-State: AOJu0Yx2Q5Hsq49iMkt5/lsTlzCbD+2PhN/OasEl+aWdBbQvJvsJf5Ir S2grFvn+ytM/SFPESV6wBHqQ4BuMWu/XVHYTTkfe9qlnqyisBddNHcMl2l7SHkR4J4ZlA6umOTV 9s3A= X-Google-Smtp-Source: AGHT+IGn/KTK+vaAliLJpOn68pqcoteNWM+NUgzMeILKRYoPZM+qg28d95ZUUbSx18ZJsD/fF9MKDQ== X-Received: by 2002:a17:90b:2283:b0:298:a422:937d with SMTP id kx3-20020a17090b228300b00298a422937dmr10765236pjb.24.1709565811394; Mon, 04 Mar 2024 07:23:31 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id 1-20020a17090a0f0100b0029981c0d5c5sm8898968pjy.19.2024.03.04.07.23.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:23:31 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/11] dbus: Add missing CVE_PRODUCT Date: Mon, 4 Mar 2024 05:23:11 -1000 Message-Id: <6488fc1a8ffa68268d9d4b71cb017eeb9a645cbe.1709565668.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Mon, 04 Mar 2024 15:23:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196604 From: Dhairya Nagodra - The current recipe only contains one (out of three) valid product names for dbus package in NVD. - This could result in reporting of lesser number CVEs than actual. - Added missing names to get a proper list. Signed-off-by: Dhairya Nagodra Signed-off-by: Steve Sakoman --- meta/recipes-core/dbus/dbus_1.14.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/dbus/dbus_1.14.8.bb b/meta/recipes-core/dbus/dbus_1.14.8.bb index 4da307ecb3..f03e5c2d2e 100644 --- a/meta/recipes-core/dbus/dbus_1.14.8.bb +++ b/meta/recipes-core/dbus/dbus_1.14.8.bb @@ -184,4 +184,4 @@ do_install:class-nativesdk() { } BBCLASSEXTEND = "native nativesdk" -CVE_PRODUCT += "d-bus_project:d-bus" +CVE_PRODUCT += "d-bus_project:d-bus freedesktop:dbus freedesktop:libdbus" From patchwork Mon Mar 4 15:23:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 40442 X-Patchwork-Delegate: steve@sakoman.com 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 7651FC48BF6 for ; Mon, 4 Mar 2024 15:23:40 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web10.101644.1709565813419739741 for ; Mon, 04 Mar 2024 07:23:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=QMF8D2aX; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-5d81b08d6f2so4234181a12.0 for ; Mon, 04 Mar 2024 07:23:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1709565813; x=1710170613; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=X+Br9F1iYByhGyf2ISJnIKmQh26wZLk0ioi8exVcDvY=; b=QMF8D2aXsO8/cS328ChXmLosEo346TJGfoLbl8ZpOK9yxP/l5i5vvWex8PdrEJfTME OEO96wOJkf/0SnkDCum4pKM65ZNQ9qKfSbh+sBX1xB/vYD5somQX+KXnYETxf8J9nLLB cMduqDhdn7294QFGoQXk+2Abw+pKsdjs7dVFYAhTeEeJODUDH9DwvSozfCGhqIW4qZgY 7efLXRctAkznt2dcmYka+8y/HVN+gxJbYW7rFuyxPcOPY3IHiyEj2s4qitFUFb/oOsJL A1aPnWgmHSU3uZnKS47uy3cdiXFCwTKte5rB7WiHz2BdPgY6j9aL3RIShD5PFSwYvASa XNNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709565813; x=1710170613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X+Br9F1iYByhGyf2ISJnIKmQh26wZLk0ioi8exVcDvY=; b=rHMbRRqw8Rhi1lZDtn4NHa79STJLyZV0pO1YzDZBpJJeHcVAtM/YdtGDGC7K1IySUN JHGsSyUZI0UcLO+u3HMV4b82Xa865wFqzbj7/6kiqEpiJ/GtKuTaj7KvWvUyz9Rm1VXx wOgj0jwMHYvOf3oy3WJFqeShpuj49Ww4LLLb5kPf1HQmpEJi/yOTXmICV8Y6YgJGTrgF oVf3AIaN4AFbiByEaztS3djZ9ZdNpilcX4BiE7oYGCe4o/SRxPVJoqArueNc45hlXYAZ xzde5eNHmSKPzreEpAzLnud1a3i8Cx9ZyszHtCdq3jRdV4OEoNKwFvnGDUBFong3mLgG X3og== X-Gm-Message-State: AOJu0YzX2/gNrpQm+y5ns2GVIeVe5bIphN+8JZMI2KrBxMvtpzC0Y/xR wJSfH5TJUVkxPktJMA0rzHd067sWw3ZXUnARuZ+adkxk+xB0tnD8ey217gUvH0m+hMAKSTP0k8r wuag= X-Google-Smtp-Source: AGHT+IGSVUnCUfljy3Afmjq3wyTNGy23JQedr6MnH4kEHWT8K6ccV5RL3YLAGXvCRCIbcBkGHKv7ZA== X-Received: by 2002:a17:90a:7805:b0:29b:789:802a with SMTP id w5-20020a17090a780500b0029b0789802amr7611891pjk.31.1709565812819; Mon, 04 Mar 2024 07:23:32 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id 1-20020a17090a0f0100b0029981c0d5c5sm8898968pjy.19.2024.03.04.07.23.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:23:32 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/11] cve_check: cleanup logging Date: Mon, 4 Mar 2024 05:23:12 -1000 Message-Id: <1745208bc08037497ad9de1be15a3cc4a22ceff5.1709565668.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Mon, 04 Mar 2024 15:23:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196605 From: Ross Burton Primarily list the number of patches found, useful when debugging. Also clean up some bad escaping that caused warnings and use re.IGNORECASE instead of manually doing case-insenstive rang matches. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 10acc75b7f3387b968bacd51aade6a8dc11a463f) Signed-off-by: Steve Sakoman --- meta/lib/oe/cve_check.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/meta/lib/oe/cve_check.py b/meta/lib/oe/cve_check.py index 65b1358ffc..ca2b393116 100644 --- a/meta/lib/oe/cve_check.py +++ b/meta/lib/oe/cve_check.py @@ -73,20 +73,19 @@ def get_patched_cves(d): import re import oe.patch - pn = d.getVar("PN") - cve_match = re.compile("CVE:( CVE\-\d{4}\-\d+)+") + cve_match = re.compile(r"CVE:( CVE-\d{4}-\d+)+") # Matches the last "CVE-YYYY-ID" in the file name, also if written # in lowercase. Possible to have multiple CVE IDs in a single # file name, but only the last one will be detected from the file name. # However, patch files contents addressing multiple CVE IDs are supported # (cve_match regular expression) - - cve_file_name_match = re.compile(".*([Cc][Vv][Ee]\-\d{4}\-\d+)") + cve_file_name_match = re.compile(r".*(CVE-\d{4}-\d+)", re.IGNORECASE) patched_cves = set() - bb.debug(2, "Looking for patches that solves CVEs for %s" % pn) - for url in oe.patch.src_patches(d): + patches = oe.patch.src_patches(d) + bb.debug(2, "Scanning %d patches for CVEs" % len(patches)) + for url in patches: patch_file = bb.fetch.decodeurl(url)[2] # Check patch file name for CVE ID @@ -94,7 +93,7 @@ def get_patched_cves(d): if fname_match: cve = fname_match.group(1).upper() patched_cves.add(cve) - bb.debug(2, "Found CVE %s from patch file name %s" % (cve, patch_file)) + bb.debug(2, "Found %s from patch file name %s" % (cve, patch_file)) # Remote patches won't be present and compressed patches won't be # unpacked, so say we're not scanning them From patchwork Mon Mar 4 15:23:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 40445 X-Patchwork-Delegate: steve@sakoman.com 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 6ED40C5478C for ; Mon, 4 Mar 2024 15:23:50 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.web11.101505.1709565821363069802 for ; Mon, 04 Mar 2024 07:23:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=wKgAbH5A; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-5d8b887bb0cso4126114a12.2 for ; Mon, 04 Mar 2024 07:23:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1709565820; x=1710170620; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ST0SCPKDPcwBtSWlc/p54LamQlXWTBcEc+J/6BQTR1Y=; b=wKgAbH5Aiku1sT5v5ClAz5iPoNlhIoxW9xXclfQ3b3TJrcn82M81rVs0tajfNajUrp 8+Y6XrZJloa4qeIlOAeO6Rl/xMEshl1gLznufeBSEjAAlQ28Gg7bbWNXAjSpKGx9MVLE dvqOiQT3mctrjtss85f8okw9tK0NmT5vHlkTXzUhGvvlWdM61jD0cfC10q4X+fXAonyh chaHMcvmXrTiExKMIv5il/dpXIPqBFn27I1kFWWSSvCKpFBcP0dUWA0MTB74RXsmFEYx NAsNyg6xL3yTLOnYiWiQOKpnI8Q2Zl2Ks43ZOg9cMyrzXIvo3SfQS7MtGkDYUDxeXWI+ dCpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709565820; x=1710170620; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ST0SCPKDPcwBtSWlc/p54LamQlXWTBcEc+J/6BQTR1Y=; b=UTWo3gvBQuQCOD9ESdAIK4rxpnJ/d6lhLHaIV+rckr/dplgp/ocg83kP204M3/BHOD TpWRMIERJjtsR1nT5VyB5pEzIH0DfzMSn5MKQNByQxCyBEUhIwwFTaTivEajaSrSQZ7u gAOQIqnqEWT+aRU6Gk3xpwY82KRo27ukqWxMZi2yMsjF/uxqMwm+gZIkfRNoGmt1Mfpu w3ERSVOC5KDFalmgiJJ6M0WtyW8lzKdvDUXbSdOaC981H2NbZU4O9V04LMompDMTwlbW YK2hEafR+wxQy57grh4K9L1Mk5UxBQW3ehaArz5lTu2V+UGxK3QFWYV3JwcxSKZxN8L/ Pkaw== X-Gm-Message-State: AOJu0Yz6qZsURV4gXlcnScTxnZbKq9GgHNdADcFOhizzx+l9twrWOZjk 0rGPyLrTXCkNE580+/i1lEMwmfQ3dPN/3Dz6nyWCYLZUP2iif86nHwwLehWNgVjffzoyr6700gx sWg4= X-Google-Smtp-Source: AGHT+IGIMooSZgiwiJ9ZQgz0QJalE+i6sYQpN+E1hl13mYUdvBV0NdG78TCOIbPzd8GVv0caDjglTQ== X-Received: by 2002:a05:6a20:3c8d:b0:1a1:2a5b:a6c3 with SMTP id b13-20020a056a203c8d00b001a12a5ba6c3mr11612285pzj.3.1709565820631; Mon, 04 Mar 2024 07:23:40 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id 1-20020a17090a0f0100b0029981c0d5c5sm8898968pjy.19.2024.03.04.07.23.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:23:33 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/11] bind: Upgrade 9.18.19 -> 9.18.24 Date: Mon, 4 Mar 2024 05:23:13 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Mon, 04 Mar 2024 15:23:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196606 From: Soumya Sambu Includes security fixes for - CVE-2023-4408, CVE-2023-5517, CVE-2023-5679, CVE-2023-50868 and CVE-2023-50387 Changelog: ========= https://gitlab.isc.org/isc-projects/bind9/-/blob/v9.18.24/CHANGES Signed-off-by: Soumya Sambu Signed-off-by: Steve Sakoman --- .../bind/{bind_9.18.19.bb => bind_9.18.24.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-connectivity/bind/{bind_9.18.19.bb => bind_9.18.24.bb} (97%) diff --git a/meta/recipes-connectivity/bind/bind_9.18.19.bb b/meta/recipes-connectivity/bind/bind_9.18.24.bb similarity index 97% rename from meta/recipes-connectivity/bind/bind_9.18.19.bb rename to meta/recipes-connectivity/bind/bind_9.18.24.bb index a829cc566d..fbbebe89ad 100644 --- a/meta/recipes-connectivity/bind/bind_9.18.19.bb +++ b/meta/recipes-connectivity/bind/bind_9.18.24.bb @@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "115e09c05439bebade1d272eda08fa88eb3b60129edef690588c87a4d27612cc" +SRC_URI[sha256sum] = "709d73023c9115ddad3bab65b6c8c79a590196d0d114f5d0ca2533dbd52ddf66" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # follow the ESV versions divisible by 2 From patchwork Mon Mar 4 15:23:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 40447 X-Patchwork-Delegate: steve@sakoman.com 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 94B6BC54E55 for ; Mon, 4 Mar 2024 15:23:50 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.101650.1709565823164810065 for ; Mon, 04 Mar 2024 07:23:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=zMC6OoPA; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1dc9222b337so45638995ad.2 for ; Mon, 04 Mar 2024 07:23:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1709565822; x=1710170622; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PCbQI+0sJTwEKIp5D6XH4wePKiTJ2uj1JhHOLp+3OU4=; b=zMC6OoPAjbwusAmD2dU1B880BQN5UnACTwxUlSG0RFH/kr5a3aSZlw1uqhJuQ4a6Pw e7bl1gWMttK7j1hikzos6aZSPVMuG5XpMu6Mt+rOWidM8ZumQdyVJNt577d2G09YLBjD 88NUN7pR4f+uIzpdUm/uKd6/g0eRbOTgCcPSO3ccInOCxrWKvRW/Pb8VDh+ZBMoKX1g/ WKJXRtHJtSOi9oMBHjrXNI+kqfA1KHzxnBreg4AEs0xnVCgM06x6+qYfESCPQaet4XYv qAQ/Cw82PlJ4JKedMFqWJU8UUHgQHK7Jny37KBFkMTOXDhpqTEB4O/TD74tUgngHiKLT oyGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709565822; x=1710170622; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PCbQI+0sJTwEKIp5D6XH4wePKiTJ2uj1JhHOLp+3OU4=; b=R0kEM61kBPHFIkr/wciVznMvLtS32sDfIH2VW67Z/t8dMIcddMc+n4GPMFut17Pwcn YKKP2fqqaAGNo2xy16G+s/Fw2MPJ1LR6mQ/Kt2IAKFUTiJ5Jaaq4WD8zvK814DMlK1/D fm51e+/aHtaYZTp8HSikMf7/6iFEwA1wg3VOR81j67cBuMEQCN1hyYmWaPYUp3+FsD8j ndW80HlWX3kLE10J4dfOaIteypXC+ok2vjVzyvTiZtqEt0fPwCrxp0Yuiau7nrek16yD xL2Tixp03A7D/YkXXfDppslDvz05XokJX6aL1EYCtPyZjZYk8W3YVsMc8w1d8OzWj7/z JRRg== X-Gm-Message-State: AOJu0Yx01/8jInclH43Gr6ueBZ/XZKaBfxoqrpcQZMFfr3Us+stjIek3 S8ZfZeuwNnRH40ritqd/XoiYKKofW0G2R74JeVT+CyjDtMQbeNR2B8rfIRrCCq+tVP1OSwB0/8E o52M= X-Google-Smtp-Source: AGHT+IG37WUOJWg4f+q4lwUeX37zV3g1JwlLiOob2Nk8MFvMXv3ztOxjVEvNecCB7D0IEAEaSe7HaQ== X-Received: by 2002:a17:90a:f68e:b0:29b:4b7e:a016 with SMTP id cl14-20020a17090af68e00b0029b4b7ea016mr2660717pjb.8.1709565822472; Mon, 04 Mar 2024 07:23:42 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id 1-20020a17090a0f0100b0029981c0d5c5sm8898968pjy.19.2024.03.04.07.23.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:23:42 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/11] linux-firmware: upgrade 20231030 -> 20231211 Date: Mon, 4 Mar 2024 05:23:14 -1000 Message-Id: <122be5a683affb3044b8e8d605a4bfcc79c6b4c7.1709565668.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Mon, 04 Mar 2024 15:23:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196607 From: Alexander Sverdlin Signed-off-by: Alexander Sverdlin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 0caafdbbf4e7dc84b919afe14f7cb8c46a9e4ac2) Signed-off-by: Steve Sakoman --- ...nux-firmware_20231030.bb => linux-firmware_20231211.bb} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20231030.bb => linux-firmware_20231211.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20231211.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20231211.bb index a42e5ed825..48e83cb34b 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231211.bb @@ -147,7 +147,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ " # WHENCE checksum is defined separately to ease overriding it if # class-devupstream is selected. -WHENCE_CHKSUM = "ceb5248746d24d165b603e71b288cf75" +WHENCE_CHKSUM = "3113c4ea08e5171555f3bf49eceb5b07" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -231,7 +231,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "c98d200fc4a3120de1a594713ce34e135819dff23e883a4ed387863ba25679c7" +SRC_URI[sha256sum] = "96af7e4b5eabd37869cdb3dcbb7ab36911106d39b76e799fa1caab16a9dbe8bb" inherit allarch @@ -242,7 +242,8 @@ do_compile() { } do_install() { - oe_runmake 'DESTDIR=${D}' 'FIRMWAREDIR=${nonarch_base_libdir}/firmware' install + # install-nodedup avoids rdfind dependency + oe_runmake 'DESTDIR=${D}' 'FIRMWAREDIR=${nonarch_base_libdir}/firmware' install-nodedup cp GPL-2 LICEN[CS]E.* WHENCE ${D}${nonarch_base_libdir}/firmware/ } From patchwork Mon Mar 4 15:23:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 40448 X-Patchwork-Delegate: steve@sakoman.com 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 8182EC48BF6 for ; Mon, 4 Mar 2024 15:23:50 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web11.101512.1709565825067528093 for ; Mon, 04 Mar 2024 07:23:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=qckvGHNL; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-29abd02d0d9so2776546a91.0 for ; Mon, 04 Mar 2024 07:23:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1709565824; x=1710170624; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qJUJk2wSKvq/t2Yygyjr6DKa67rVnia6H+YUC5iO8bg=; b=qckvGHNL4pjvSlcQotG4NT3fpphkA9ujLCPC5LgLiFFPUfA5cNC61odTFdESoqN7mE bApO2CvL12cjlT70ROXjGV0XaCOQp0/yTgMvGcppucbLgqZ1SCFeSIAYBO3KLghvBtcA lcBQph+bQ0XrmaVOShVbRi/NYXbYDB90lHZ40n6nR2fNyy4/WKraiDj8h7iUiZV6JY6A 58oqlprARkfPbOZM57t0MGvCr/8W2jMrM7N45RRj2+6d5YXYmXKox5ZskK3iPlcCb1Dl +d3DTpmMZO39t7WkL94KfWkY6E1fAYGutkBz6dcKI0oFh5dMRlZ9j7rMVZeFzAnsnyM9 a+jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709565824; x=1710170624; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qJUJk2wSKvq/t2Yygyjr6DKa67rVnia6H+YUC5iO8bg=; b=w+QHoFBEnIoLZ5frhtAAZkLA7wavLDO39pXhcqe1P9HF/SyZOdDQkfz4EVz5omvHPq Y5fV4UI/c0u+r7KdO5cp1TELzQNkQ49n4gPWOIzzFtBUB4hJ/ArRDcfDSGwDeuy8i/j+ GlSYlpnpEv4VMVN6QcozvlljJ82bWDMCtZwGQnXvrcoxbZ6ljyB3yYezUPZt/21hwC/w CWAlTVnWj47ws7P4o5lHcHShQZx4yh0LFG1bU+QTl5LpYUu7doD8wJmnzzlDcUzqWcXz GmFuaDrlJMOdaxzR1TlZO1V04fAZPWwS7QKclAuVfmhJ6Fdf4YQgHeM7Fom5LtpADDTu 9XuA== X-Gm-Message-State: AOJu0YweEoXpQzTNXoA9kBeyrNQ6d9jJDMMn9SbmAZEEoE8rp6Q5Gqnf RqreQGi1k5cHoEdWCOeimw2g1yi5saqR9JrxbXvzxGIMp7dCw5u3lIHi6hnU33ne/R+a/ygj8PS Z2D4= X-Google-Smtp-Source: AGHT+IFf1wG6q4RLRD4GMN7Lizz1BTyQXYoe+oLdaHi2Z2R7LyA34jDUmccEPlRO409+GdycxC8vBQ== X-Received: by 2002:a17:90a:9ed:b0:29b:1fe1:863b with SMTP id 100-20020a17090a09ed00b0029b1fe1863bmr6025299pjo.41.1709565824423; Mon, 04 Mar 2024 07:23:44 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id 1-20020a17090a0f0100b0029981c0d5c5sm8898968pjy.19.2024.03.04.07.23.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:23:44 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/11] tzdata : Upgrade to 2024a Date: Mon, 4 Mar 2024 05:23:15 -1000 Message-Id: <5f9463d8c9954944c44ca9f25702753895b02745.1709565668.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Mon, 04 Mar 2024 15:23:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196608 From: Priyal Doshi Signed-off-by: Priyal Doshi Signed-off-by: Alexandre Belloni (cherry picked from commit 5abbd0abf992ce8d11f3ae31fb1d83d97f5319fa) Signed-off-by: Shubham Kulkarni Signed-off-by: Steve Sakoman --- meta/recipes-extended/timezone/timezone.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index 2774e5e730..4734adcc08 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "PD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2023d" +PV = "2024a" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode;subdir=tz \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata;subdir=tz \ @@ -16,5 +16,5 @@ S = "${WORKDIR}/tz" UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.sha256sum] = "e9a5f9e118886d2de92b62bb05510a28cc6c058d791c93bd6b84d3292c3c161e" -SRC_URI[tzdata.sha256sum] = "dbca21970b0a8b8c0ceceec1d7b91fa903be0f6eca5ae732b5329672232a08f3" +SRC_URI[tzcode.sha256sum] = "80072894adff5a458f1d143e16e4ca1d8b2a122c9c5399da482cb68cba6a1ff8" +SRC_URI[tzdata.sha256sum] = "0d0434459acbd2059a7a8da1f3304a84a86591f6ed69c6248fffa502b6edffe3" From patchwork Mon Mar 4 15:23:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 40446 X-Patchwork-Delegate: steve@sakoman.com 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 753B1C54E4A for ; Mon, 4 Mar 2024 15:23:50 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web11.101514.1709565826743567990 for ; Mon, 04 Mar 2024 07:23:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=a07YhMtC; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2997a92e23bso2759039a91.3 for ; Mon, 04 Mar 2024 07:23:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1709565826; x=1710170626; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lTmdJzFRLfodyzxSNlD2MC2tcAdl33kqTRxcKCPbP6I=; b=a07YhMtC/6U0tyRWQYC6amGET1sAtGSPJAjxRMEsJUc16KrgcOOp7xoiYKeeDQRSvf dtEqqGDdVHhyrFid4nHLCF9yjzD1inf4d256KU8HeyQQX5e7nubtyCb/IORDVvRn2C+t NKpPXm41RhFIdLd43JRlnLf8tFy4xTGutxSC77kaxKfPMW+EFB2nsUR7rjixrZPdrOc1 SVYtBNKMkZg83+ATeSjtF904NiSOmQjMjL0tz0suvT61N/bvY2BZ/Fcw40iHQInc7WHJ s97sxv4fmX6LUoXjrfbZ3j9iVv5dWMJA8ItJD34BytDHxDCSlXoz6eOJsB1UmUuc++Gr sdMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709565826; x=1710170626; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lTmdJzFRLfodyzxSNlD2MC2tcAdl33kqTRxcKCPbP6I=; b=LJr4Og8G2yGMpnAEss21CPX3Sv7pZENgxqXNh9kCWr4V3mWth3XRIr50IxDoCil8lV yL/HSzYlB99kbhSfAHXJkHlDySn/jbrIby5RqkHAFvqxDSsFvyTMoO9vgSlI0ntUBgoO WFJibepJcUtU3qz6Skw4wRkTwNf2xb9oOCjLzAPmzxXXdDZhpQZ3t3TQiwXHlUK6Chop S+K3jwVBh4O5C2Bnp7ppVbCp6UV7WxgDO1yTDtxpzx40NfZsmG4Rs3u94hOpzYJYAbEf 3Mam8tdI5mNg3KTTarAe01FvmySHbyY7e6LsnEqtQ563gnwH7+DG1wuVY0GDfz3dUJIl tv4A== X-Gm-Message-State: AOJu0Yz1PJMWitP9MhZ1JjToA1gSobmmjagq48kpDgSvGn2AGF5lswnG ggcGdO27xE03SGIbonIdaMvYmOtA614LxaiTPG8JqmrkmiYgIqvcDVdkejlg5hNCxhge9cLJPns S9FA= X-Google-Smtp-Source: AGHT+IE/vVTYnXFH/2xrQ8FClBCv4+j3MTVP5DxOcsmfbkMZJfXwbCAc8M2Cmm/qlpBULcRtrNei9A== X-Received: by 2002:a17:90a:4813:b0:29a:5c44:2d03 with SMTP id a19-20020a17090a481300b0029a5c442d03mr5886343pjh.27.1709565825980; Mon, 04 Mar 2024 07:23:45 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id 1-20020a17090a0f0100b0029981c0d5c5sm8898968pjy.19.2024.03.04.07.23.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:23:45 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/11] kernel.bbclass: Set pkg-config variables for building modules Date: Mon, 4 Mar 2024 05:23:16 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Mon, 04 Mar 2024 15:23:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196609 From: Munehisa Kamata [Backport cd2072e5d953 from the master without HOSTPKG_CONFIG setting] The pkg-config workaround has been applied for kernel image building, but not for module building. So pkg-config variables are different between do_compile and do_compile_kernelmodules tasks. It may unnecessary trigger rebuilding of a few host tools at the later task. Especially when CONFIG_DEBUG_INFO_BTF is enabled in the kernel, it may even trigger rebuilding vmlinux at do_compile_kernelmodules due to the rebuilt host tools such as certs/extract-cert or objtool (on x86). This eventually creates an inconsistent set of kernel binaries. Here is the repro steps: - Check out nanbield on x86 - The unexpected rebuild happens on kirkstone or possibly earlier - Ensure that pahole is available (e.g. via meta-oe) - Set KERNEL_DEBUG to "True" to properly set up PAHOLE e.g. $ export KERNEL_DEBUG="True" $ export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS} KERNEL_DEBUG" - Enable CONFIG_DEBUG_INFO_BTF=y e.g. $ bitbake -c menuconfig virtual/kernel -> Kernel hacking -> Compile-time checks and compiler options -> Generate BTF typeinfo - Build the kernel e.g. $ bitbake virtual/kernel The BTF information in the resulting bzImage and kernel modules are inconsistent, because the module's BTF information is generated using the "second" vmlinux that doesn't have the identical BTF to the "first" vmlinux. These modules can't be loaded at runtime due to the BTF mismatch. This also leads to a build-id mismatch between the installed bzImage and vmlinux since the bzImage is created from the first vmlinux, but the installed vmlinux is the second one. $ eu-readelf -n tmp/work/qemux86_64-poky-linux/linux-yocto/6.5.13+git/image/boot/{bzImage*,vmlinux*} | grep "Build ID" Build ID: 4a0d62ee7fef0244950f0f604253729875bea493 Build ID: fb99b3d91399dbe42bf67ddee59e0f5a0c7f74d9 To avoid the unexpected rebuilding that results in such inconsistency, set the same pkg-config variables when building kernel and modules. For kernel 5.19 and above, simply set the HOSTPKG_CONFIG in the make command line. Signed-off-by: Munehisa Kamata Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/classes/kernel.bbclass | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 96e41b5192..dbd89057f3 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -396,6 +396,13 @@ addtask transform_kernel after do_compile before do_install do_compile_kernelmodules() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE + + # setup native pkg-config variables (kconfig scripts call pkg-config directly, cannot generically be overriden to pkg-config-native) + export PKG_CONFIG_DIR="${STAGING_DIR_NATIVE}${libdir_native}/pkgconfig" + export PKG_CONFIG_PATH="$PKG_CONFIG_DIR:${STAGING_DATADIR_NATIVE}/pkgconfig" + export PKG_CONFIG_LIBDIR="$PKG_CONFIG_DIR" + export PKG_CONFIG_SYSROOT_DIR="" + if [ "${KERNEL_DEBUG_TIMESTAMPS}" != "1" ]; then # kernel sources do not use do_unpack, so SOURCE_DATE_EPOCH may not # be set....