From patchwork Mon Aug 29 21:02:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12062 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 E7D6FC0502F for ; Mon, 29 Aug 2022 21:02:59 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web08.3685.1661806968945777909 for ; Mon, 29 Aug 2022 14:02:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=BhCWJGeK; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id j5so5281741plj.5 for ; Mon, 29 Aug 2022 14:02:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=8LYU/kHldBxDebl4uz8FvZ/q/OtIopvzKfIyyECl2eQ=; b=BhCWJGeKdP+9H6PMzNkl0GotPxAL1BaoUGcu2yP4V4xoHktGQEKKPF0/A8Nqr1+K2Y 0j18uWpbl/8JP0ZnIIj9Pr8k4EHuOMGu+08IcCvTYJDxL/aBsFStPgJxAsy8P4ZUC/jl d5iH7pxCiNbGbVs/ic3gDzknb9tAuA90RNhQPCOvk+JRajt7I/YcKX0smi0cPLqzJoxT R7NeYPflkJp3xzer4QhZe45b8tXh8CIKobRa1vS5ZPhUGmDlbgfw3H7ksYvYWTKapnph lQeVn7aPWub8blPIk+PLlfaQ1C3Up+40twBf24jzaxRYRSpeq7I1do/q4d4USeeOLRS5 aZ9g== 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:to:from:x-gm-message-state:from:to:cc; bh=8LYU/kHldBxDebl4uz8FvZ/q/OtIopvzKfIyyECl2eQ=; b=YMxm87hOFuIhBcONeqEArE2NPKviX0MmmARSCsNOG6m/VO2fDl+ssyBekLMk/eMqJe zN6bkhd4qHNrBn2rfuLWGybBZIrrsBKKWX+Hl5h+halIS95hp25MRNoNrZKX+Oktlu5b BrU8d34B/dtFwWQdA9Hf1F71xvF6otADPYsGgDLbXePfzRJocDlMkMsbeMJ0q5qPr8yA nLi0QRgabzX7oSRj7IbKojWWbGOxpNVCaiH9SQsF0ejMCTMNuv5DlYpHat/dZb+0d07j nz/L44YOt4ghxMvtbSryvwcjFMChyVqaBxkje8+MfcLLimBpC4HBGlZOeF4Nh5MxeunM K0cQ== X-Gm-Message-State: ACgBeo13+3hkK+H3TEzu4gi1b6cbXbz6vE2gES8DwNhBlALh8bJh1/D2 KbXx2t9SsUYMFspy5D55CSbVf14/yVQJNu2r X-Google-Smtp-Source: AA6agR4kBSGIwUHRRjH2xOHsMjxWuD8mxE8mN3S73WGtZIjLrBPCpGnWQnJhdQm86wx3yRWls43zFQ== X-Received: by 2002:a17:903:2284:b0:174:5588:13b1 with SMTP id b4-20020a170903228400b00174558813b1mr14300919plh.120.1661806967975; Mon, 29 Aug 2022 14:02:47 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm8058957plh.61.2022.08.29.14.02.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 14:02:47 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 01/14] libtiff: CVE-2022-34526 A stack overflow was discovered Date: Mon, 29 Aug 2022 11:02:20 -1000 Message-Id: <462d4a55a460c60a7b8c36fe3899e66f13835761.1661806803.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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, 29 Aug 2022 21:02:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170026 From: Hitendra Prajapati Source: https://gitlab.com/libtiff/libtiff MR: 120545 Type: Security Fix Disposition: Backport from https://gitlab.com/libtiff/libtiff/-/commit/275735d0354e39c0ac1dc3c0db2120d6f31d1990 ChangeID: 4c781586f7aba27420a7adc0adc597cc68495387 Description: CVE-2022-34526 libtiff: A stack overflow was discovered in the _TIFFVGetField function of Tiffsplit. Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../libtiff/files/CVE-2022-34526.patch | 29 +++++++++++++++++++ meta/recipes-multimedia/libtiff/tiff_4.1.0.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2022-34526.patch diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2022-34526.patch b/meta/recipes-multimedia/libtiff/files/CVE-2022-34526.patch new file mode 100644 index 0000000000..cf440ce55f --- /dev/null +++ b/meta/recipes-multimedia/libtiff/files/CVE-2022-34526.patch @@ -0,0 +1,29 @@ +From 06386cc9dff5dc162006abe11fd4d1a6fad616cc Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Thu, 18 Aug 2022 09:40:50 +0530 +Subject: [PATCH] CVE-2022-34526 + +Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/275735d0354e39c0ac1dc3c0db2120d6f31d1990] +CVE: CVE-2022-34526 +Signed-off-by: Hitendra Prajapati +--- + libtiff/tif_dirinfo.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c +index 52d53d4..4a1ca00 100644 +--- a/libtiff/tif_dirinfo.c ++++ b/libtiff/tif_dirinfo.c +@@ -983,6 +983,9 @@ _TIFFCheckFieldIsValidForCodec(TIFF *tif, ttag_t tag) + default: + return 1; + } ++ if( !TIFFIsCODECConfigured(tif->tif_dir.td_compression) ) { ++ return 0; ++ } + /* Check if codec specific tags are allowed for the current + * compression scheme (codec) */ + switch (tif->tif_dir.td_compression) { +-- +2.25.1 + diff --git a/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb b/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb index 4383f7af8e..c061d2aaac 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb @@ -25,6 +25,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://CVE-2022-0891.patch \ file://CVE-2022-0924.patch \ file://CVE-2022-2056-CVE-2022-2057-CVE-2022-2058.patch \ + file://CVE-2022-34526.patch \ " SRC_URI[md5sum] = "2165e7aba557463acc0664e71a3ed424" SRC_URI[sha256sum] = "5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634" From patchwork Mon Aug 29 21:02:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12059 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 D7795ECAAD8 for ; Mon, 29 Aug 2022 21:02:59 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web11.3749.1661806971017654839 for ; Mon, 29 Aug 2022 14:02:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=XiK03JIa; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id j9-20020a17090a3e0900b001fd9568b117so6207333pjc.3 for ; Mon, 29 Aug 2022 14:02:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=LiQfhe4eONNEXc1pnEL8NMkcEErXa90ULk7OXvaTzWo=; b=XiK03JIa92LG0+RBkDYS5Vywz0oyJ1hcAQ6pyDDJzYCcgcSSqn0pF5PHaJf3baGVLI 2RxL8v6dbld5wFecI0P9D9sg20l1rgs+R8HWw/Oz/i32KwuV7hN/8Gc0Zmqx3khrcZ1L Pg+R0bZJ4hSWBxvq9MEiqv3p41oLIoznCkJMXEjXbqFsw+uUClbYQLqd36+qSC8E07T5 viRX57nAKaaSWgkn0edNFVnS21n84KLSqt/ovAqQeovaIE8KpmeGaIqFWiP08dfmmjTa B+wktP3fYvK6X8j8vBPvXiERYymMSPS7BkPoUVNFuz9O2o1GGpHz2h3gamwHpAMuwVrK V7Ug== 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:to:from:x-gm-message-state:from:to:cc; bh=LiQfhe4eONNEXc1pnEL8NMkcEErXa90ULk7OXvaTzWo=; b=ay8Fu9SQueEMvJCcawZ2esWEstlzWIftQtCOqUez7igTkNyuJhV8eMs96G581f6G4t 7zTy/+fmF3cREYKozWX2YGFGNXT2D9WyxaoT6Ip0zZaK18ZFFB2F5nlCBbuaZaiH2WFl FvyEHPrpsGKU41DFB56eNnnfByM6Se5Pc2jAzK5wLHNwInUt7eZlXfPtfVlgO/AeXbDK 39o461mjddrjFzntpQcd/GDbk/47wT2nLbSojZmEMO/a39JQ7XQJUUgIzJndamj2N3DA ijwYkX+DCUmzm2sM7MgtnrhcqiK0wLQQoKhOJXh62F1L+pzE7Yw1GuytAgDad+Ib2l22 A9UA== X-Gm-Message-State: ACgBeo0y1cC71rEwHR2AhpQ79NB3lhDn/ekjGM+QQDKj/Elghsdr2Noi PpVJrOG+DtR6rpo8qDXrUVcdV6SdRZZ21zAq X-Google-Smtp-Source: AA6agR4MdiGh6LNVMLDM5QwYUAAoKMWg5ar7EgFBtq3eTypwS8blGJ1eS7SQIf/GzCz1P4ZVO8zubg== X-Received: by 2002:a17:902:eccd:b0:172:cff9:5796 with SMTP id a13-20020a170902eccd00b00172cff95796mr17636231plh.151.1661806969905; Mon, 29 Aug 2022 14:02:49 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm8058957plh.61.2022.08.29.14.02.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 14:02:49 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 02/14] golang: fix CVE-2022-30629 and CVE-2022-30631 Date: Mon, 29 Aug 2022 11:02:21 -1000 Message-Id: <6813a265c7c21e24636d07a6a8df16ef0cf7da50.1661806803.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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, 29 Aug 2022 21:02:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170027 From: Hitendra Prajapati Source: https://github.com/golang/go MR: 120613, 120613 Type: Security Fix Disposition: Backport from https://github.com/golang/go/commit/c15a8e2dbb5ac376a6ed890735341b812d6b965c && https://github.com/golang/go/commit/0117dee7dccbbd7803d88f65a2ce8bd686219ad3 ChangeID: 366db775dec045d7b312b8da0436af36ab322046 Description: Fixed CVE: 1. CVE-2022-30629 2. CVE-2022-30631 Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/go-1.14.inc | 2 + .../go/go-1.14/CVE-2022-30629.patch | 47 +++++++ .../go/go-1.14/CVE-2022-30631.patch | 116 ++++++++++++++++++ 3 files changed, 165 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2022-30629.patch create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2022-30631.patch diff --git a/meta/recipes-devtools/go/go-1.14.inc b/meta/recipes-devtools/go/go-1.14.inc index b160222f76..6089fd501d 100644 --- a/meta/recipes-devtools/go/go-1.14.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -25,6 +25,8 @@ SRC_URI += "\ file://CVE-2021-44717.patch \ file://CVE-2022-24675.patch \ file://CVE-2021-31525.patch \ + file://CVE-2022-30629.patch \ + file://CVE-2022-30631.patch \ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" diff --git a/meta/recipes-devtools/go/go-1.14/CVE-2022-30629.patch b/meta/recipes-devtools/go/go-1.14/CVE-2022-30629.patch new file mode 100644 index 0000000000..47313a547f --- /dev/null +++ b/meta/recipes-devtools/go/go-1.14/CVE-2022-30629.patch @@ -0,0 +1,47 @@ +From 8d0bbb5a6280c2cf951241ec7f6579c90d38df57 Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Thu, 25 Aug 2022 10:55:08 +0530 +Subject: [PATCH] CVE-2022-30629 + +Upstream-Status: Backport [https://github.com/golang/go/commit/c15a8e2dbb5ac376a6ed890735341b812d6b965c] +CVE: CVE-2022-30629 +Signed-off-by: Hitendra Prajapati +--- + src/crypto/tls/handshake_server_tls13.go | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/crypto/tls/handshake_server_tls13.go b/src/crypto/tls/handshake_server_tls13.go +index 5432145..d91797e 100644 +--- a/src/crypto/tls/handshake_server_tls13.go ++++ b/src/crypto/tls/handshake_server_tls13.go +@@ -9,6 +9,7 @@ import ( + "crypto" + "crypto/hmac" + "crypto/rsa" ++ "encoding/binary" + "errors" + "hash" + "io" +@@ -742,6 +743,19 @@ func (hs *serverHandshakeStateTLS13) sendSessionTickets() error { + } + m.lifetime = uint32(maxSessionTicketLifetime / time.Second) + ++ // ticket_age_add is a random 32-bit value. See RFC 8446, section 4.6.1 ++ // The value is not stored anywhere; we never need to check the ticket age ++ // because 0-RTT is not supported. ++ ageAdd := make([]byte, 4) ++ _, err = hs.c.config.rand().Read(ageAdd) ++ if err != nil { ++ return err ++ } ++ m.ageAdd = binary.LittleEndian.Uint32(ageAdd) ++ ++ // ticket_nonce, which must be unique per connection, is always left at ++ // zero because we only ever send one ticket per connection. ++ + if _, err := c.writeRecord(recordTypeHandshake, m.marshal()); err != nil { + return err + } +-- +2.25.1 + diff --git a/meta/recipes-devtools/go/go-1.14/CVE-2022-30631.patch b/meta/recipes-devtools/go/go-1.14/CVE-2022-30631.patch new file mode 100644 index 0000000000..5dcfd27f16 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.14/CVE-2022-30631.patch @@ -0,0 +1,116 @@ +From d10fc3a84e3344f2421c1dd3046faa50709ab4d5 Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Thu, 25 Aug 2022 11:01:21 +0530 +Subject: [PATCH] CVE-2022-30631 + +Upstream-Status: Backport [https://github.com/golang/go/commit/0117dee7dccbbd7803d88f65a2ce8bd686219ad3] +CVE: CVE-2022-30631 +Signed-off-by: Hitendra Prajapati +--- + src/compress/gzip/gunzip.go | 60 +++++++++++++++----------------- + src/compress/gzip/gunzip_test.go | 16 +++++++++ + 2 files changed, 45 insertions(+), 31 deletions(-) + +diff --git a/src/compress/gzip/gunzip.go b/src/compress/gzip/gunzip.go +index 924bce1..237b2b9 100644 +--- a/src/compress/gzip/gunzip.go ++++ b/src/compress/gzip/gunzip.go +@@ -248,42 +248,40 @@ func (z *Reader) Read(p []byte) (n int, err error) { + return 0, z.err + } + +- n, z.err = z.decompressor.Read(p) +- z.digest = crc32.Update(z.digest, crc32.IEEETable, p[:n]) +- z.size += uint32(n) +- if z.err != io.EOF { +- // In the normal case we return here. +- return n, z.err +- } ++ for n == 0 { ++ n, z.err = z.decompressor.Read(p) ++ z.digest = crc32.Update(z.digest, crc32.IEEETable, p[:n]) ++ z.size += uint32(n) ++ if z.err != io.EOF { ++ // In the normal case we return here. ++ return n, z.err ++ } + +- // Finished file; check checksum and size. +- if _, err := io.ReadFull(z.r, z.buf[:8]); err != nil { +- z.err = noEOF(err) +- return n, z.err +- } +- digest := le.Uint32(z.buf[:4]) +- size := le.Uint32(z.buf[4:8]) +- if digest != z.digest || size != z.size { +- z.err = ErrChecksum +- return n, z.err +- } +- z.digest, z.size = 0, 0 ++ // Finished file; check checksum and size. ++ if _, err := io.ReadFull(z.r, z.buf[:8]); err != nil { ++ z.err = noEOF(err) ++ return n, z.err ++ } ++ digest := le.Uint32(z.buf[:4]) ++ size := le.Uint32(z.buf[4:8]) ++ if digest != z.digest || size != z.size { ++ z.err = ErrChecksum ++ return n, z.err ++ } ++ z.digest, z.size = 0, 0 + +- // File is ok; check if there is another. +- if !z.multistream { +- return n, io.EOF +- } +- z.err = nil // Remove io.EOF ++ // File is ok; check if there is another. ++ if !z.multistream { ++ return n, io.EOF ++ } ++ z.err = nil // Remove io.EOF + +- if _, z.err = z.readHeader(); z.err != nil { +- return n, z.err ++ if _, z.err = z.readHeader(); z.err != nil { ++ return n, z.err ++ } + } + +- // Read from next file, if necessary. +- if n > 0 { +- return n, nil +- } +- return z.Read(p) ++ return n, nil + } + + // Close closes the Reader. It does not close the underlying io.Reader. +diff --git a/src/compress/gzip/gunzip_test.go b/src/compress/gzip/gunzip_test.go +index 1b01404..95220ae 100644 +--- a/src/compress/gzip/gunzip_test.go ++++ b/src/compress/gzip/gunzip_test.go +@@ -516,3 +516,19 @@ func TestTruncatedStreams(t *testing.T) { + } + } + } ++ ++func TestCVE202230631(t *testing.T) { ++ var empty = []byte{0x1f, 0x8b, 0x08, 0x00, 0xa7, 0x8f, 0x43, 0x62, 0x00, ++ 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} ++ r := bytes.NewReader(bytes.Repeat(empty, 4e6)) ++ z, err := NewReader(r) ++ if err != nil { ++ t.Fatalf("NewReader: got %v, want nil", err) ++ } ++ // Prior to CVE-2022-30631 fix, this would cause an unrecoverable panic due ++ // to stack exhaustion. ++ _, err = z.Read(make([]byte, 10)) ++ if err != io.EOF { ++ t.Errorf("Reader.Read: got %v, want %v", err, io.EOF) ++ } ++} +-- +2.25.1 + From patchwork Mon Aug 29 21:02:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12061 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 E76D3C0502C for ; Mon, 29 Aug 2022 21:02:59 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web12.3818.1661806973369862225 for ; Mon, 29 Aug 2022 14:02:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=F3ch0W9+; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id f12so8992118plb.11 for ; Mon, 29 Aug 2022 14:02:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=dGWXT23jyfgQD6RrjVAnn3Zv961MG+lXp+Oe3oDOFZ4=; b=F3ch0W9+1V9VAYDwp+W13TwZP8KYKamQklLpCTMO5gRYL+5Pe8LHsWQyN8lwaUZaGU wXgwgE2i1mId5RNG3MFlOnnp99glM/clCoWYUTR74YVV6UAirEVv79jWOQrCqpQQdUP/ EQr2atQSG3cLnhXvUYuBd/3NfIjhjoXYxnWCMkv4tv9R5UUGKNmhgo60roitcBLiRiS0 HM54an61r5KVcn1UTaq10EE3eLtXy6Mch6pW1lUrYD+RaFsSNneVSLzNFHmCNCL49vr4 L36RmZyalNFVyTyndm1eIlX9YUjIZhK5APUsxfLN3+RdV/8jt2bkT1ej/GkgTuZoSP8R VUvg== 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:to:from:x-gm-message-state:from:to:cc; bh=dGWXT23jyfgQD6RrjVAnn3Zv961MG+lXp+Oe3oDOFZ4=; b=jLlU5YHllS0uin4rL4p57f4xPugtYtA9drroLruPz/4en1axcJYyh3mmCsmf0GxCuo a6f0AbIM7KZpWv0snrW4PGd0U2Dz59dKdKMt+klAf/ov5kIFGqT5adYG1+Jpk7M9isYV /vSgt+H+uvrGhimXqZJpQPy5QnTBgB3Imtc3RzbVuY8OFtGT26vuDnlzCGeU5HVJnqbp gUxZNg+NMhPxDewS8sKnR7Ki/NdoEWUErEC++QdZrf8pFwCVEwkHUkn6EepJBdTcQ5fG BWxzhcIT3a1wdeBlz0aEj3i5iKwlYKDOU1BRyBR51bsfsR5l/yY6z9U2dghdyYLXxp/Z U5qQ== X-Gm-Message-State: ACgBeo10gmG54LeratPkJf3ozhHoCbXNlsPH87jX0GHd/gkosgJpwoh1 CJsAF0TpE7xssy3nVHbwCQjPPPiDW0Y12hLs X-Google-Smtp-Source: AA6agR6/iC29mID3rzLuNrCJBEg8RwDeL2c3WL1R6FWzLXuFdjuSrAZ7BAADO+xXATNhOb9tw1hXyQ== X-Received: by 2002:a17:903:110f:b0:171:3afa:e688 with SMTP id n15-20020a170903110f00b001713afae688mr18156779plh.162.1661806972039; Mon, 29 Aug 2022 14:02:52 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm8058957plh.61.2022.08.29.14.02.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 14:02:51 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 03/14] golang: fix CVE-2022-30632 and CVE-2022-30633 Date: Mon, 29 Aug 2022 11:02:22 -1000 Message-Id: <9ffaae887743d77839fb758657b1dec71a9b8880.1661806803.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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, 29 Aug 2022 21:02:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170028 From: Hitendra Prajapati Source: https://github.com/golang/go MR: 120622, 120625 Type: Security Fix Disposition: Backport from https://github.com/golang/go/commit/76f8b7304d1f7c25834e2a0cc9e88c55276c47df && https://github.com/golang/go/commit/2678d0c957193dceef336c969a9da74dd716a827 ChangeID: aabb29a6dd6a89842f451c95af228aaf66e58bb5 Description: Fixed CVE: 1. CVE-2022-30632 2. CVE-2022-30633 Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/go-1.14.inc | 2 + .../go/go-1.14/CVE-2022-30632.patch | 71 ++++++++++ .../go/go-1.14/CVE-2022-30633.patch | 131 ++++++++++++++++++ 3 files changed, 204 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2022-30632.patch create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2022-30633.patch diff --git a/meta/recipes-devtools/go/go-1.14.inc b/meta/recipes-devtools/go/go-1.14.inc index 6089fd501d..84babc38cb 100644 --- a/meta/recipes-devtools/go/go-1.14.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -27,6 +27,8 @@ SRC_URI += "\ file://CVE-2021-31525.patch \ file://CVE-2022-30629.patch \ file://CVE-2022-30631.patch \ + file://CVE-2022-30632.patch \ + file://CVE-2022-30633.patch \ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" diff --git a/meta/recipes-devtools/go/go-1.14/CVE-2022-30632.patch b/meta/recipes-devtools/go/go-1.14/CVE-2022-30632.patch new file mode 100644 index 0000000000..c54ef56a0e --- /dev/null +++ b/meta/recipes-devtools/go/go-1.14/CVE-2022-30632.patch @@ -0,0 +1,71 @@ +From 35d1dfe9746029aea9027b405c75555d41ffd2f8 Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Thu, 25 Aug 2022 13:12:40 +0530 +Subject: [PATCH] CVE-2022-30632 + +Upstream-Status: Backport [https://github.com/golang/go/commit/76f8b7304d1f7c25834e2a0cc9e88c55276c47df] +CVE: CVE-2022-30632 +Signed-off-by: Hitendra Prajapati +--- + src/path/filepath/match.go | 16 +++++++++++++++- + src/path/filepath/match_test.go | 10 ++++++++++ + 2 files changed, 25 insertions(+), 1 deletion(-) + +diff --git a/src/path/filepath/match.go b/src/path/filepath/match.go +index 46badb5..ba68daa 100644 +--- a/src/path/filepath/match.go ++++ b/src/path/filepath/match.go +@@ -232,6 +232,20 @@ func getEsc(chunk string) (r rune, nchunk string, err error) { + // The only possible returned error is ErrBadPattern, when pattern + // is malformed. + func Glob(pattern string) (matches []string, err error) { ++ return globWithLimit(pattern, 0) ++} ++ ++func globWithLimit(pattern string, depth int) (matches []string, err error) { ++ // This limit is used prevent stack exhaustion issues. See CVE-2022-30632. ++ const pathSeparatorsLimit = 10000 ++ if depth == pathSeparatorsLimit { ++ return nil, ErrBadPattern ++ } ++ ++ // Check pattern is well-formed. ++ if _, err := Match(pattern, ""); err != nil { ++ return nil, err ++ } + if !hasMeta(pattern) { + if _, err = os.Lstat(pattern); err != nil { + return nil, nil +@@ -257,7 +271,7 @@ func Glob(pattern string) (matches []string, err error) { + } + + var m []string +- m, err = Glob(dir) ++ m, err = globWithLimit(dir, depth+1) + if err != nil { + return + } +diff --git a/src/path/filepath/match_test.go b/src/path/filepath/match_test.go +index b865762..c37c812 100644 +--- a/src/path/filepath/match_test.go ++++ b/src/path/filepath/match_test.go +@@ -154,6 +154,16 @@ func TestGlob(t *testing.T) { + } + } + ++func TestCVE202230632(t *testing.T) { ++ // Prior to CVE-2022-30632, this would cause a stack exhaustion given a ++ // large number of separators (more than 4,000,000). There is now a limit ++ // of 10,000. ++ _, err := Glob("/*" + strings.Repeat("/", 10001)) ++ if err != ErrBadPattern { ++ t.Fatalf("Glob returned err=%v, want ErrBadPattern", err) ++ } ++} ++ + func TestGlobError(t *testing.T) { + _, err := Glob("[]") + if err == nil { +-- +2.25.1 + diff --git a/meta/recipes-devtools/go/go-1.14/CVE-2022-30633.patch b/meta/recipes-devtools/go/go-1.14/CVE-2022-30633.patch new file mode 100644 index 0000000000..c16cb5f50c --- /dev/null +++ b/meta/recipes-devtools/go/go-1.14/CVE-2022-30633.patch @@ -0,0 +1,131 @@ +From ab6e2ffdcab0501bcc2de4b196c1c18ae2301d4b Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Thu, 25 Aug 2022 13:29:55 +0530 +Subject: [PATCH] CVE-2022-30633 + +Upstream-Status: Backport [https://github.com/golang/go/commit/2678d0c957193dceef336c969a9da74dd716a827] +CVE: CVE-2022-30633 +Signed-off-by: Hitendra Prajapati +--- + src/encoding/xml/read.go | 27 +++++++++++++++++++-------- + src/encoding/xml/read_test.go | 14 ++++++++++++++ + 2 files changed, 33 insertions(+), 8 deletions(-) + +diff --git a/src/encoding/xml/read.go b/src/encoding/xml/read.go +index 10a60ee..4ffed80 100644 +--- a/src/encoding/xml/read.go ++++ b/src/encoding/xml/read.go +@@ -148,7 +148,7 @@ func (d *Decoder) DecodeElement(v interface{}, start *StartElement) error { + if val.Kind() != reflect.Ptr { + return errors.New("non-pointer passed to Unmarshal") + } +- return d.unmarshal(val.Elem(), start) ++ return d.unmarshal(val.Elem(), start, 0) + } + + // An UnmarshalError represents an error in the unmarshaling process. +@@ -304,8 +304,15 @@ var ( + textUnmarshalerType = reflect.TypeOf((*encoding.TextUnmarshaler)(nil)).Elem() + ) + ++const maxUnmarshalDepth = 10000 ++ ++var errExeceededMaxUnmarshalDepth = errors.New("exceeded max depth") ++ + // Unmarshal a single XML element into val. +-func (d *Decoder) unmarshal(val reflect.Value, start *StartElement) error { ++func (d *Decoder) unmarshal(val reflect.Value, start *StartElement, depth int) error { ++ if depth >= maxUnmarshalDepth { ++ return errExeceededMaxUnmarshalDepth ++ } + // Find start element if we need it. + if start == nil { + for { +@@ -398,7 +405,7 @@ func (d *Decoder) unmarshal(val reflect.Value, start *StartElement) error { + v.Set(reflect.Append(val, reflect.Zero(v.Type().Elem()))) + + // Recur to read element into slice. +- if err := d.unmarshal(v.Index(n), start); err != nil { ++ if err := d.unmarshal(v.Index(n), start, depth+1); err != nil { + v.SetLen(n) + return err + } +@@ -521,13 +528,15 @@ Loop: + case StartElement: + consumed := false + if sv.IsValid() { +- consumed, err = d.unmarshalPath(tinfo, sv, nil, &t) ++ // unmarshalPath can call unmarshal, so we need to pass the depth through so that ++ // we can continue to enforce the maximum recusion limit. ++ consumed, err = d.unmarshalPath(tinfo, sv, nil, &t, depth) + if err != nil { + return err + } + if !consumed && saveAny.IsValid() { + consumed = true +- if err := d.unmarshal(saveAny, &t); err != nil { ++ if err := d.unmarshal(saveAny, &t, depth+1); err != nil { + return err + } + } +@@ -672,7 +681,7 @@ func copyValue(dst reflect.Value, src []byte) (err error) { + // The consumed result tells whether XML elements have been consumed + // from the Decoder until start's matching end element, or if it's + // still untouched because start is uninteresting for sv's fields. +-func (d *Decoder) unmarshalPath(tinfo *typeInfo, sv reflect.Value, parents []string, start *StartElement) (consumed bool, err error) { ++func (d *Decoder) unmarshalPath(tinfo *typeInfo, sv reflect.Value, parents []string, start *StartElement, depth int) (consumed bool, err error) { + recurse := false + Loop: + for i := range tinfo.fields { +@@ -687,7 +696,7 @@ Loop: + } + if len(finfo.parents) == len(parents) && finfo.name == start.Name.Local { + // It's a perfect match, unmarshal the field. +- return true, d.unmarshal(finfo.value(sv), start) ++ return true, d.unmarshal(finfo.value(sv), start, depth+1) + } + if len(finfo.parents) > len(parents) && finfo.parents[len(parents)] == start.Name.Local { + // It's a prefix for the field. Break and recurse +@@ -716,7 +725,9 @@ Loop: + } + switch t := tok.(type) { + case StartElement: +- consumed2, err := d.unmarshalPath(tinfo, sv, parents, &t) ++ // the recursion depth of unmarshalPath is limited to the path length specified ++ // by the struct field tag, so we don't increment the depth here. ++ consumed2, err := d.unmarshalPath(tinfo, sv, parents, &t, depth) + if err != nil { + return true, err + } +diff --git a/src/encoding/xml/read_test.go b/src/encoding/xml/read_test.go +index 8c2e70f..6a20b1a 100644 +--- a/src/encoding/xml/read_test.go ++++ b/src/encoding/xml/read_test.go +@@ -5,6 +5,7 @@ + package xml + + import ( ++ "errors" + "io" + "reflect" + "strings" +@@ -1079,3 +1080,16 @@ func TestUnmarshalWhitespaceAttrs(t *testing.T) { + t.Fatalf("whitespace attrs: Unmarshal:\nhave: %#+v\nwant: %#+v", v, want) + } + } ++ ++func TestCVE202228131(t *testing.T) { ++ type nested struct { ++ Parent *nested `xml:",any"` ++ } ++ var n nested ++ err := Unmarshal(bytes.Repeat([]byte(""), maxUnmarshalDepth+1), &n) ++ if err == nil { ++ t.Fatal("Unmarshal did not fail") ++ } else if !errors.Is(err, errExeceededMaxUnmarshalDepth) { ++ t.Fatalf("Unmarshal unexpected error: got %q, want %q", err, errExeceededMaxUnmarshalDepth) ++ } ++} +-- +2.25.1 + From patchwork Mon Aug 29 21:02:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12063 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 E2AD6ECAAD2 for ; Mon, 29 Aug 2022 21:02:59 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web08.3687.1661806975431584256 for ; Mon, 29 Aug 2022 14:02:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=kg+kUp7Z; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 202so8798595pgc.8 for ; Mon, 29 Aug 2022 14:02:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=2D5pxGJ5YKNG5xHL2Dey6Z0CpS71HKP3tWcZm35uC74=; b=kg+kUp7ZvO3UWB01dPhLhxstgoi1VTs7VpvYBSwV8IEDcUkJIM6jtZQSiyb9rIOzjv 4huZtuCbI3TH6/nw5kMZRrnz6VVb5Vn5cWN5ACQ1aum7G8EBxO9NRbZgdlfasNIUoO87 ypd0fXFOsf061RSoHTaJR96LzdVFqsSY6T07AcA08SgO3uhcIytrCRxUetUDvtoCB8sB gbYU0S+x4AUCRAWPhhoLblWNmyxQZ/x0cLccJm8pVTWUGEpU2X051xrHjUd0tsYdiCKf 8BbLifUTdhy8rpaTG3QNk5AaPRIn4yJQcO3EO3DWVvaneAtI+Q+z4kxAmf4Ksa+PNXyy LKvg== 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:to:from:x-gm-message-state:from:to:cc; bh=2D5pxGJ5YKNG5xHL2Dey6Z0CpS71HKP3tWcZm35uC74=; b=P755OKcx+MSk7s2v9r6AbSyYsJBImHf5ikuEYCdjDc307ly2hr2zMa87U/o5GUUQJ0 yRE9oGvAGZV/CG1dctK+eKhx6NwWZtT+S/gOTzrPJ3xFOlfwUMm9MJnEKZOJX/pcJ2p2 ew5xVyTkiaFemeKyfEI2zsiVRRV3lWf6AntfPCeXZ7ANxMV5HaQGOCcaZQKA56RJYMUA aQZ6ieEHUf+Zv1TXN/CLypNZG7HTTHXX2lAuMOycbAOK1Ns3cr7FYk0rZOkfBMQJp1b5 gjX7I+43DbM6ra8Z7r7eq4bpcFiSC9+XGFzkyNI5czpvzgg3mFTu3zZqHYd0KLdOtevV s/Zg== X-Gm-Message-State: ACgBeo2JGF2ax0WjVHvjoJj0KFd7P+No+TvS+33UuRmKdxYhhpJafOin GPYkzLpyOfLnBgscYWH2y3l0aQ7ElqOO7jrf X-Google-Smtp-Source: AA6agR6EO/MD9Mfhbor6xt+jeDVsjpOSH1gaT4IrXHpVm1HJ8ta5FwS2fSYuix/iPi+PpY13l40PLg== X-Received: by 2002:a62:b519:0:b0:537:9723:5cf2 with SMTP id y25-20020a62b519000000b0053797235cf2mr18356098pfe.15.1661806974031; Mon, 29 Aug 2022 14:02:54 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm8058957plh.61.2022.08.29.14.02.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 14:02:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 04/14] golang: fix CVE-2022-30635 and CVE-2022-32148 Date: Mon, 29 Aug 2022 11:02:23 -1000 Message-Id: <2c4fb77f417464d9cd40f0ebd8cc52e6e6ca689e.1661806803.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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, 29 Aug 2022 21:02:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170029 From: Hitendra Prajapati Source: https://github.com/golang/go MR: 120628, 120631 Type: Security Fix Disposition: Backport from https://github.com/golang/go/commit/ed2f33e1a7e0d18f61bd56f7ee067331d612c27e && https://github.com/golang/go/commit/ed2f33e1a7e0d18f61bd56f7ee067331d612c27e ChangeID: fbd8d61bdc2e9cb0cdbe9879e02aed218ee93dbe Description: Fixed CVE: 1. CVE-2022-30635 2. CVE-2022-32148 Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/go-1.14.inc | 2 + .../go/go-1.14/CVE-2022-30635.patch | 120 ++++++++++++++++++ .../go/go-1.14/CVE-2022-32148.patch | 49 +++++++ 3 files changed, 171 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2022-30635.patch create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2022-32148.patch diff --git a/meta/recipes-devtools/go/go-1.14.inc b/meta/recipes-devtools/go/go-1.14.inc index 84babc38cb..7c32246012 100644 --- a/meta/recipes-devtools/go/go-1.14.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -29,6 +29,8 @@ SRC_URI += "\ file://CVE-2022-30631.patch \ file://CVE-2022-30632.patch \ file://CVE-2022-30633.patch \ + file://CVE-2022-30635.patch \ + file://CVE-2022-32148.patch \ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" diff --git a/meta/recipes-devtools/go/go-1.14/CVE-2022-30635.patch b/meta/recipes-devtools/go/go-1.14/CVE-2022-30635.patch new file mode 100644 index 0000000000..73959f70fa --- /dev/null +++ b/meta/recipes-devtools/go/go-1.14/CVE-2022-30635.patch @@ -0,0 +1,120 @@ +From fdd4316737ed5681689a1f40802ffa0805e5b11c Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Fri, 26 Aug 2022 12:17:05 +0530 +Subject: [PATCH] CVE-2022-30635 + +Upstream-Status: Backport [https://github.com/golang/go/commit/cd54600b866db0ad068ab8df06c7f5f6cb55c9b3] +CVE-2022-30635 +Signed-off-by: Hitendra Prajapati +--- + src/encoding/gob/decode.go | 19 ++++++++++++------- + src/encoding/gob/gobencdec_test.go | 24 ++++++++++++++++++++++++ + 2 files changed, 36 insertions(+), 7 deletions(-) + +diff --git a/src/encoding/gob/decode.go b/src/encoding/gob/decode.go +index d2f6c74..0e0ec75 100644 +--- a/src/encoding/gob/decode.go ++++ b/src/encoding/gob/decode.go +@@ -871,8 +871,13 @@ func (dec *Decoder) decOpFor(wireId typeId, rt reflect.Type, name string, inProg + return &op + } + ++var maxIgnoreNestingDepth = 10000 ++ + // decIgnoreOpFor returns the decoding op for a field that has no destination. +-func (dec *Decoder) decIgnoreOpFor(wireId typeId, inProgress map[typeId]*decOp) *decOp { ++func (dec *Decoder) decIgnoreOpFor(wireId typeId, inProgress map[typeId]*decOp, depth int) *decOp { ++ if depth > maxIgnoreNestingDepth { ++ error_(errors.New("invalid nesting depth")) ++ } + // If this type is already in progress, it's a recursive type (e.g. map[string]*T). + // Return the pointer to the op we're already building. + if opPtr := inProgress[wireId]; opPtr != nil { +@@ -896,7 +901,7 @@ func (dec *Decoder) decIgnoreOpFor(wireId typeId, inProgress map[typeId]*decOp) + errorf("bad data: undefined type %s", wireId.string()) + case wire.ArrayT != nil: + elemId := wire.ArrayT.Elem +- elemOp := dec.decIgnoreOpFor(elemId, inProgress) ++ elemOp := dec.decIgnoreOpFor(elemId, inProgress, depth+1) + op = func(i *decInstr, state *decoderState, value reflect.Value) { + state.dec.ignoreArray(state, *elemOp, wire.ArrayT.Len) + } +@@ -904,15 +909,15 @@ func (dec *Decoder) decIgnoreOpFor(wireId typeId, inProgress map[typeId]*decOp) + case wire.MapT != nil: + keyId := dec.wireType[wireId].MapT.Key + elemId := dec.wireType[wireId].MapT.Elem +- keyOp := dec.decIgnoreOpFor(keyId, inProgress) +- elemOp := dec.decIgnoreOpFor(elemId, inProgress) ++ keyOp := dec.decIgnoreOpFor(keyId, inProgress, depth+1) ++ elemOp := dec.decIgnoreOpFor(elemId, inProgress, depth+1) + op = func(i *decInstr, state *decoderState, value reflect.Value) { + state.dec.ignoreMap(state, *keyOp, *elemOp) + } + + case wire.SliceT != nil: + elemId := wire.SliceT.Elem +- elemOp := dec.decIgnoreOpFor(elemId, inProgress) ++ elemOp := dec.decIgnoreOpFor(elemId, inProgress, depth+1) + op = func(i *decInstr, state *decoderState, value reflect.Value) { + state.dec.ignoreSlice(state, *elemOp) + } +@@ -1073,7 +1078,7 @@ func (dec *Decoder) compileSingle(remoteId typeId, ut *userTypeInfo) (engine *de + func (dec *Decoder) compileIgnoreSingle(remoteId typeId) *decEngine { + engine := new(decEngine) + engine.instr = make([]decInstr, 1) // one item +- op := dec.decIgnoreOpFor(remoteId, make(map[typeId]*decOp)) ++ op := dec.decIgnoreOpFor(remoteId, make(map[typeId]*decOp), 0) + ovfl := overflow(dec.typeString(remoteId)) + engine.instr[0] = decInstr{*op, 0, nil, ovfl} + engine.numInstr = 1 +@@ -1118,7 +1123,7 @@ func (dec *Decoder) compileDec(remoteId typeId, ut *userTypeInfo) (engine *decEn + localField, present := srt.FieldByName(wireField.Name) + // TODO(r): anonymous names + if !present || !isExported(wireField.Name) { +- op := dec.decIgnoreOpFor(wireField.Id, make(map[typeId]*decOp)) ++ op := dec.decIgnoreOpFor(wireField.Id, make(map[typeId]*decOp), 0) + engine.instr[fieldnum] = decInstr{*op, fieldnum, nil, ovfl} + continue + } +diff --git a/src/encoding/gob/gobencdec_test.go b/src/encoding/gob/gobencdec_test.go +index 6d2c8db..1b52ecc 100644 +--- a/src/encoding/gob/gobencdec_test.go ++++ b/src/encoding/gob/gobencdec_test.go +@@ -12,6 +12,7 @@ import ( + "fmt" + "io" + "net" ++ "reflect" + "strings" + "testing" + "time" +@@ -796,3 +797,26 @@ func TestNetIP(t *testing.T) { + t.Errorf("decoded to %v, want 1.2.3.4", ip.String()) + } + } ++ ++func TestIngoreDepthLimit(t *testing.T) { ++ // We don't test the actual depth limit because it requires building an ++ // extremely large message, which takes quite a while. ++ oldNestingDepth := maxIgnoreNestingDepth ++ maxIgnoreNestingDepth = 100 ++ defer func() { maxIgnoreNestingDepth = oldNestingDepth }() ++ b := new(bytes.Buffer) ++ enc := NewEncoder(b) ++ typ := reflect.TypeOf(int(0)) ++ nested := reflect.ArrayOf(1, typ) ++ for i := 0; i < 100; i++ { ++ nested = reflect.ArrayOf(1, nested) ++ } ++ badStruct := reflect.New(reflect.StructOf([]reflect.StructField{{Name: "F", Type: nested}})) ++ enc.Encode(badStruct.Interface()) ++ dec := NewDecoder(b) ++ var output struct{ Hello int } ++ expectedErr := "invalid nesting depth" ++ if err := dec.Decode(&output); err == nil || err.Error() != expectedErr { ++ t.Errorf("Decode didn't fail with depth limit of 100: want %q, got %q", expectedErr, err) ++ } ++} +-- +2.25.1 + diff --git a/meta/recipes-devtools/go/go-1.14/CVE-2022-32148.patch b/meta/recipes-devtools/go/go-1.14/CVE-2022-32148.patch new file mode 100644 index 0000000000..aab98e99fd --- /dev/null +++ b/meta/recipes-devtools/go/go-1.14/CVE-2022-32148.patch @@ -0,0 +1,49 @@ +From 0fe3adec199e8cd2c101933f75d8cd617de70350 Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Fri, 26 Aug 2022 12:48:13 +0530 +Subject: [PATCH] CVE-2022-32148 + +Upstream-Status: Backport [https://github.com/golang/go/commit/ed2f33e1a7e0d18f61bd56f7ee067331d612c27e] +CVE: CVE-2022-32148 +Signed-off-by: Hitendra Prajapati +--- + src/net/http/header.go | 6 ++++++ + src/net/http/header_test.go | 5 +++++ + 2 files changed, 11 insertions(+) + +diff --git a/src/net/http/header.go b/src/net/http/header.go +index b9b5391..221f613 100644 +--- a/src/net/http/header.go ++++ b/src/net/http/header.go +@@ -100,6 +100,12 @@ func (h Header) Clone() Header { + sv := make([]string, nv) // shared backing array for headers' values + h2 := make(Header, len(h)) + for k, vv := range h { ++ if vv == nil { ++ // Preserve nil values. ReverseProxy distinguishes ++ // between nil and zero-length header values. ++ h2[k] = nil ++ continue ++ } + n := copy(sv, vv) + h2[k] = sv[:n:n] + sv = sv[n:] +diff --git a/src/net/http/header_test.go b/src/net/http/header_test.go +index 4789362..80c0035 100644 +--- a/src/net/http/header_test.go ++++ b/src/net/http/header_test.go +@@ -235,6 +235,11 @@ func TestCloneOrMakeHeader(t *testing.T) { + in: Header{"foo": {"bar"}}, + want: Header{"foo": {"bar"}}, + }, ++ { ++ name: "nil value", ++ in: Header{"foo": nil}, ++ want: Header{"foo": nil}, ++ }, + } + + for _, tt := range tests { +-- +2.25.1 + From patchwork Mon Aug 29 21:02:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12058 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 D6A7EECAAD4 for ; Mon, 29 Aug 2022 21:02:59 +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.3640.1661806977345980966 for ; Mon, 29 Aug 2022 14:02:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=t6VoSS+a; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id x23so9162550pll.7 for ; Mon, 29 Aug 2022 14:02:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=2xQyMOC62YHwAxLUpdKa9hdFyY7KkEEMTJf4uTleCO4=; b=t6VoSS+atJwSW2w8E5n4ni6ayWhMuF5Yf7UQO7PtOwmoY7xyLIrTWk51xkyS7MVYfn aeANFiFLd/ztOrofHJQFX1cl6k/8+9/iDjwoDMyJiAd19gDyWSWgDqya7vClvh7TIlHi 3vNI90rGZ3qRwrgZQjMdkr1Ck13xBvBaIPlL3MN1CSgb6JJQIoOypcGjwMqlsoh3u9NA axWJ4twov3L8fq6t1USFB/cO95W0uV3VW/yJX7n/O0jOz5Un5ywpMUelSo5kKgejecDQ NlQke4i4ar7JPIkcQa6/HgVMr3sPEHfwByCzitkjHRiQpb/Ag8NpybxHl/w7qUaHGkQz 9uwA== 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:to:from:x-gm-message-state:from:to:cc; bh=2xQyMOC62YHwAxLUpdKa9hdFyY7KkEEMTJf4uTleCO4=; b=BgTVOUnbzrEjToAfH/dkCfRsAhs+t/1pLmFkde5XBdmvX6IOzlcBEbwjTfgwCW22Jq /N7Ztxz4AyFB4N0QwCt7KD/OcgKQsH+gY6eeT0hlb4GK21Z7ipqhtL5OYoiI6IYRprL7 83UizvOK7vKTIK36pA7cWeyBhka5rVr7NcDUoBODUGUCiAp8JH0d8Jz8MW4+H3vLAvOI ooIBuPnbsqyDaaLzfOkx5Wcjm7oymt3NV1esq4fqxmQVfTMUUQjpQYb471zqhfn/+v/k bc/aI4NcJaBWVieTlsqVnXo8Ex8fYoGATOziIO3TX08eKDr5MYv3ivr6CLzjU1dGGoLW iu1Q== X-Gm-Message-State: ACgBeo0LmnYlfdVoaim6uTsW9L6hNLIt9o0pYLOP0PvHoaUfzNDK06UV scyCwlZf7YHTX7avXpVCUoZ75OCr8dRVkwdd X-Google-Smtp-Source: AA6agR7Z2yObcWdP/6baEBjTr9dSh3uVUbDN0FmLtBcJX22AoP1jbAE1fuQnBRyYll/ao0rYwLdnmA== X-Received: by 2002:a17:90b:3e8d:b0:1fa:facf:672f with SMTP id rj13-20020a17090b3e8d00b001fafacf672fmr20636812pjb.0.1661806976025; Mon, 29 Aug 2022 14:02:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm8058957plh.61.2022.08.29.14.02.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 14:02:55 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 05/14] golang: CVE-2022-32189 a denial of service Date: Mon, 29 Aug 2022 11:02:24 -1000 Message-Id: <9b3420c9a91059eb55754078bb1e733972e94489.1661806803.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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, 29 Aug 2022 21:02:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170030 From: Hitendra Prajapati Source: https://github.com/golang/go MR: 120634 Type: Security Fix Disposition: Backport from https://github.com/golang/go/commit/703c8ab7e5ba75c95553d4e249309297abad7102 ChangeID: 3ade323dd52a6b654358f6738a0b3411ccc6d3f8 Description: CVE-2022-32189 golang: math/big: decoding big.Float and big.Rat types can panic if the encoded message is too short, potentially allowing a denial of service. Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/go-1.14.inc | 1 + .../go/go-1.14/CVE-2022-32189.patch | 113 ++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2022-32189.patch diff --git a/meta/recipes-devtools/go/go-1.14.inc b/meta/recipes-devtools/go/go-1.14.inc index 7c32246012..1458a11b3f 100644 --- a/meta/recipes-devtools/go/go-1.14.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -31,6 +31,7 @@ SRC_URI += "\ file://CVE-2022-30633.patch \ file://CVE-2022-30635.patch \ file://CVE-2022-32148.patch \ + file://CVE-2022-32189.patch \ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" diff --git a/meta/recipes-devtools/go/go-1.14/CVE-2022-32189.patch b/meta/recipes-devtools/go/go-1.14/CVE-2022-32189.patch new file mode 100644 index 0000000000..15fda7de1b --- /dev/null +++ b/meta/recipes-devtools/go/go-1.14/CVE-2022-32189.patch @@ -0,0 +1,113 @@ +From 027e7e1578d3d7614f7586eff3894b83d9709e14 Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Mon, 29 Aug 2022 10:08:34 +0530 +Subject: [PATCH] CVE-2022-32189 + +Upstream-Status: Backport [https://github.com/golang/go/commit/703c8ab7e5ba75c95553d4e249309297abad7102] +CVE: CVE-2022-32189 +Signed-off-by: Hitendra Prajapati +--- + src/math/big/floatmarsh.go | 7 +++++++ + src/math/big/floatmarsh_test.go | 12 ++++++++++++ + src/math/big/ratmarsh.go | 6 ++++++ + src/math/big/ratmarsh_test.go | 12 ++++++++++++ + 4 files changed, 37 insertions(+) + +diff --git a/src/math/big/floatmarsh.go b/src/math/big/floatmarsh.go +index d1c1dab..990e085 100644 +--- a/src/math/big/floatmarsh.go ++++ b/src/math/big/floatmarsh.go +@@ -8,6 +8,7 @@ package big + + import ( + "encoding/binary" ++ "errors" + "fmt" + ) + +@@ -67,6 +68,9 @@ func (z *Float) GobDecode(buf []byte) error { + *z = Float{} + return nil + } ++ if len(buf) < 6 { ++ return errors.New("Float.GobDecode: buffer too small") ++ } + + if buf[0] != floatGobVersion { + return fmt.Errorf("Float.GobDecode: encoding version %d not supported", buf[0]) +@@ -83,6 +87,9 @@ func (z *Float) GobDecode(buf []byte) error { + z.prec = binary.BigEndian.Uint32(buf[2:]) + + if z.form == finite { ++ if len(buf) < 10 { ++ return errors.New("Float.GobDecode: buffer too small for finite form float") ++ } + z.exp = int32(binary.BigEndian.Uint32(buf[6:])) + z.mant = z.mant.setBytes(buf[10:]) + } +diff --git a/src/math/big/floatmarsh_test.go b/src/math/big/floatmarsh_test.go +index c056d78..401f45a 100644 +--- a/src/math/big/floatmarsh_test.go ++++ b/src/math/big/floatmarsh_test.go +@@ -137,3 +137,15 @@ func TestFloatJSONEncoding(t *testing.T) { + } + } + } ++ ++func TestFloatGobDecodeShortBuffer(t *testing.T) { ++ for _, tc := range [][]byte{ ++ []byte{0x1, 0x0, 0x0, 0x0}, ++ []byte{0x1, 0xfa, 0x0, 0x0, 0x0, 0x0}, ++ } { ++ err := NewFloat(0).GobDecode(tc) ++ if err == nil { ++ t.Error("expected GobDecode to return error for malformed input") ++ } ++ } ++} +diff --git a/src/math/big/ratmarsh.go b/src/math/big/ratmarsh.go +index fbc7b60..56102e8 100644 +--- a/src/math/big/ratmarsh.go ++++ b/src/math/big/ratmarsh.go +@@ -45,12 +45,18 @@ func (z *Rat) GobDecode(buf []byte) error { + *z = Rat{} + return nil + } ++ if len(buf) < 5 { ++ return errors.New("Rat.GobDecode: buffer too small") ++ } + b := buf[0] + if b>>1 != ratGobVersion { + return fmt.Errorf("Rat.GobDecode: encoding version %d not supported", b>>1) + } + const j = 1 + 4 + i := j + binary.BigEndian.Uint32(buf[j-4:j]) ++ if len(buf) < int(i) { ++ return errors.New("Rat.GobDecode: buffer too small") ++ } + z.a.neg = b&1 != 0 + z.a.abs = z.a.abs.setBytes(buf[j:i]) + z.b.abs = z.b.abs.setBytes(buf[i:]) +diff --git a/src/math/big/ratmarsh_test.go b/src/math/big/ratmarsh_test.go +index 351d109..55a9878 100644 +--- a/src/math/big/ratmarsh_test.go ++++ b/src/math/big/ratmarsh_test.go +@@ -123,3 +123,15 @@ func TestRatXMLEncoding(t *testing.T) { + } + } + } ++ ++func TestRatGobDecodeShortBuffer(t *testing.T) { ++ for _, tc := range [][]byte{ ++ []byte{0x2}, ++ []byte{0x2, 0x0, 0x0, 0x0, 0xff}, ++ } { ++ err := NewRat(1, 2).GobDecode(tc) ++ if err == nil { ++ t.Error("expected GobDecode to return error for malformed input") ++ } ++ } ++} +-- +2.25.1 + From patchwork Mon Aug 29 21:02:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12060 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 DC17FC3DA6B for ; Mon, 29 Aug 2022 21:02:59 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.3748.1661806965557683592 for ; Mon, 29 Aug 2022 14:02:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=iNY9DSDR; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id h13-20020a17090a648d00b001fdb9003787so4524758pjj.4 for ; Mon, 29 Aug 2022 14:02:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=Ep+TEapeDFJ/YBbE28Sd207Br14sdESiRfYJTN6C7NM=; b=iNY9DSDRHFqv48ytS2XAVINAHhytZ8veR+JBr0JDPBA3/sYrUmws/ZUSHJ88PJsN2A J14AKJyLG38LOOdSdP8qBGYrGA5CXaH53sUcfgXHcgQM5DfH2WYzN8gF09axwvFXBFB+ m9FfRf/bcwEyUmtQk5FNHOp8WPuTGZGkL31Cd/Rw5SkGj+yHLZjllUSDv8a1PiHNsucH pz5eG2dx2B5+15DEeZyU0/ml+ezXsYVXhZUB++S1thMTaXmFF6HCff94rjw2wO6VU761 EmZiuebwSaDlgSKkTuHu0AhLlsil0oQUYNNMQIeb6h3VCmpy/Gptdqb22wtPyTyjCaXg yslw== 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:to:from:x-gm-message-state:from:to:cc; bh=Ep+TEapeDFJ/YBbE28Sd207Br14sdESiRfYJTN6C7NM=; b=FWINl1I6DMdZInibqhVjOw5m3XPGnQgz/PAr8wDHrC5Xcff+67MpHHdSmHhUzmRzxc TeAD2YS9F+MRi+XiS1fmzlea9XYsNbGfD9GazqLtOUKeuIb8Ox1xOTPZtyEIcIjwf2uF WjcX21D0WxNPoIEsi1l3FC2LHNdBo3F+MV94VyO7FmUn6U/mOpPdmztv72jGPes2eEKM KFtQz1VZPShmrt7EwlNnFHG1xpF7lqh1Oeek4SugFza506J825G9ox9OBshWoYs2wq3t 9zgaTWtJaG4yT8Xr/taPEnnQY7q2mP6nHfc2ghd1dlmM37L/61wecXHgy78CyvEk9NbI DRcA== X-Gm-Message-State: ACgBeo0TpjFnBhvGZK3UTMHcEyc79JxfnJI0hVw4YSmhMIM6SH9A0JbR uTbw8XXayYVB4mYZ7aXUAJya1Vrzei+Tpr2R X-Google-Smtp-Source: AA6agR5ECELbEya0RVSsmas+mOImmpMJoFRHhdHyKij7flQ/A20tmVd2NOCVrmSdBj2KZ8Jscamuaw== X-Received: by 2002:a17:903:24e:b0:172:6c9d:14e0 with SMTP id j14-20020a170903024e00b001726c9d14e0mr18029531plh.84.1661806978392; Mon, 29 Aug 2022 14:02:58 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm8058957plh.61.2022.08.29.14.02.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 14:02:57 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 06/14] libxml2: Add fix for CVE-2016-3709 Date: Mon, 29 Aug 2022 11:02:25 -1000 Message-Id: X-Mailer: git-send-email 2.25.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, 29 Aug 2022 21:02:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170031 From: Pawan Badganchi Add below patch to fix CVE-2016-3709 CVE-2016-3709.patch Link: https://github.com/GNOME/libxml2/commit/c1ba6f54d32b707ca6d91cb3257ce9de82876b6f Signed-off-by: Pawan Badganchi Signed-off-by: Steve Sakoman --- .../libxml/libxml2/CVE-2016-3709.patch | 89 +++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + 2 files changed, 90 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2016-3709.patch diff --git a/meta/recipes-core/libxml/libxml2/CVE-2016-3709.patch b/meta/recipes-core/libxml/libxml2/CVE-2016-3709.patch new file mode 100644 index 0000000000..5301d05323 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2016-3709.patch @@ -0,0 +1,89 @@ +From c1ba6f54d32b707ca6d91cb3257ce9de82876b6f Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Sat, 15 Aug 2020 18:32:29 +0200 +Subject: [PATCH] Revert "Do not URI escape in server side includes" + +This reverts commit 960f0e275616cadc29671a218d7fb9b69eb35588. + +This commit introduced + +- an infinite loop, found by OSS-Fuzz, which could be easily fixed. +- an algorithm with quadratic runtime +- a security issue, see + https://bugzilla.gnome.org/show_bug.cgi?id=769760 + +A better approach is to add an option not to escape URLs at all +which libxml2 should have possibly done in the first place. + +CVE: CVE-2016-3709 +Upstream-Status: Backport [https://github.com/GNOME/libxml2/commit/c1ba6f54d32b707ca6d91cb3257ce9de82876b6f] +Signed-off-by: Pawan Badganchi +--- + HTMLtree.c | 49 +++++++++++-------------------------------------- + 1 file changed, 11 insertions(+), 38 deletions(-) + +diff --git a/HTMLtree.c b/HTMLtree.c +index 8d236bb35..cdb7f86a6 100644 +--- a/HTMLtree.c ++++ b/HTMLtree.c +@@ -706,49 +706,22 @@ htmlAttrDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlAttrPtr cur, + (!xmlStrcasecmp(cur->name, BAD_CAST "src")) || + ((!xmlStrcasecmp(cur->name, BAD_CAST "name")) && + (!xmlStrcasecmp(cur->parent->name, BAD_CAST "a"))))) { ++ xmlChar *escaped; + xmlChar *tmp = value; +- /* xmlURIEscapeStr() escapes '"' so it can be safely used. */ +- xmlBufCCat(buf->buffer, "\""); + + while (IS_BLANK_CH(*tmp)) tmp++; + +- /* URI Escape everything, except server side includes. */ +- for ( ; ; ) { +- xmlChar *escaped; +- xmlChar endChar; +- xmlChar *end = NULL; +- xmlChar *start = (xmlChar *)xmlStrstr(tmp, BAD_CAST ""); +- if (end != NULL) { +- *start = '\0'; +- } +- } +- +- /* Escape the whole string, or until start (set to '\0'). */ +- escaped = xmlURIEscapeStr(tmp, BAD_CAST"@/:=?;#%&,+"); +- if (escaped != NULL) { +- xmlBufCat(buf->buffer, escaped); +- xmlFree(escaped); +- } else { +- xmlBufCat(buf->buffer, tmp); +- } +- +- if (end == NULL) { /* Everything has been written. */ +- break; +- } +- +- /* Do not escape anything within server side includes. */ +- *start = '<'; /* Restore the first character of "") */ +- endChar = *end; +- *end = '\0'; +- xmlBufCat(buf->buffer, start); +- *end = endChar; +- tmp = end; ++ /* ++ * the < and > have already been escaped at the entity level ++ * And doing so here breaks server side includes ++ */ ++ escaped = xmlURIEscapeStr(tmp, BAD_CAST"@/:=?;#%&,+<>"); ++ if (escaped != NULL) { ++ xmlBufWriteQuotedString(buf->buffer, escaped); ++ xmlFree(escaped); ++ } else { ++ xmlBufWriteQuotedString(buf->buffer, value); + } +- +- xmlBufCCat(buf->buffer, "\""); + } else { + xmlBufWriteQuotedString(buf->buffer, value); + } diff --git a/meta/recipes-core/libxml/libxml2_2.9.10.bb b/meta/recipes-core/libxml/libxml2_2.9.10.bb index d1c1f0884f..dc62991739 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.10.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.10.bb @@ -33,6 +33,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20080827.tar.gz;subdir=${BP};name=te file://CVE-2022-29824-dependent.patch \ file://CVE-2022-29824.patch \ file://0001-Port-gentest.py-to-Python-3.patch \ + file://CVE-2016-3709.patch \ " SRC_URI[archive.sha256sum] = "593b7b751dd18c2d6abcd0c4bcb29efc203d0b4373a6df98e3a455ea74ae2813" From patchwork Mon Aug 29 21:02:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14279 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org From: "Steve Sakoman" Subject: [OE-core][dunfell 07/14] cve-check: Don't use f-strings Date: Mon, 29 Aug 2022 11:02:26 -1000 Message-Id: <4cc681fd66031c8355f69e53443536b31377eba9.1661806803.git.steve@sakoman.com> In-Reply-To: References: MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org From: Ernst Sjöstrand Since we're keeping cve-check aligned between the active branches, and dunfell is supported on Python 3.5, we can't use f-strings. Signed-off-by: Ernst Sjöstrand Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 1821cf7464cbba521b55a9c128fe8812c0cc5eca) Signed-off-by: Steve Sakoman --- meta/lib/oe/cve_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/cve_check.py b/meta/lib/oe/cve_check.py index 30fdc3e3dd..67f0644889 100644 --- a/meta/lib/oe/cve_check.py +++ b/meta/lib/oe/cve_check.py @@ -168,7 +168,7 @@ def get_cpe_ids(cve_product, version): else: vendor = "*" - cpe_id = f'cpe:2.3:a:{vendor}:{product}:{version}:*:*:*:*:*:*:*' + cpe_id = 'cpe:2.3:a:{}:{}:{}:*:*:*:*:*:*:*'.format(vendor, product, version) cpe_ids.append(cpe_id) return cpe_ids From patchwork Mon Aug 29 21:02:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12064 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 E3B83C0502C for ; Mon, 29 Aug 2022 21:03:09 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web10.3645.1661806983630080711 for ; Mon, 29 Aug 2022 14:03:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=vHuBOMzQ; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id x19so7525222pfr.1 for ; Mon, 29 Aug 2022 14:03:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=0TChK/ltfd6clCuYA1NWdePZ8dAtx8ahgkoinbG75nE=; b=vHuBOMzQ/IP9DFdmjoOoNiIkFYz9N4Pzdw1ENsiBDctW9Gc7vc7eNIChJ8a3qfCJQl QEwKBFyFYublGgf13PIiMgWkZMCeaLrgR3gQIgmO9fBd0x60+zwvrvJBJ1f2hUKYDgWL X8mMm+Q+BtT1dtdjWocqCb66VKLLg/rqBKpAnZmWNv9pD3ZjD93N6C+03vFlnkE2kFVq qBX7QOGL8xKc4kf4efnsdBlyV7hsx98P0RjJprLi1ORAyZnv8G4TZrEK452zIVGj2tLi hsk/C0vgv1fUSVgPvB6y781Qj2iqkrXck757VDcnQ9s2cvACbtUWVGJ+1yaVl6MzJt8P OLaw== 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:to:from:x-gm-message-state:from:to:cc; bh=0TChK/ltfd6clCuYA1NWdePZ8dAtx8ahgkoinbG75nE=; b=lYPh82rBc2YWh4Mb7TJC+lOGIpirFJEB4bGXLnSHhpTK2kmGgopQcbSbKXi/5MvPV8 bLI8j4MdAZOfDcR2UjP0Gp/CE5EOcBqJnGiSXaWfwuftM7/Stc8mUa7yW0v8lwPnuMCV +Eh1EAxI2KcR8WckRyVymF9OErPuDnzR1Iik0uOtBlcdeqoXQZfmEw8b9CAgpIPOAIfV 91qlOrPOaXCC4ZyVVDfVuJ4JPnzUT6Vo/0unIkANNCDZDtVNIpZro5EiVLQcIwPs3OVR 928uGMmKJ4w0T2G4yKxsLhAcRHtX4DnP9EUi9MeNR3moPOWISwm6ZXV+jC+a3Yr8+7la skww== X-Gm-Message-State: ACgBeo0w3pp3EysRvv6RpRz2GQM/ygl2P8azzmOGWNLTJnX9tOMRXBsi nXz759pe0RZhoUOmJq4RPJfAN15EAuDKUM3g X-Google-Smtp-Source: AA6agR7U7rp43bD5lYYt3UppY6u2rs99m0guGrX96UZ+ro9lXwNbSSi2LpUtDRkLjMOXPuuFMrYk0A== X-Received: by 2002:a05:6a00:180b:b0:536:816b:f770 with SMTP id y11-20020a056a00180b00b00536816bf770mr18543569pfa.3.1661806982665; Mon, 29 Aug 2022 14:03:02 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm8058957plh.61.2022.08.29.14.03.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 14:03:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 08/14] vim: Upgrade 9.0.0115 -> 9.0.0242 Date: Mon, 29 Aug 2022 11:02:27 -1000 Message-Id: <169537045e614aa08052fd0130ea3199523bc8f3.1661806803.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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, 29 Aug 2022 21:03:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170033 From: Richard Purdie Includes fixes for: CVE-2022-2816 CVE-2022-2817 CVE-2022-2819 CVE-2022-2845 CVE-2022-2849 CVE-2022-2862 CVE-2022-2874 CVE-2022-2889 Signed-off-by: Richard Purdie (cherry picked from commit 3ec2d27d09444213ec1c9b91c6f8c4363f297294) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 30883384f6..8f89699560 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".0115" -SRCREV = "6747cf1671bd41cddee77c65b3f9a70509f968db" +PV .= ".0242" +SRCREV = "171c683237149262665135c7d5841a89bb156f53" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Mon Aug 29 21:02:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12066 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 DED58ECAAD2 for ; Mon, 29 Aug 2022 21:03:09 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.3756.1661806985454609360 for ; Mon, 29 Aug 2022 14:03:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=mfUUTlpT; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id i5-20020a17090a2a0500b001fd8708ffdfso6693433pjd.2 for ; Mon, 29 Aug 2022 14:03:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=ECLJ+OVJROsRP0Q8f42hVPNrXTTqrSjISjG8eVDMXB4=; b=mfUUTlpTOXkllZ0EJFYRi61Tbw9ELZHQnkmrpEiz4mnlbHBu/N7mAEv7Iqxh1aEN/B whouI3oefLXRuYG4yXvDRl3PvEXlshADQdZ6Y/mY75GPinFSEs/a1MnOEfmmZY9HrSe9 o92+jcKojRpqAavPMnnk27DadkBeTNRtUPbxXZV70sGrcaIdCkkbBYpRsm08AEM0hiDo teH3Yr2l4Hogf6fzI+zm6LIWWYLDhg6JRA2bduh3uuLMPXvswaqUjdn6TOT2oKGFABp1 0KWT+3g0pw37Y1uxxH1F6EiWfRotKn09tP94xJPgc2J8S2oO1A//7RtT+WrSYHttlr3C Sw3g== 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:to:from:x-gm-message-state:from:to:cc; bh=ECLJ+OVJROsRP0Q8f42hVPNrXTTqrSjISjG8eVDMXB4=; b=u4pltYhWQUDQ7+mvKc1r5w9IFGEwrnZby+eAUZZ+JFXoJ6MW9HcvuhlhKBS4+XgtEm r8zegcj7CEsvmZFsGruTtBHAAXN1SFZ5PvARS7QKlk1+MRx6Nd9Lj083SfDiV2RsWmqN bm5X0SRLJU7kLnpKy0rOVb9NTTM+KieLCzwhQ1roe9zsLq2gfBKI+TCOEWpOU7jfzmzp jlMd5q87oiJrYNFq1PKfUFav+wMhuFETodwzoagcLu+frs6iM4JfYkknha076jKQ4s4t 5pS7Xp0xnzLJy8vrh1Sdzal0rq+BSPvgO0p20Lfy8Oo5f5rvIWJzIhxBYuqmvqbDon4s EP8w== X-Gm-Message-State: ACgBeo1mVYcjJAMD4epJvh/5NZWnwswuJNsVp3PlwJSc+PQ1nh5XYQpC XgkTpQKWHhj1F7uHdxlYTsYr/muhSsczSZpG X-Google-Smtp-Source: AA6agR7FSZRR4vOxgB428Ut0wrkzE+m1pCvpQb6scpb3HIyWMn/sHvuAcN7TcJNvhPocQU5wrkbSig== X-Received: by 2002:a17:902:ec8d:b0:172:f3c7:97a9 with SMTP id x13-20020a170902ec8d00b00172f3c797a9mr18577239plg.40.1661806984547; Mon, 29 Aug 2022 14:03:04 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm8058957plh.61.2022.08.29.14.03.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 14:03:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 09/14] mobile-broadband-provider-info: upgrade 20220511 -> 20220725 Date: Mon, 29 Aug 2022 11:02:28 -1000 Message-Id: <5dd5130f9b13212a4f5e8b075ae1ecda868c5f28.1661806803.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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, 29 Aug 2022 21:03:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170034 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 96185dac787e14fa9eb77d009653a2fd4d926e3f) Signed-off-by: Steve Sakoman --- .../mobile-broadband-provider-info_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb index e6f216e5cb..2cc92b7b47 100644 --- a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +++ b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb @@ -5,8 +5,8 @@ SECTION = "network" LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04" -SRCREV = "3d5c8d0f7e0264768a2c000d0fd4b4d4a991e041" -PV = "20220511" +SRCREV = "fe19892a8168bf19d81e3bc4ee319bf7f9f058f5" +PV = "20220725" PE = "1" SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=main" From patchwork Mon Aug 29 21:02:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12065 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 D12A8ECAAD4 for ; Mon, 29 Aug 2022 21:03:09 +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.web08.3690.1661806987405985448 for ; Mon, 29 Aug 2022 14:03:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=YkTmaxnN; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id h11-20020a17090a470b00b001fbc5ba5224so9858864pjg.2 for ; Mon, 29 Aug 2022 14:03:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=RxYhLcN6kC+qIzPL3drA/49WdQzGxveX6vnc70m9laU=; b=YkTmaxnNqbOcL15xN8vKQtV+stdU2gXOApZqPxUtpk5J7clHp1IFHVg4ZO22Dh5BBQ B4FWx6wXEKnLf7s/dhkCJepxODcPgMFuMJUfbBRmvDQfhDZxjtdJHXHgsIaH4B/JQdUs 7l6RKWYrEA3JEoCo5iHRTtHj+yAahJzIKcNW6XJVtAGA5kUeFIQp4U/gp7EDH1qu/t40 6NJBvjtBTG1AEK3t88jBeFftAjPjt/Kl2oKdFloFdNb/GEolY3+UyECKRE5DmbIGAOI1 mjn5RbS906E9dRxRuBoSvdCPGZcXQB7nJnyxyl+M790WniPyuKb585D+Q4yteyjWOjVA VHcw== 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:to:from:x-gm-message-state:from:to:cc; bh=RxYhLcN6kC+qIzPL3drA/49WdQzGxveX6vnc70m9laU=; b=7t65OnAyTVpPqhiMIX8AeCEVqCyJ9cCMJqPFvgUsiAcc+6tzBtUEY+MVln4nlGvdZD 4/Y4FteThDet28GQjEZ2F0W0EMasMPkU1HzirFubHG9VdRI8RwBtb1dEtUFvvK5cBJI4 B7yVZXnJAp837SuPgASdzkZdB5VRWTK1UpwcXahQwm/Pbcokof67G3hy94QxX1zBBxas hLlo8DM8rsmqOw+zFvp5exs3U4AJQ3RuZnZIuN8/i0n1vJvDFbd1RMO5fH4rIbdmBPLS 6glFYq5nW7nztZwdGgZHkOOqljYScUP1gxWjeRArWDYWi9B3tKSGwnry6z4gYHHgziKs 9Txw== X-Gm-Message-State: ACgBeo0n3YejdBeRlt29wiNvhmCVMaTlDpDIexouRXc0Dbvj0Xxc32PA yN+B3seNalm/n7c5qFcfr/1HS6nORbg+zcXL X-Google-Smtp-Source: AA6agR7jLvfEArM6EInAxV/1vJMhmevWWpxqShXGGYf1U3wyc7bWnHy19Vxf/2CSoXK8xNIq88hlYA== X-Received: by 2002:a17:902:f60f:b0:172:86f6:241b with SMTP id n15-20020a170902f60f00b0017286f6241bmr18257056plg.162.1661806986452; Mon, 29 Aug 2022 14:03:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm8058957plh.61.2022.08.29.14.03.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 14:03:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 10/14] tzdata: upgrade 2022a -> 2022b Date: Mon, 29 Aug 2022 11:02:29 -1000 Message-Id: X-Mailer: git-send-email 2.25.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, 29 Aug 2022 21:03:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170035 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit b301d5203a4da0a0985670848126c5db762ddc86) 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 cdd1a2ac3c..2b956cf7c0 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 = "2022a" +PV = "2022b" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \ @@ -14,6 +14,6 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.sha256sum] = "f8575e7e33be9ee265df2081092526b81c80abac3f4a04399ae9d4d91cdadac7" -SRC_URI[tzdata.sha256sum] = "ef7fffd9f4f50f4f58328b35022a32a5a056b245c5cb3d6791dddb342f871664" +SRC_URI[tzcode.sha256sum] = "bab20d943e59a3218435f48d868a4e552f18d6d7f3dd128660c5660c80b8a05f" +SRC_URI[tzdata.sha256sum] = "f590eaf04a395245426c2be4fae71c143aea5cebc11088b7a0a5704461df397d" From patchwork Mon Aug 29 21:02:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12067 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 D6650ECAAD8 for ; Mon, 29 Aug 2022 21:03:09 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.3748.1661806965557683592 for ; Mon, 29 Aug 2022 14:03:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=wr8XDKko; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id h13-20020a17090a648d00b001fdb9003787so4525134pjj.4 for ; Mon, 29 Aug 2022 14:03:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=680VjxsmYxuIKU8FQabaOIIwB8rkGSRtilleAGNdUak=; b=wr8XDKkouFDb+t0mDnDPEeKgyx8miRxAHWBXCoOSEMFwe5yPlkOtMi5+0l7dgEHDOe Wi0B8JKYKs2IdpVeziSx6jlTzkjuDyzUyNK8EVQ4+AjrOoFEBf20CQGMaSqjxJu2ONC7 zqHTwiBjTbgwklqy3vEkZX1mhtm3vg3NmSFrEnzJv9wkM9hn0UmHH224srwp6c+CtXmR HkQqreLhELJJXktZNRYmpAjmrOlryXz79RJf0uygCpKj5t3wOI7ZbTieiw5nNKTXAzmC jgm37RfmbeQUTIiwn8H//B/VlKthltC0FJzcpL/3rx0xmJB8sY2T4BJraRNNif/Vd9hk bDcA== 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:to:from:x-gm-message-state:from:to:cc; bh=680VjxsmYxuIKU8FQabaOIIwB8rkGSRtilleAGNdUak=; b=3KIgCs2kpAanHDOICqvqjcRmAxdrreR1BbiP/3HmPz9bUK8+VdnC/ChBa+7pWBPUlJ B9v6lLs8Ix/cleLPknqAEHfsu/1YDzCOdxTjly5DsaTy8zNUb4hWU7rWvtIth3n6VOqh nwIbaV5WZ11u324PbKM5cJxbRoWjhhxCzcFRD5NM0Dg1oR2xFPEtgSdWVnC/25nUR/lC zMP+pkUDItU17W934Cm9AOuSi2NiI7rA9zqL6/eYXKfqBKovbWUbeLkdwCJfLNamNKVm DkRRzDG3e8g06Mbf0nh1O55mPDFlRb9TlAvuV+9D+p2dkefPX2RWNjjMKm/ieu9SWJe+ g+Cw== X-Gm-Message-State: ACgBeo2zmyS4z+lqmBHx9bEN/DXueGBVid/CKb4fLesILNw9iNcjzFHE MHZhSfmwpFSWxxxZKqLohidUUt8hgkxBTWGd X-Google-Smtp-Source: AA6agR4yfjCya+rbKUNj/2aOMQFPh2BwzRzGSiurCTKXyaShFYMPEWmkZQAL+YbjMtSRHf4hoxNy/A== X-Received: by 2002:a17:90a:4a91:b0:1fd:64ce:f8d5 with SMTP id f17-20020a17090a4a9100b001fd64cef8d5mr18378521pjh.40.1661806988479; Mon, 29 Aug 2022 14:03:08 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm8058957plh.61.2022.08.29.14.03.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 14:03:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 11/14] wireless-regdb: upgrade 2022.06.06 -> 2022.08.12 Date: Mon, 29 Aug 2022 11:02:30 -1000 Message-Id: <8b69eafa5c624dfc169ee11ced685847332437fa.1661806803.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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, 29 Aug 2022 21:03:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170036 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 75386480abd1660a50c79d5987b77ccc43295511) Signed-off-by: Steve Sakoman --- ...ireless-regdb_2022.06.06.bb => wireless-regdb_2022.08.12.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2022.06.06.bb => wireless-regdb_2022.08.12.bb} (94%) diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb similarity index 94% rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb index 91775bce5c..7165a9f9b3 100644 --- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb @@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "ac00f97efecce5046ed069d1d93f3365fdf994c7c7854a8fc50831e959537230" +SRC_URI[sha256sum] = "59c8f7d17966db71b27f90e735ee8f5b42ca3527694a8c5e6e9b56bd379c3b84" inherit bin_package allarch From patchwork Mon Aug 29 21:02:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12070 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 E34C0C0502C for ; Mon, 29 Aug 2022 21:03:19 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web08.3692.1661806991654758714 for ; Mon, 29 Aug 2022 14:03:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=OS3VAmxu; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id 73so451737pga.1 for ; Mon, 29 Aug 2022 14:03:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=jbYijZTFbQ+fa+8Xq5N3cYvMz2s62i5inAv0om/U/k4=; b=OS3VAmxuk1aIVHppuMBOQKJ7gYImzypNinJE+xEmJ2VkmWm/KIdrULLrftRXIlb6fU CYfS1Xtae5JDW8anWmpvyRrFUxTSpzNjtF558BWbYSYsEzPpEge4fZDr/RAqsAKc3Ej2 JPo+e48usewg4K/uSqZKYv3+P2ZCicm5ujC3o8WvUfn+kZGrUNfSPxwqtoGX84qBHYME B94LWsja/7+3HTj3npr1T86B6jIdWS2wV0agYoEyV+DGT3fbKZShrY8HY0y/VUn1LFZU UeDDgMXByM61+GNht6VyU1NN/X8GbmXiqDlsvec92DUz5IwMm1+Xp/yM73Bu0xFIVv+n Z+cQ== 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:to:from:x-gm-message-state:from:to:cc; bh=jbYijZTFbQ+fa+8Xq5N3cYvMz2s62i5inAv0om/U/k4=; b=q32UolRA+1nO4/M/TE6gUrJ07EnePz4x2IKSOaDYy3iqLvuNVqCPYrI/PhXrIv0HiA YscFApyjAiIU6nI+qs5Oiy5bS8RuwKx6bIjSGAghfTV+el3tRkqN7vpy6pk7CC1wZlOH JVNV/D5YWHldScb1f1hTrojPQmCbVV6NTABSCd44dwgq9rXGWOPgloZrrIfHrxLHVgSn iGtBTeAHzuP31aZOV49QCNF2BUZuZxDONzGLNXdVmjvG/Jd96LnGEoTW1PuVV6ojr9wh RDBvXDt31hBetGnS+Fpg30jumndS5PVFB+Z1l+I12Srx2QDmkDegL/c79SbknLSRQ6CJ 0idQ== X-Gm-Message-State: ACgBeo0Q8n9P2AmtVsnhvdDvTQlsZarKVSo96CVwZoduMwoBolUQ4SZI CjMHd5h6EVk7txGZ/cn3F8H6Xjnl9tVYhb7k X-Google-Smtp-Source: AA6agR5aMDZDRFUSrvhQ0iLD07JPlV4B5c7fTTVSYujUrarCXjnkX0gwxFYEFSzDyS9wfGa/U7qM5w== X-Received: by 2002:a63:8bc9:0:b0:42b:2375:79b3 with SMTP id j192-20020a638bc9000000b0042b237579b3mr14999923pge.207.1661806990541; Mon, 29 Aug 2022 14:03:10 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm8058957plh.61.2022.08.29.14.03.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 14:03:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 12/14] linux-yocto/5.4: update to v5.4.210 Date: Mon, 29 Aug 2022 11:02:31 -1000 Message-Id: <2663435831c0ef953fb7fe6c883f42cf0c86ae43.1661806803.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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, 29 Aug 2022 21:03:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170037 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: de0cd3ea700d Linux 5.4.210 b58882c69f66 x86/speculation: Add LFENCE to RSB fill sequence f2f41ef0352d x86/speculation: Add RSB VM Exit protections 3a0ef79c6abe macintosh/adb: fix oob read in do_adb_query() function 54e1abbe8560 media: v4l2-mem2mem: Apply DST_QUEUE_OFF_BASE on MMAP buffers across ioctls 17c2356e467f selftests: KVM: Handle compiler optimizations in ucall 170465715a60 KVM: Don't null dereference ops->destroy 6098562ed9df selftests/bpf: Fix "dubious pointer arithmetic" test 6a9b3f0f3bad selftests/bpf: Fix test_align verifier log patterns 9d6f67365d9c bpf: Test_verifier, #70 error message updates for 32-bit right shift 751f05bc6f95 selftests/bpf: Extend verifier and bpf_sock tests for dst_port loads 7c1134c7da99 bpf: Verifer, adjust_scalar_min_max_vals to always call update_reg_bounds() a8ba72bbeda5 ACPI: APEI: Better fix to avoid spamming the console with old error logs fa829bd4af43 ACPI: video: Shortening quirk list by identifying Clevo by board_name only 8ed6e5c5e23c ACPI: video: Force backlight native for some TongFang devices 828f4c31684d thermal: Fix NULL pointer dereferences in of_thermal_ functions Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.4.bb | 6 ++--- .../linux/linux-yocto-tiny_5.4.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 8e8fbb5b12..7f766090fb 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "f6c9d6db383201a730e8d638995eae82acd4d8e7" -SRCREV_meta ?= "028688aaad2b64e353d771ba5505a8666cd01696" +SRCREV_machine ?= "c3d41d0285529bdd90b4625dc5caaa9dcecf7c64" +SRCREV_meta ?= "e1682f82a101d7b4561a9246010f1535fc6cf583" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.209" +LINUX_VERSION ?= "5.4.210" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index cdccebeb1c..81e10b240c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.209" +LINUX_VERSION ?= "5.4.210" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "8f087017ff03465fa8d318c06a7e4e072c533daf" -SRCREV_machine ?= "a4b7263158de8713dc85c5171aed99e3424a9f7c" -SRCREV_meta ?= "028688aaad2b64e353d771ba5505a8666cd01696" +SRCREV_machine_qemuarm ?= "caaa7fd55f05c104ef33d0d01d8fb64c72de3f9b" +SRCREV_machine ?= "d9ba497c67cb9905a8947d92c8b4a469309b354e" +SRCREV_meta ?= "e1682f82a101d7b4561a9246010f1535fc6cf583" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 0f597fc3d6..876aa2f16d 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "4fefb5a57ecb9bc5c6aab38319f773b02c894e6b" -SRCREV_machine_qemuarm64 ?= "407b5fa877ca8993a405542fa4c3d73584e8ea98" -SRCREV_machine_qemumips ?= "1bfe5d39c9f954f0ac2480115f4750f39500d4f4" -SRCREV_machine_qemuppc ?= "753def987b630ed41686223b5dc252436757e893" -SRCREV_machine_qemuriscv64 ?= "90d5f03a7c79ccd5c02e0579049d22cf2686da9b" -SRCREV_machine_qemux86 ?= "90d5f03a7c79ccd5c02e0579049d22cf2686da9b" -SRCREV_machine_qemux86-64 ?= "90d5f03a7c79ccd5c02e0579049d22cf2686da9b" -SRCREV_machine_qemumips64 ?= "b391bfc877fe8ae41e579ffd4bcd814b4ad438ea" -SRCREV_machine ?= "90d5f03a7c79ccd5c02e0579049d22cf2686da9b" -SRCREV_meta ?= "028688aaad2b64e353d771ba5505a8666cd01696" +SRCREV_machine_qemuarm ?= "bccceefd95fc53e9b7c84f92401e5a660ded553c" +SRCREV_machine_qemuarm64 ?= "4377f280ff917c050be6cf135fd3e371fdf5b2f2" +SRCREV_machine_qemumips ?= "6ec4e71fdc85eab33422225750ad0eb3767e84a9" +SRCREV_machine_qemuppc ?= "d03ef50c2e8d8508dc57369c7943bce6ddf1cfdf" +SRCREV_machine_qemuriscv64 ?= "588ad034d1610fd31e575fff588e386cc672f972" +SRCREV_machine_qemux86 ?= "588ad034d1610fd31e575fff588e386cc672f972" +SRCREV_machine_qemux86-64 ?= "588ad034d1610fd31e575fff588e386cc672f972" +SRCREV_machine_qemumips64 ?= "4a033c21edd6d4f5e1e9675cdde70e29f6346dbd" +SRCREV_machine ?= "588ad034d1610fd31e575fff588e386cc672f972" +SRCREV_meta ?= "e1682f82a101d7b4561a9246010f1535fc6cf583" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.209" +LINUX_VERSION ?= "5.4.210" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Mon Aug 29 21:02:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12069 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 D6511ECAAD4 for ; Mon, 29 Aug 2022 21:03:19 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.3757.1661806994067360129 for ; Mon, 29 Aug 2022 14:03:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=I4I8CU0I; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id u22so9150936plq.12 for ; Mon, 29 Aug 2022 14:03:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=KSAlUrX+Pfx9v9728UHhJmtX1+ZnNho72K8FS5qR1QA=; b=I4I8CU0Iz4SBvDztL9g9CVSBX4r4WNxFsBBXs4EVcYKY0+JotDmPJXg2tRPCiabuVp 6T7CCj7ZYNPEZVe6/fC6sDVYB7aXChNWMzXQr2VF+obphXItaaRcBb42mELwXGLtEQIG Frl2v29w+kg+6jefLwMYFpTdoHrFl68Usd9iRcA/E6rcpWwrzOdPOC3ZUMcOLI24GJ8W cSptXLHGcJXHWcpOW+t7wri2bnjRaDocvlUmht0eudW/cHWRT6qSOgObggWnpBiTH6BR caeE389MV8I1SaiyCopcVC515/xrSEgegYuQniu6IarnPn/X9tjTCRUYAyG44nus7LMF oPwQ== 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:to:from:x-gm-message-state:from:to:cc; bh=KSAlUrX+Pfx9v9728UHhJmtX1+ZnNho72K8FS5qR1QA=; b=kiW/m5XkK21A7i+wPbMQdXleHFzjambDjoKMyn2d33FzGWzQSAQGGdAjHffNgXq7AW zEafW1YzBH2rp1ihhVgASIB6cyLYHvOiIOIvnLmMS4kDn/c06oKj/4v6j8AwNMRHQgbz 36STkgASxuQnSN515SPJorhGLq2WAv0yhcN4/cbq4nckF/PRrinzHynpvCBEOA/JSiIm yfW0jxZ5jpwNVTrI+jC1tEjbdVT0dD6RglziopGWKxjZ6NVZA7lWSNMrguGFtysgJn9y lv57cAYHtXAjQI8BZxWDxMEWYlTJ0WmqjolhIUL/ehFIJu911E5bdaNjAeBHjY2Mq9s5 ZkOw== X-Gm-Message-State: ACgBeo0usRzyV6b9ue0r3BwqIW01z2h52spsQk2xkWfXn2d6vqiXX3nD 3LqsSBoH8EfD0ot11DPza85nSjzBbMAvmfQA X-Google-Smtp-Source: AA6agR51Cf5XDvDCwayqT2va+Nas9+xdWaolgcrD/7yAS5b2qsxOF4mOhWCXY+9MDJOaABFflwl2/w== X-Received: by 2002:a17:902:70c4:b0:172:d8f5:b4bc with SMTP id l4-20020a17090270c400b00172d8f5b4bcmr17918554plt.32.1661806993060; Mon, 29 Aug 2022 14:03:13 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm8058957plh.61.2022.08.29.14.03.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 14:03:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 13/14] cryptodev-module: fix build with 5.11+ kernels Date: Mon, 29 Aug 2022 11:02:32 -1000 Message-Id: <653b03aa6fc8effd3b2215a7a0ba005979e78e9f.1661806803.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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, 29 Aug 2022 21:03:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170038 From: Anuj Mittal Backport patch to fix: | cryptodev-module/1.10-r0/git/ioctl.c:875:4: error: implicit declaration of function 'ksys_close'; did you mean 'ksys_chown'? [-Werror=implicit-function-declaration] | 875 | ksys_close(fd); | | ^~~~~~~~~~ | | ksys_chown | cc1: some warnings being treated as errors Signed-off-by: Anuj Mittal Signed-off-by: Steve Sakoman --- .../cryptodev/cryptodev-module_1.10.bb | 1 + .../files/fix-build-for-Linux-5.11-rc1.patch | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-kernel/cryptodev/files/fix-build-for-Linux-5.11-rc1.patch diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb index e4f7d1e372..d7c7918515 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb +++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb @@ -11,6 +11,7 @@ SRC_URI += " \ file://0001-Disable-installing-header-file-provided-by-another-p.patch \ file://0001-Fix-build-for-Linux-5.8-rc1.patch \ file://0001-Fix-build-for-Linux-5.9-rc1.patch \ +file://fix-build-for-Linux-5.11-rc1.patch \ " EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' diff --git a/meta/recipes-kernel/cryptodev/files/fix-build-for-Linux-5.11-rc1.patch b/meta/recipes-kernel/cryptodev/files/fix-build-for-Linux-5.11-rc1.patch new file mode 100644 index 0000000000..3ae77cb9d6 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/files/fix-build-for-Linux-5.11-rc1.patch @@ -0,0 +1,32 @@ +From 55c6315058fc0dd189ffd116f2cc27ba4fa84cb6 Mon Sep 17 00:00:00 2001 +From: Joan Bruguera +Date: Mon, 28 Dec 2020 01:41:31 +0100 +Subject: [PATCH] Fix build for Linux 5.11-rc1 + +ksys_close was removed, as far as I can tell, close_fd replaces it. + +See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8760c909f54a82aaa6e76da19afe798a0c77c3c3 + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1572bfdf21d4d50e51941498ffe0b56c2289f783 + +Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/55c6315058fc0dd189ffd116f2cc27ba4fa84cb6] +Signed-off-by: Anuj Mittal +--- + ioctl.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/ioctl.c b/ioctl.c +index 3d332380..95481d4f 100644 +--- a/ioctl.c ++++ b/ioctl.c +@@ -871,8 +871,10 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_) + if (unlikely(ret)) { + #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) + sys_close(fd); +-#else ++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) + ksys_close(fd); ++#else ++ close_fd(fd); + #endif + return ret; + } From patchwork Mon Aug 29 21:02:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12068 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 D69A8ECAAD8 for ; Mon, 29 Aug 2022 21:03:19 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web11.3759.1661806996066428446 for ; Mon, 29 Aug 2022 14:03:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=qLGc2diU; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id p8-20020a17090ad30800b001fdfc8c7567so154960pju.1 for ; Mon, 29 Aug 2022 14:03:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=lxuJenfKU8yAkMUUZbm9tqZP8RjObArytvfD3hEHhOc=; b=qLGc2diUETCxsSHg19Fli1JPN4Sbl5Y3ihHKyfWpgZpZvU2IIYjPpKTptDDn1CZe/D LVD56KnrAanwfG6Ie/CQeke7s6jZx5djThVlMCwHMPoFj2nj935hMMBM5wYnDYACB3oU YS74w5t3UP+MeSAPylFX3t8QoDW9Bw0KwCxypvL3uyvqSWKUQkuimF0q2gz/JPLIMURJ VU2VkqUKjClTYWjww0r9snLGog1vLa0bMuiYZkPuqWLdGIxaJQut0mhgrQv/35Oz9opb 5wM4BD9MTRc78oxeS7mGt2R82RPEJjegyVc7OBh8c8WOlTmw9GMMC7PSCzZH5c2zZCQP 179g== 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:to:from:x-gm-message-state:from:to:cc; bh=lxuJenfKU8yAkMUUZbm9tqZP8RjObArytvfD3hEHhOc=; b=416FTKSKGc6KwRyjqRKUavrbU5oq0F9Zl8yCEReINAUdlcJDrqArrhIE7N8/lzjV5t FSRPL1ABNAUdtv+cG6ceQYxiYIGWhUlbRUaaAP13oOZpH2wUpFqlcB2i/MMDDyNXyYn0 nRqX8FDjDqbIkRmcKAkYk1igMdF69q27RdV2Sq1X58NUpv618zW5+5g/J3yLsDd8mjT0 rr7BHKGVU3DyIHiDI+4/zdkCfx0vanjqP/JSbBP9fQ8y+u0YRYlYKjkZqspcsgMP2i52 FlNBo8c2Qp8F4Nu4aswZeEZ+6+8bJwIH3Cs8dAjM6FtTVspRla8u7QMm8FWUEn9+28Sf U26A== X-Gm-Message-State: ACgBeo12Q4dDRdTYn4odqgx9e476U4obpPEEI1zc7YG8whgQca3n0bqF OUspD/Svgv2s3us4g8YlLQgdlmOAsRPoy3cQ X-Google-Smtp-Source: AA6agR5h+/ubZNn8Lpj4wo84mhUdvKO9PBXbazQaQYXrh6UUm4AeRAenc+4hrKDJzsJtLspv3nEcPQ== X-Received: by 2002:a17:902:e892:b0:174:4022:b9c8 with SMTP id w18-20020a170902e89200b001744022b9c8mr16338975plg.0.1661806995092; Mon, 29 Aug 2022 14:03:15 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0016eede528b4sm8058957plh.61.2022.08.29.14.03.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 14:03:14 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 14/14] relocate_sdk.py: ensure interpreter size error causes relocation to fail Date: Mon, 29 Aug 2022 11:02:33 -1000 Message-Id: <345193f36d08cfe4899c65e8edf3f79db09c50d2.1661806803.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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, 29 Aug 2022 21:03:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170039 From: Paul Eggleton If there is insufficent space to change the interpreter, we were printing an error here but the overall script did not return an error code, and thus the SDK installation appeared to succeed - but some of the binaries will not be in a working state. Allow the relocation to proceed (so we still get a full list of the failures) but error out at the end so that the installation is halted. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie (cherry picked from commit c5a9a448e462d3e5457e8403c5a1a54148ecd224) Signed-off-by: Steve Sakoman --- scripts/relocate_sdk.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/relocate_sdk.py b/scripts/relocate_sdk.py index 8c0fdb986a..8079d13750 100755 --- a/scripts/relocate_sdk.py +++ b/scripts/relocate_sdk.py @@ -97,11 +97,12 @@ def change_interpreter(elf_file_name): if (len(new_dl_path) >= p_filesz): print("ERROR: could not relocate %s, interp size = %i and %i is needed." \ % (elf_file_name, p_memsz, len(new_dl_path) + 1)) - break + return False dl_path = new_dl_path + b("\0") * (p_filesz - len(new_dl_path)) f.seek(p_offset) f.write(dl_path) break + return True def change_dl_sysdirs(elf_file_name): if arch == 32: @@ -215,6 +216,7 @@ else: executables_list = sys.argv[3:] +errors = False for e in executables_list: perms = os.stat(e)[stat.ST_MODE] if os.access(e, os.W_OK|os.R_OK): @@ -240,7 +242,8 @@ for e in executables_list: arch = get_arch() if arch: parse_elf_header() - change_interpreter(e) + if not change_interpreter(e): + errors = True change_dl_sysdirs(e) """ change permissions back """ @@ -253,3 +256,6 @@ for e in executables_list: print("New file size for %s is different. Looks like a relocation error!", e) sys.exit(-1) +if errors: + print("Relocation of one or more executables failed.") + sys.exit(-1)