From 7879ba4406eb9633079275c57abeee9e738b1c99 Mon Sep 17 00:00:00 2001 From: Sakib Sajal Date: Wed, 2 Feb 2022 10:47:17 -0500 Subject: [PATCH 001/108] qemu: fix CVE-2021-3713 Signed-off-by: Sakib Sajal Signed-off-by: Anuj Mittal --- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2021-3713.patch | 68 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3713.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 463339e42b4..3aad41088ac 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -70,6 +70,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2021-3607.patch \ file://CVE-2021-3608.patch \ file://CVE-2021-3682.patch \ + file://CVE-2021-3713.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3713.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3713.patch new file mode 100644 index 00000000000..33fca66d3db --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3713.patch @@ -0,0 +1,68 @@ +From 9a8f71ec660e67c51cc5905dd9d2a12ff78ce743 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Wed, 18 Aug 2021 14:05:05 +0200 +Subject: [PATCH 08/12] uas: add stream number sanity checks. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The device uses the guest-supplied stream number unchecked, which can +lead to guest-triggered out-of-band access to the UASDevice->data3 and +UASDevice->status3 fields. Add the missing checks. + +Fixes: CVE-2021-3713 +Signed-off-by: Gerd Hoffmann +Reported-by: Chen Zhe +Reported-by: Tan Jingguo +Reviewed-by: Philippe Mathieu-Daudé +Message-Id: <20210818120505.1258262-2-kraxel@redhat.com> +(cherry picked from commit 13b250b12ad3c59114a6a17d59caf073ce45b33a) +Signed-off-by: Michael Roth + +Upstream-Status: Backport [36403e8788a264dc96174f52584681ebcb4f54b1] +CVE: CVE-2021-3713 + +Signed-off-by: Sakib Sajal +--- + hw/usb/dev-uas.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c +index cec071d96..157734eb0 100644 +--- a/hw/usb/dev-uas.c ++++ b/hw/usb/dev-uas.c +@@ -831,6 +831,9 @@ static void usb_uas_handle_data(USBDevice *dev, USBPacket *p) + } + break; + case UAS_PIPE_ID_STATUS: ++ if (p->stream > UAS_MAX_STREAMS) { ++ goto err_stream; ++ } + if (p->stream) { + QTAILQ_FOREACH(st, &uas->results, next) { + if (st->stream == p->stream) { +@@ -858,6 +861,9 @@ static void usb_uas_handle_data(USBDevice *dev, USBPacket *p) + break; + case UAS_PIPE_ID_DATA_IN: + case UAS_PIPE_ID_DATA_OUT: ++ if (p->stream > UAS_MAX_STREAMS) { ++ goto err_stream; ++ } + if (p->stream) { + req = usb_uas_find_request(uas, p->stream); + } else { +@@ -893,6 +899,11 @@ static void usb_uas_handle_data(USBDevice *dev, USBPacket *p) + p->status = USB_RET_STALL; + break; + } ++ ++err_stream: ++ error_report("%s: invalid stream %d", __func__, p->stream); ++ p->status = USB_RET_STALL; ++ return; + } + + static void usb_uas_unrealize(USBDevice *dev) +-- +2.31.1 + From 6fe3b1002a273808fe4caf6f2e1ecd54729b954d Mon Sep 17 00:00:00 2001 From: Sakib Sajal Date: Wed, 2 Feb 2022 10:47:18 -0500 Subject: [PATCH 002/108] qemu: fix CVE-2021-3748 Signed-off-by: Sakib Sajal Signed-off-by: Anuj Mittal --- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2021-3748.patch | 127 ++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3748.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 3aad41088ac..5c1c88db25b 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -71,6 +71,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2021-3608.patch \ file://CVE-2021-3682.patch \ file://CVE-2021-3713.patch \ + file://CVE-2021-3748.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3748.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3748.patch new file mode 100644 index 00000000000..4765f247399 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3748.patch @@ -0,0 +1,127 @@ +From bacc200f623647632258f7efc0f098ac30dd4225 Mon Sep 17 00:00:00 2001 +From: Jason Wang +Date: Thu, 2 Sep 2021 13:44:12 +0800 +Subject: [PATCH 09/12] virtio-net: fix use after unmap/free for sg + +When mergeable buffer is enabled, we try to set the num_buffers after +the virtqueue elem has been unmapped. This will lead several issues, +E.g a use after free when the descriptor has an address which belongs +to the non direct access region. In this case we use bounce buffer +that is allocated during address_space_map() and freed during +address_space_unmap(). + +Fixing this by storing the elems temporarily in an array and delay the +unmap after we set the the num_buffers. + +This addresses CVE-2021-3748. + +Reported-by: Alexander Bulekov +Fixes: fbe78f4f55c6 ("virtio-net support") +Cc: qemu-stable@nongnu.org +Signed-off-by: Jason Wang + +Upstream-Status: Backport [bedd7e93d01961fcb16a97ae45d93acf357e11f6] +CVE: CVE-2021-3748 + +Signed-off-by: Sakib Sajal +--- + hw/net/virtio-net.c | 39 ++++++++++++++++++++++++++++++++------- + 1 file changed, 32 insertions(+), 7 deletions(-) + +diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c +index 9179013ac..df1d30e2c 100644 +--- a/hw/net/virtio-net.c ++++ b/hw/net/virtio-net.c +@@ -1665,10 +1665,13 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf, + VirtIONet *n = qemu_get_nic_opaque(nc); + VirtIONetQueue *q = virtio_net_get_subqueue(nc); + VirtIODevice *vdev = VIRTIO_DEVICE(n); ++ VirtQueueElement *elems[VIRTQUEUE_MAX_SIZE]; ++ size_t lens[VIRTQUEUE_MAX_SIZE]; + struct iovec mhdr_sg[VIRTQUEUE_MAX_SIZE]; + struct virtio_net_hdr_mrg_rxbuf mhdr; + unsigned mhdr_cnt = 0; +- size_t offset, i, guest_offset; ++ size_t offset, i, guest_offset, j; ++ ssize_t err; + + if (!virtio_net_can_receive(nc)) { + return -1; +@@ -1699,6 +1702,12 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf, + + total = 0; + ++ if (i == VIRTQUEUE_MAX_SIZE) { ++ virtio_error(vdev, "virtio-net unexpected long buffer chain"); ++ err = size; ++ goto err; ++ } ++ + elem = virtqueue_pop(q->rx_vq, sizeof(VirtQueueElement)); + if (!elem) { + if (i) { +@@ -1710,7 +1719,8 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf, + n->guest_hdr_len, n->host_hdr_len, + vdev->guest_features); + } +- return -1; ++ err = -1; ++ goto err; + } + + if (elem->in_num < 1) { +@@ -1718,7 +1728,8 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf, + "virtio-net receive queue contains no in buffers"); + virtqueue_detach_element(q->rx_vq, elem, 0); + g_free(elem); +- return -1; ++ err = -1; ++ goto err; + } + + sg = elem->in_sg; +@@ -1755,12 +1766,13 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf, + if (!n->mergeable_rx_bufs && offset < size) { + virtqueue_unpop(q->rx_vq, elem, total); + g_free(elem); +- return size; ++ err = size; ++ goto err; + } + +- /* signal other side */ +- virtqueue_fill(q->rx_vq, elem, total, i++); +- g_free(elem); ++ elems[i] = elem; ++ lens[i] = total; ++ i++; + } + + if (mhdr_cnt) { +@@ -1770,10 +1782,23 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf, + &mhdr.num_buffers, sizeof mhdr.num_buffers); + } + ++ for (j = 0; j < i; j++) { ++ /* signal other side */ ++ virtqueue_fill(q->rx_vq, elems[j], lens[j], j); ++ g_free(elems[j]); ++ } ++ + virtqueue_flush(q->rx_vq, i); + virtio_notify(vdev, q->rx_vq); + + return size; ++ ++err: ++ for (j = 0; j < i; j++) { ++ g_free(elems[j]); ++ } ++ ++ return err; + } + + static ssize_t virtio_net_do_receive(NetClientState *nc, const uint8_t *buf, +-- +2.31.1 + From f0504578174f77ba231c72801fb5a295869a40d1 Mon Sep 17 00:00:00 2001 From: Sakib Sajal Date: Wed, 2 Feb 2022 10:47:19 -0500 Subject: [PATCH 003/108] qemu: fix CVE-2021-3930 Signed-off-by: Sakib Sajal Signed-off-by: Anuj Mittal --- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2021-3930.patch | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3930.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 5c1c88db25b..35aa3e1d7e4 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -72,6 +72,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2021-3682.patch \ file://CVE-2021-3713.patch \ file://CVE-2021-3748.patch \ + file://CVE-2021-3930.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3930.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3930.patch new file mode 100644 index 00000000000..bfbe5cee339 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3930.patch @@ -0,0 +1,53 @@ +From cdca50eff9c38367be54f92839734ab490c8b0f7 Mon Sep 17 00:00:00 2001 +From: Mauro Matteo Cascella +Date: Thu, 4 Nov 2021 17:31:38 +0100 +Subject: [PATCH 10/12] hw/scsi/scsi-disk: MODE_PAGE_ALLS not allowed in MODE + SELECT commands + +This avoids an off-by-one read of 'mode_sense_valid' buffer in +hw/scsi/scsi-disk.c:mode_sense_page(). + +Fixes: CVE-2021-3930 +Cc: qemu-stable@nongnu.org +Reported-by: Alexander Bulekov +Fixes: a8f4bbe2900 ("scsi-disk: store valid mode pages in a table") +Fixes: #546 +Reported-by: Qiuhao Li +Signed-off-by: Mauro Matteo Cascella +Signed-off-by: Paolo Bonzini + +Upstream-Status: Backport [b3af7fdf9cc537f8f0dd3e2423d83f5c99a457e8] +CVE: CVE-2021-3930 + +Signed-off-by: Sakib Sajal +--- + hw/scsi/scsi-disk.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c +index 90841ad79..5b44ed7d8 100644 +--- a/hw/scsi/scsi-disk.c ++++ b/hw/scsi/scsi-disk.c +@@ -1100,6 +1100,7 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, + uint8_t *p = *p_outbuf + 2; + int length; + ++ assert(page < ARRAY_SIZE(mode_sense_valid)); + if ((mode_sense_valid[page] & (1 << s->qdev.type)) == 0) { + return -1; + } +@@ -1441,6 +1442,11 @@ static int scsi_disk_check_mode_select(SCSIDiskState *s, int page, + return -1; + } + ++ /* MODE_PAGE_ALLS is only valid for MODE SENSE commands */ ++ if (page == MODE_PAGE_ALLS) { ++ return -1; ++ } ++ + p = mode_current; + memset(mode_current, 0, inlen + 2); + len = mode_sense_page(s, page, &p, 0); +-- +2.31.1 + From 3014cb660e7128f65ee2aec004ede39e80cd891d Mon Sep 17 00:00:00 2001 From: Sakib Sajal Date: Wed, 2 Feb 2022 10:47:20 -0500 Subject: [PATCH 004/108] qemu: fix CVE-2021-20196 Signed-off-by: Sakib Sajal Signed-off-by: Anuj Mittal --- meta/recipes-devtools/qemu/qemu.inc | 2 + .../qemu/qemu/CVE-2021-20196_1.patch | 54 +++++++++++++++ .../qemu/qemu/CVE-2021-20196_2.patch | 67 +++++++++++++++++++ 3 files changed, 123 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-20196_1.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-20196_2.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 35aa3e1d7e4..568ef1be94c 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -73,6 +73,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2021-3713.patch \ file://CVE-2021-3748.patch \ file://CVE-2021-3930.patch \ + file://CVE-2021-20196_1.patch \ + file://CVE-2021-20196_2.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-20196_1.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-20196_1.patch new file mode 100644 index 00000000000..8b1ad0423b0 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-20196_1.patch @@ -0,0 +1,54 @@ +From e907ff3d4cb7fd20d402f45355059e67d0dc93e7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= +Date: Wed, 24 Nov 2021 17:15:34 +0100 +Subject: [PATCH 11/12] hw/block/fdc: Extract blk_create_empty_drive() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We are going to re-use this code in the next commit, +so extract it as a new blk_create_empty_drive() function. + +Inspired-by: Hanna Reitz +Signed-off-by: Philippe Mathieu-Daudé +Message-id: 20211124161536.631563-2-philmd@redhat.com +Signed-off-by: John Snow + +Upstream-Status: Backport [b154791e7b6d4ca5cdcd54443484d97360bd7ad2] +CVE: CVE-2021-20196 + +Signed-off-by: Sakib Sajal +--- + hw/block/fdc.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/hw/block/fdc.c b/hw/block/fdc.c +index 4c2c35e22..854b4f172 100644 +--- a/hw/block/fdc.c ++++ b/hw/block/fdc.c +@@ -61,6 +61,12 @@ + } while (0) + + ++/* Anonymous BlockBackend for empty drive */ ++static BlockBackend *blk_create_empty_drive(void) ++{ ++ return blk_new(qemu_get_aio_context(), 0, BLK_PERM_ALL); ++} ++ + /********************************************************/ + /* qdev floppy bus */ + +@@ -543,8 +549,7 @@ static void floppy_drive_realize(DeviceState *qdev, Error **errp) + } + + if (!dev->conf.blk) { +- /* Anonymous BlockBackend for an empty drive */ +- dev->conf.blk = blk_new(qemu_get_aio_context(), 0, BLK_PERM_ALL); ++ dev->conf.blk = blk_create_empty_drive(); + ret = blk_attach_dev(dev->conf.blk, qdev); + assert(ret == 0); + +-- +2.31.1 + diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-20196_2.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-20196_2.patch new file mode 100644 index 00000000000..dd442ccb8f3 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-20196_2.patch @@ -0,0 +1,67 @@ +From 1d48445a951fd5504190a38abeda70ea9372cf77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= +Date: Wed, 24 Nov 2021 17:15:35 +0100 +Subject: [PATCH 12/12] hw/block/fdc: Kludge missing floppy drive to fix + CVE-2021-20196 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guest might select another drive on the bus by setting the +DRIVE_SEL bit of the DIGITAL OUTPUT REGISTER (DOR). +The current controller model doesn't expect a BlockBackend +to be NULL. A simple way to fix CVE-2021-20196 is to create +an empty BlockBackend when it is missing. All further +accesses will be safely handled, and the controller state +machines keep behaving correctly. + +Cc: qemu-stable@nongnu.org +Fixes: CVE-2021-20196 +Reported-by: Gaoning Pan (Ant Security Light-Year Lab) +Reviewed-by: Darren Kenny +Reviewed-by: Hanna Reitz +Signed-off-by: Philippe Mathieu-Daudé +Message-id: 20211124161536.631563-3-philmd@redhat.com +BugLink: https://bugs.launchpad.net/qemu/+bug/1912780 +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/338 +Reviewed-by: Darren Kenny +Reviewed-by: Hanna Reitz +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: John Snow + +Upstream-Status: Backport [1ab95af033a419e7a64e2d58e67dd96b20af5233] +CVE: CVE-2021-20196 + +Signed-off-by: Sakib Sajal +--- + hw/block/fdc.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/hw/block/fdc.c b/hw/block/fdc.c +index 854b4f172..a736c4d14 100644 +--- a/hw/block/fdc.c ++++ b/hw/block/fdc.c +@@ -1365,7 +1365,19 @@ static FDrive *get_drv(FDCtrl *fdctrl, int unit) + + static FDrive *get_cur_drv(FDCtrl *fdctrl) + { +- return get_drv(fdctrl, fdctrl->cur_drv); ++ FDrive *cur_drv = get_drv(fdctrl, fdctrl->cur_drv); ++ ++ if (!cur_drv->blk) { ++ /* ++ * Kludge: empty drive line selected. Create an anonymous ++ * BlockBackend to avoid NULL deref with various BlockBackend ++ * API calls within this model (CVE-2021-20196). ++ * Due to the controller QOM model limitations, we don't ++ * attach the created to the controller device. ++ */ ++ cur_drv->blk = blk_create_empty_drive(); ++ } ++ return cur_drv; + } + + /* Status A register : 0x00 (read-only) */ +-- +2.31.1 + From 3eceda67a1098ab9641cb1b7fc789048b7daeae8 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Sat, 29 Jan 2022 22:44:53 +0100 Subject: [PATCH 005/108] sstate: A third fix for for touching files inside pseudo This continues where commit676757f "sstate: fix touching files inside pseudo" and commit 29fc8599 "sstate: another fix for touching files inside pseudo" left off. The previous changes switched from trying to check if the sstate file is writable before touching it, to always touching the sstate file and ignoring any errors. However, if the sstate file is actually a symbolic link that links to nothing, this would actually result in an empty sstate file being created. And this in turn leads to that future setscene tasks will fail when they try to unpack the empty file. Change the code so that if an sstate file linking to nothing already exists, it is overwritten with the new sstate file. Also change it so that the temporary file that is used is always removed, even if ln fails to link the sstate file to it. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie Signed-off-by: Anuj Mittal (cherry picked from commit b2a5d9bc61e0b2b7e0f187a262a514952ed30563) Signed-off-by: Anuj Mittal --- meta/classes/sstate.bbclass | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index da292259833..caa25815e04 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -827,14 +827,18 @@ sstate_create_package () { fi chmod 0664 $TFILE # Skip if it was already created by some other process - if [ ! -e ${SSTATE_PKG} ]; then + if [ -h ${SSTATE_PKG} ] && [ ! -e ${SSTATE_PKG} ]; then + # There is a symbolic link, but it links to nothing. + # Forcefully replace it with the new file. + ln -f $TFILE ${SSTATE_PKG} || true + elif [ ! -e ${SSTATE_PKG} ]; then # Move into place using ln to attempt an atomic op. # Abort if it already exists - ln $TFILE ${SSTATE_PKG} && rm $TFILE + ln $TFILE ${SSTATE_PKG} || true else - rm $TFILE + touch ${SSTATE_PKG} 2>/dev/null || true fi - touch ${SSTATE_PKG} 2>/dev/null || true + rm $TFILE } python sstate_sign_package () { @@ -864,7 +868,7 @@ python sstate_report_unihash() { sstate_unpack_package () { tar -xvzf ${SSTATE_PKG} # update .siginfo atime on local/NFS mirror if it is a symbolic link - [ ! -h ${SSTATE_PKG}.siginfo ] || touch -a ${SSTATE_PKG}.siginfo 2>/dev/null || true + [ ! -h ${SSTATE_PKG}.siginfo ] || [ ! -e ${SSTATE_PKG}.siginfo ] || touch -a ${SSTATE_PKG}.siginfo 2>/dev/null || true # update each symbolic link instead of any referenced file touch --no-dereference ${SSTATE_PKG} 2>/dev/null || true [ ! -e ${SSTATE_PKG}.sig ] || touch --no-dereference ${SSTATE_PKG}.sig 2>/dev/null || true From 61bb3c237303f9048b1c4e17eeaa629d985f6d9e Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 26 Jan 2022 22:55:30 -0500 Subject: [PATCH 006/108] linux-yocto/5.10: update to v5.10.92 Updating linux-yocto/5.10 to the latest korg -stable release that comprises the following commits: c982c1a83932 Linux 5.10.92 c0091233f3d8 staging: greybus: fix stack size warning with UBSAN 66d21c005d9b drm/i915: Avoid bitwise vs logical OR warning in snb_wm_latency_quirk() 2d4fda471dc3 staging: wlan-ng: Avoid bitwise vs logical OR warning in hfa384x_usb_throttlefn() 3609fed7ac8b media: Revert "media: uvcvideo: Set unique vdev name based in type" 9b3c761e78d5 random: fix crash on multiple early calls to add_bootloader_randomness() 61cca7d191c7 random: fix data race on crng init time 3de9478230c3 random: fix data race on crng_node_pool 43c494294f30 can: gs_usb: gs_can_start_xmit(): zero-initialize hf->{flags,reserved} 45221a57b609 can: isotp: convert struct tpcon::{idx,len} to unsigned int bd61ae808b15 can: gs_usb: fix use of uninitialized variable, detach device on reception of invalid USB data f68e60001735 mfd: intel-lpss: Fix too early PM enablement in the ACPI ->probe() 5f76445a31b7 veth: Do not record rx queue hint in veth_xmit ddfa53825f3d mmc: sdhci-pci: Add PCI ID for Intel ADL 2e691f9894cc ath11k: Fix buffer overflow when scanning with extraie a87cecf94375 USB: Fix "slab-out-of-bounds Write" bug in usb_hcd_poll_rh_status 15982330b61d USB: core: Fix bug in resuming hub's handling of wakeup requests 413108ce3b56 ARM: dts: exynos: Fix BCM4330 Bluetooth reset polarity in I9100 b6dd07023699 Bluetooth: bfusb: fix division by zero in send path 869e1677a058 Bluetooth: btusb: Add support for Foxconn QCA 0xe0d0 c20021ce945f Bluetooth: btusb: Add support for Foxconn MT7922A 83493918380f Bluetooth: btusb: Add two more Bluetooth parts for WCN6855 294c0dd80d8a Bluetooth: btusb: fix memory leak in btusb_mtk_submit_wmt_recv_urb() 35ab8c9085b0 bpf: Fix out of bounds access from invalid *_or_null type verification c84fbba8a945 workqueue: Fix unbind_workers() VS wq_worker_running() race c39d68ab3836 md: revert io stats accounting Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 35dfcd31518e66fc4dc1f2283bd3320f994c868b) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 6 ++--- .../linux/linux-yocto-tiny_5.10.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index ca7d5dd97cd..a1986adcd5d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "85c14e209f1ab7cee673735c4561e656b4e65217" -SRCREV_meta ?= "de35f8006d0f932924752ddda94dd24e2da67fbc" +SRCREV_machine ?= "73ddd15bb13083c63f183814223b1f064f707964" +SRCREV_meta ?= "940dd7a24ebe6ad709d6912a24660dadf34ece83" 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.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.91" +LINUX_VERSION ?= "5.10.92" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index dbfeea6c82b..13a1ec8cce9 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.91" +LINUX_VERSION ?= "5.10.92" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 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 ?= "2227ab16358ca3193f03d0cd8509092076aeffbb" -SRCREV_machine ?= "b3fdab7a9f3c11a61565cead0445883a61081583" -SRCREV_meta ?= "de35f8006d0f932924752ddda94dd24e2da67fbc" +SRCREV_machine_qemuarm ?= "05c74d1b7b9b5ce5b386e2dbb787f1b00bbfdcb8" +SRCREV_machine ?= "3c4b46871c0220942e07fc2c73ba94ac04b0d9ca" +SRCREV_meta ?= "940dd7a24ebe6ad709d6912a24660dadf34ece83" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 82dfb0f903f..827b5aa32ef 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "fb570663823bd492e4c8d4339be825bda4210dc6" -SRCREV_machine_qemuarm64 ?= "5a52b700c1693a95b8efa54cb65bec7807a75cd2" -SRCREV_machine_qemumips ?= "8eb8a801f5f4764c362aefd5e97e704755cf740b" -SRCREV_machine_qemuppc ?= "21b014e385a6b54a2fd7d667a1b556c69cda77de" -SRCREV_machine_qemuriscv64 ?= "77c8d144b066f69e009ce2ee540a593b11eb736a" -SRCREV_machine_qemuriscv32 ?= "77c8d144b066f69e009ce2ee540a593b11eb736a" -SRCREV_machine_qemux86 ?= "77c8d144b066f69e009ce2ee540a593b11eb736a" -SRCREV_machine_qemux86-64 ?= "77c8d144b066f69e009ce2ee540a593b11eb736a" -SRCREV_machine_qemumips64 ?= "5468343e50389dba73b5d441289d5094bd0dc9f0" -SRCREV_machine ?= "77c8d144b066f69e009ce2ee540a593b11eb736a" -SRCREV_meta ?= "de35f8006d0f932924752ddda94dd24e2da67fbc" +SRCREV_machine_qemuarm ?= "1e8e1a5927984c545448b4b15974addf670b0f5d" +SRCREV_machine_qemuarm64 ?= "c42d48cae11e605f70cfc6f64dbc23711bfbf8cf" +SRCREV_machine_qemumips ?= "0366c14c30f0ca1f9d4a793632ba9cdc86e7225e" +SRCREV_machine_qemuppc ?= "4570b1179fe4eda809fa2b89a06e6acf95e35fc8" +SRCREV_machine_qemuriscv64 ?= "b0f8d81ad4c501e24f062e080f38fb8a7873b68a" +SRCREV_machine_qemuriscv32 ?= "b0f8d81ad4c501e24f062e080f38fb8a7873b68a" +SRCREV_machine_qemux86 ?= "b0f8d81ad4c501e24f062e080f38fb8a7873b68a" +SRCREV_machine_qemux86-64 ?= "b0f8d81ad4c501e24f062e080f38fb8a7873b68a" +SRCREV_machine_qemumips64 ?= "f2a78b852f4afb30a5e453a8b1eac3e785cbfc39" +SRCREV_machine ?= "b0f8d81ad4c501e24f062e080f38fb8a7873b68a" +SRCREV_meta ?= "940dd7a24ebe6ad709d6912a24660dadf34ece83" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -32,7 +32,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.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.91" +LINUX_VERSION ?= "5.10.92" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From 8104d934d137bf94baab6f55cd970b6150e3eb85 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 26 Jan 2022 22:55:34 -0500 Subject: [PATCH 007/108] linux-yocto/5.10: update to v5.10.93 Updating linux-yocto/5.10 to the latest korg -stable release that comprises the following commits: fd187a492557 Linux 5.10.93 bed97c903621 mtd: fixup CFI on ixp4xx f50803b519c3 powerpc/pseries: Get entry and uaccess flush required bits from H_GET_CPU_CHARACTERISTICS 68c1aa82be00 ALSA: hda/realtek: Re-order quirk entries for Lenovo 4d15a17d065d ALSA: hda/realtek: Add quirk for Legion Y9000X 2020 d7b41464f1b7 ALSA: hda: ALC287: Add Lenovo IdeaPad Slim 9i 14ITL5 speaker quirk 87246ae94b73 ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master after reboot from Windows 9c27e513fb33 ALSA: hda/realtek: Add speaker fixup for some Yoga 15ITL5 devices 4c7fb4d519e5 KVM: x86: remove PMU FIXED_CTR3 from msrs_to_save_all 6b8c3a185377 firmware: qemu_fw_cfg: fix kobject leak in probe error path 889c73305b48 firmware: qemu_fw_cfg: fix NULL-pointer deref on duplicate entries ff9588cf1592 firmware: qemu_fw_cfg: fix sysfs information leak 358a4b054abe rtlwifi: rtl8192cu: Fix WARNING when calling local_irq_restore() with interrupts enabled 93c4506f9f8b media: uvcvideo: fix division by zero at stream start 4c3f70be6f3a video: vga16fb: Only probe for EGA and VGA 16 color graphic cards 161e43ab8cc1 9p: only copy valid iattrs in 9P2000.L setattr implementation 0e6c0f3f4055 KVM: s390: Clarify SIGP orders versus STOP/RESTART 413b427f5fff KVM: x86: Register Processor Trace interrupt hook iff PT enabled in guest 723acd75a062 perf: Protect perf_guest_cbs with RCU eadde287a62e vfs: fs_context: fix up param length parsing in legacy_parse_param c5f38277163e remoteproc: qcom: pil_info: Don't memcpy_toio more than is provided 5d88e24b23af orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc() 0084fefe2960 devtmpfs regression fix: reconfigure on each mount ee40594c95ae kbuild: Add $(KBUILD_HOSTLDFLAGS) to 'has_libelf' test Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 4f3dd05c163efe6da87a58ab9e1df61b83ed4444) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 6 ++--- .../linux/linux-yocto-tiny_5.10.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index a1986adcd5d..48d2694995e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "73ddd15bb13083c63f183814223b1f064f707964" -SRCREV_meta ?= "940dd7a24ebe6ad709d6912a24660dadf34ece83" +SRCREV_machine ?= "ba47a407fe04203adb0ab5e164597c958cd9e334" +SRCREV_meta ?= "7df27e6d296dfa16f289883c0661eed45059360c" 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.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.92" +LINUX_VERSION ?= "5.10.93" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 13a1ec8cce9..eb42c407fa4 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.92" +LINUX_VERSION ?= "5.10.93" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 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 ?= "05c74d1b7b9b5ce5b386e2dbb787f1b00bbfdcb8" -SRCREV_machine ?= "3c4b46871c0220942e07fc2c73ba94ac04b0d9ca" -SRCREV_meta ?= "940dd7a24ebe6ad709d6912a24660dadf34ece83" +SRCREV_machine_qemuarm ?= "ceb1f194e59c9dd3bdd83d51bb0994f3db23bf61" +SRCREV_machine ?= "878e5c1469550bb0f8778d16d4adbe7d48b0b28d" +SRCREV_meta ?= "7df27e6d296dfa16f289883c0661eed45059360c" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 827b5aa32ef..e67bf54c98b 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "1e8e1a5927984c545448b4b15974addf670b0f5d" -SRCREV_machine_qemuarm64 ?= "c42d48cae11e605f70cfc6f64dbc23711bfbf8cf" -SRCREV_machine_qemumips ?= "0366c14c30f0ca1f9d4a793632ba9cdc86e7225e" -SRCREV_machine_qemuppc ?= "4570b1179fe4eda809fa2b89a06e6acf95e35fc8" -SRCREV_machine_qemuriscv64 ?= "b0f8d81ad4c501e24f062e080f38fb8a7873b68a" -SRCREV_machine_qemuriscv32 ?= "b0f8d81ad4c501e24f062e080f38fb8a7873b68a" -SRCREV_machine_qemux86 ?= "b0f8d81ad4c501e24f062e080f38fb8a7873b68a" -SRCREV_machine_qemux86-64 ?= "b0f8d81ad4c501e24f062e080f38fb8a7873b68a" -SRCREV_machine_qemumips64 ?= "f2a78b852f4afb30a5e453a8b1eac3e785cbfc39" -SRCREV_machine ?= "b0f8d81ad4c501e24f062e080f38fb8a7873b68a" -SRCREV_meta ?= "940dd7a24ebe6ad709d6912a24660dadf34ece83" +SRCREV_machine_qemuarm ?= "50c0e06718fb2b264619ce8d82608877d1e62a81" +SRCREV_machine_qemuarm64 ?= "7907c5eb81e9a51307b5269d546999ebf47d9d59" +SRCREV_machine_qemumips ?= "e9c51de36554662082afc08c6e54599b310c7951" +SRCREV_machine_qemuppc ?= "77f361ea5eb293dcfe122ecb65f33ba32fd12501" +SRCREV_machine_qemuriscv64 ?= "a1bbb29fe30c94c21309aa8b8c0d06fa12f3368d" +SRCREV_machine_qemuriscv32 ?= "a1bbb29fe30c94c21309aa8b8c0d06fa12f3368d" +SRCREV_machine_qemux86 ?= "a1bbb29fe30c94c21309aa8b8c0d06fa12f3368d" +SRCREV_machine_qemux86-64 ?= "a1bbb29fe30c94c21309aa8b8c0d06fa12f3368d" +SRCREV_machine_qemumips64 ?= "b668a352c94a8c29e585608e8302cacb1350f5ed" +SRCREV_machine ?= "a1bbb29fe30c94c21309aa8b8c0d06fa12f3368d" +SRCREV_meta ?= "7df27e6d296dfa16f289883c0661eed45059360c" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -32,7 +32,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.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.92" +LINUX_VERSION ?= "5.10.93" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From c51ace400d3c59b13aaba0c46831ca64ee47e8c2 Mon Sep 17 00:00:00 2001 From: Rudolf J Streif Date: Wed, 26 Jan 2022 10:39:00 -0800 Subject: [PATCH 008/108] linux-firmware: Add CLM blob to linux-firmware-bcm4373 package The Country Local Matrix (CLM) blob brcmfmac4373-sdio.clm_blob was not included with the files for the linux-firmware-bcm4373 package but instead packaged with linux-firmware. Signed-off-by: Rudolf J Streif Signed-off-by: Richard Purdie (cherry picked from commit 18ba64d4a12e7275381cf34fe72b757accbb1544) Signed-off-by: Anuj Mittal (cherry picked from commit 289a849f8f639cd2546153827fc265a9409f5538) Signed-off-by: Anuj Mittal --- meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb index 92b6ff51575..07389f69822 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb @@ -751,6 +751,7 @@ FILES_${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pc FILES_${PN}-bcm4373 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.bin \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac4373.bin \ ${nonarch_base_libdir}/firmware/cypress/cyfmac4373-sdio.bin \ + ${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.clm_blob \ " LICENSE_${PN}-bcm-0bb4-0306 = "Firmware-cypress" From 606924b7bc751741c58aaf2ba60639612b113fcd Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 24 Jan 2022 16:25:43 +0000 Subject: [PATCH 009/108] yocto-check-layer: add debug output for the layers that were found When debugging weird yocto-check-layer output it is useful to know what the tool found when looking for layers. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 711e2d4d7baf36f8497741c14268d7f72d0db016) Signed-off-by: Anuj Mittal (cherry picked from commit 6ff05fe05a23d4355c3a33a03350dea025133689) Signed-off-by: Anuj Mittal --- scripts/yocto-check-layer | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/yocto-check-layer b/scripts/yocto-check-layer index 6975b095029..00a16d18fc9 100755 --- a/scripts/yocto-check-layer +++ b/scripts/yocto-check-layer @@ -41,6 +41,12 @@ def test_layer(td, layer, test_software_layer_signatures): tc.loadTests(CASES_PATHS) return tc.runTests() +def dump_layer_debug(layer): + logger.debug("Found layer %s (%s)" % (layer["name"], layer["path"])) + collections = layer.get("collections", {}) + if collections: + logger.debug("%s collections: %s" % (layer["name"], ", ".join(collections))) + def main(): parser = argparse.ArgumentParser( description="Yocto Project layer checking tool", @@ -106,6 +112,13 @@ def main(): else: dep_layers = layers + logger.debug("Found additional layers:") + for l in additional_layers: + dump_layer_debug(l) + logger.debug("Found dependency layers:") + for l in dep_layers: + dump_layer_debug(l) + logger.info("Detected layers:") for layer in layers: if layer['type'] == LayerType.ERROR_BSP_DISTRO: From da945043aef07a77be8d6663d419b5c690997688 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 27 Jan 2022 11:20:04 +0100 Subject: [PATCH 010/108] libusb1: correct SRC_URI Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit d4c37ca1f1e97d53045521e9894dc9ed5b1c22a1) Signed-off-by: Anuj Mittal (cherry picked from commit 0fccab0724769a862e31e635ffa1db3ba2f37312) Signed-off-by: Anuj Mittal --- meta/recipes-support/libusb/libusb1_1.0.24.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libusb/libusb1_1.0.24.bb b/meta/recipes-support/libusb/libusb1_1.0.24.bb index 92e66b1b160..76a707b70f5 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.24.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.24.bb @@ -1,7 +1,7 @@ SUMMARY = "Userspace library to access USB (version 1.0)" DESCRIPTION = "A cross-platform library to access USB devices from Linux, \ macOS, Windows, OpenBSD/NetBSD, Haiku and Solaris userspace." -HOMEPAGE = "http://libusb.sf.net" +HOMEPAGE = "https://libusb.info" BUGTRACKER = "http://www.libusb.org/report" SECTION = "libs" @@ -10,10 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" BBCLASSEXTEND = "native nativesdk" -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ +SRC_URI = "https://github.com/libusb/libusb/releases/download/v${PV}/libusb-${PV}.tar.bz2 \ file://run-ptest \ " +UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb/releases" + SRC_URI[sha256sum] = "7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a" S = "${WORKDIR}/libusb-${PV}" From 8a50809a0e54c66a8a7aafb1b9bffbec009f8c57 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Mon, 31 Jan 2022 07:08:36 -1000 Subject: [PATCH 011/108] expat: fix CVE-2022-23852 Expat (aka libexpat) before 2.4.4 has a signed integer overflow in XML_GetBuffer for configurations with a nonzero XML_CONTEXT_BYTES. Backport patch from: https://github.com/libexpat/libexpat/commit/847a645152f5ebc10ac63b74b604d0c1a79fae40 CVE: CVE-2022-23852 Signed-off-by: Steve Sakoman (cherry picked from commit af81bb9d10c0f1e9dcaffc1bbc18ef780eea7127) Signed-off-by: Anuj Mittal --- .../expat/expat/CVE-2022-23852.patch | 33 +++++++++++++++++++ meta/recipes-core/expat/expat_2.2.10.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-core/expat/expat/CVE-2022-23852.patch diff --git a/meta/recipes-core/expat/expat/CVE-2022-23852.patch b/meta/recipes-core/expat/expat/CVE-2022-23852.patch new file mode 100644 index 00000000000..41425c108be --- /dev/null +++ b/meta/recipes-core/expat/expat/CVE-2022-23852.patch @@ -0,0 +1,33 @@ +From 847a645152f5ebc10ac63b74b604d0c1a79fae40 Mon Sep 17 00:00:00 2001 +From: Samanta Navarro +Date: Sat, 22 Jan 2022 17:48:00 +0100 +Subject: [PATCH] lib: Detect and prevent integer overflow in XML_GetBuffer + (CVE-2022-23852) + +Upstream-Status: Backport: +https://github.com/libexpat/libexpat/commit/847a645152f5ebc10ac63b74b604d0c1a79fae40 + +CVE: CVE-2022-23852 + +Signed-off-by: Steve Sakoman + +--- + expat/lib/xmlparse.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c +index d54af683..5ce31402 100644 +--- a/lib/xmlparse.c ++++ b/lib/xmlparse.c +@@ -2067,6 +2067,11 @@ XML_GetBuffer(XML_Parser parser, int len) { + keep = (int)EXPAT_SAFE_PTR_DIFF(parser->m_bufferPtr, parser->m_buffer); + if (keep > XML_CONTEXT_BYTES) + keep = XML_CONTEXT_BYTES; ++ /* Detect and prevent integer overflow */ ++ if (keep > INT_MAX - neededSize) { ++ parser->m_errorCode = XML_ERROR_NO_MEMORY; ++ return NULL; ++ } + neededSize += keep; + #endif /* defined XML_CONTEXT_BYTES */ + if (neededSize diff --git a/meta/recipes-core/expat/expat_2.2.10.bb b/meta/recipes-core/expat/expat_2.2.10.bb index e5415361d85..074441dc2a3 100644 --- a/meta/recipes-core/expat/expat_2.2.10.bb +++ b/meta/recipes-core/expat/expat_2.2.10.bb @@ -15,6 +15,7 @@ SRC_URI = "https://github.com/libexpat/libexpat/releases/download/R_${VERSION_TA file://CVE-2022-22822-27.patch \ file://CVE-2021-45960.patch \ file://CVE-2021-46143.patch \ + file://CVE-2022-23852.patch \ " UPSTREAM_CHECK_URI = "https://github.com/libexpat/libexpat/releases/" From a32cee6c9e1ff53e424b8386c36555e6cf3bf3af Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Mon, 31 Jan 2022 07:15:20 -1000 Subject: [PATCH 012/108] expat: add missing Upstream-status, CVE tag and sign-off to CVE-2021-46143.patch Signed-off-by: Steve Sakoman (cherry picked from commit 7e33aa25acc0c29b8f5e78757c6557e614eb1434) Signed-off-by: Anuj Mittal --- meta/recipes-core/expat/expat/CVE-2021-46143.patch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-core/expat/expat/CVE-2021-46143.patch b/meta/recipes-core/expat/expat/CVE-2021-46143.patch index d6bafba0ffb..b1a726d9a8c 100644 --- a/meta/recipes-core/expat/expat/CVE-2021-46143.patch +++ b/meta/recipes-core/expat/expat/CVE-2021-46143.patch @@ -4,6 +4,12 @@ Date: Sat, 25 Dec 2021 20:52:08 +0100 Subject: [PATCH] lib: Prevent integer overflow on m_groupSize in function doProlog (CVE-2021-46143) +Upstream-Status: Backport: +https://github.com/libexpat/libexpat/pull/538/commits/85ae9a2d7d0e9358f356b33977b842df8ebaec2b + +CVE: CVE-2021-46143 + +Signed-off-by: Steve Sakoman --- expat/lib/xmlparse.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) From d57b748ef22d75b863356a97bfc585e1e967a44a Mon Sep 17 00:00:00 2001 From: Christian Eggers Date: Mon, 14 Feb 2022 11:50:20 +0100 Subject: [PATCH 013/108] sdk: fix search for dynamic loader if the package "nativesdk-glibc-dbg" is installed as part of the SDK, the existing search expression finds two files: $OECORE_NATIVE_SYSROOT/lib/.debug/ld-linux-x86-64.so.2 $OECORE_NATIVE_SYSROOT/lib/ld-linux-x86-64.so.2 The generated relocate_sdk.sh shell script contains then an extra newline and segfaults during SDK relocation. Limit the search depth to 1, to avoid finding the file in the .debug directory. Signed-off-by: Christian Eggers Signed-off-by: Richard Purdie Signed-off-by: Anuj Mittal --- meta/files/toolchain-shar-relocate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh index 3ece04db0a4..cee9adbf399 100644 --- a/meta/files/toolchain-shar-relocate.sh +++ b/meta/files/toolchain-shar-relocate.sh @@ -5,7 +5,7 @@ fi # fix dynamic loader paths in all ELF SDK binaries native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"') -dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*") +dl_path=$($SUDO_EXEC find $native_sysroot/lib -maxdepth 1 -name "ld-linux*") if [ "$dl_path" = "" ] ; then echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!" exit 1 From d5bdff460cc8b0f38177f1f38d625eeda729b459 Mon Sep 17 00:00:00 2001 From: Pgowda Date: Sat, 29 Jan 2022 22:20:39 -0800 Subject: [PATCH 014/108] glibc: upgrade glibc-2.33 to latest version glibc-2.33 has been upgraded to latest version that includes many CVE and other bug fixes. Ran the regressions and results are better. Signed-off-by: pgowda Signed-off-by: Anuj Mittal --- meta/recipes-core/glibc/glibc-version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index 63241ee951f..e1eefdee49c 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ SRCBRANCH ?= "release/2.33/master" PV = "2.33" -SRCREV_glibc ?= "55b99e9ed07688019609bd4dcd17d3ebf4572948" +SRCREV_glibc ?= "3e2a15c666e40e5ee740e5079c56d83469280323" SRCREV_localedef ?= "bd644c9e6f3e20c5504da1488448173c69c56c28" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" From 5e5874d9b8f954771edb4ee3725bb31c1c5a70f2 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 3 Feb 2022 11:43:48 -0800 Subject: [PATCH 015/108] recipetool: Fix circular reference in SRC_URI When creating a new recipe.bb file for a binary, don't use BP which includes the version information, instead use BPN which is just the name base Package Name. Since PB is not specified, it takes the default: PV = "1.0+git${SRCPV}" But SRCPV is defined in terms of the SRC_URI, which leads to infinite recursion (traceback below). Here are the pertinent variables which cause the recursion: SRC_URI = "git://github.com/lvc/abi-dumper;protocol=https;subdir=${BP}" BP = "${BPN}-${PV}" PV = "1.0+git${SRCPV}" SRCPV = "${@bb.fetch2.get_srcrev(d)}" def get_srcrev(d, method_name='sortable_revision'): # ... trimmed scms = [] fetcher = Fetch(d.getVar('SRC_URI').split(), d) # ... trimmed [YOCTO #14040] Signed-off-by: Saul Wold Signed-off-by: Richard Purdie (cherry picked from commit 3b8d43fc53ee13d39abc3b2a1f706a97fcf752aa) Signed-off-by: Anuj Mittal --- scripts/lib/recipetool/create.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index e8e71fabfd8..b9f9c80367c 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py @@ -435,7 +435,7 @@ def create_recipe(args): if args.binary: # Assume the archive contains the directory structure verbatim # so we need to extract to a subdirectory - fetchuri += ';subdir=${BP}' + fetchuri += ';subdir=${BPN}' srcuri = fetchuri rev_re = re.compile(';rev=([^;]+)') res = rev_re.search(srcuri) From a94191274ae84dae7facc8d161f34270a42b304b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20M=C3=BCller?= Date: Wed, 2 Feb 2022 17:18:05 +0000 Subject: [PATCH 016/108] scripts/runqemu-ifdown: Don't treat the last iptables command as special MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The runqemu-ifup script performs a bunch of setup steps that runqemu-ifdown attempts to undo later on. While a bunch of said setup operations are considered fatal should they fail, the iptables based NAT setup notably is not. The tear down procedure in runqemu-ifdown, however, has the iptables based tear down as the last operation, with the status of it determining the overall status of the script. Hence, if this step fails, the script is considered a failure overall. That is arguably inconsistent: If the NAT setup did not succeed, the tear down cannot succeed either. To ensure similarity of the two paths, let's not treat the last iptables tear down operation any special and allow it to fail the runqemu-ifdown script, but just ignore failures. Background: we have seen a NAT related setup problem on the ifup path (which didn't cause script failure), but then saw an issue bubbled up when this operation was meant to be undone on the ifdown path. Signed-off-by: Daniel Müller Signed-off-by: Richard Purdie (cherry picked from commit 0ebcfb034bcad81efef5f746f0aa0b69772901a0) Signed-off-by: Anuj Mittal --- scripts/runqemu-ifdown | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/runqemu-ifdown b/scripts/runqemu-ifdown index a104c37bf8b..e0eb5344c69 100755 --- a/scripts/runqemu-ifdown +++ b/scripts/runqemu-ifdown @@ -64,3 +64,4 @@ n=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ] dest=$[ (`echo $TAP | sed 's/tap//'` * 2) + 2 ] $IPTABLES -D POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$n/32 $IPTABLES -D POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$dest/32 +true From 113b21fd3edc599c280f34875ca1477606424eec Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Wed, 2 Feb 2022 08:35:23 +0100 Subject: [PATCH 017/108] cve-check: create directory of CVE_CHECK_MANIFEST before copy Create directory of the CVE_CHECK_MANIFEST variable before copy to it, so that the variable can use an arbitrary directory name. Signed-off-by: Stefan Herbrechtsmeier Signed-off-by: Richard Purdie (cherry picked from commit 9829c16301bf2dce39fa046401a984f112fa0322) Signed-off-by: Anuj Mittal --- meta/classes/cve-check.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 3add826fca2..a95e8106058 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -143,6 +143,7 @@ python cve_check_write_rootfs_manifest () { manifest_name = d.getVar("CVE_CHECK_MANIFEST") cve_tmp_file = d.getVar("CVE_CHECK_TMP_FILE") + bb.utils.mkdirhier(os.path.dirname(manifest_name)) shutil.copyfile(cve_tmp_file, manifest_name) if manifest_name and os.path.exists(manifest_name): From 5e9acfd90afd80bb2188e5e4e93ee786c41714e7 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 3 Feb 2022 23:16:33 -0500 Subject: [PATCH 018/108] linux-yocto/5.10: update to v5.10.96 Updating linux-yocto/5.10 to the latest korg -stable release that comprises the following commits: f255ac9e8776 Linux 5.10.96 b43e9d2f6fc7 mtd: rawnand: mpc5121: Remove unused variable in ads5121_select_chip() b63e120189fd block: Fix wrong offset in bio_truncate() 0b4e82403c84 fsnotify: invalidate dcache before IN_DELETE event 8bae6db29c7f usr/include/Makefile: add linux/nfc.h to the compile-test coverage f36554de7897 dt-bindings: can: tcan4x5x: fix mram-cfg RX FIFO config 446ff1fc37c7 net: bridge: vlan: fix memory leak in __allowed_ingress bc58a5bb9e6c ipv4: remove sparse error in ip_neigh_gw4() ebc5b8e471e5 ipv4: tcp: send zero IPID in SYNACK messages 58f72918f942 ipv4: raw: lock the socket in raw_bind() 9ffc94a81b0f net: bridge: vlan: fix single net device option dumping 869f1704f1c2 Revert "ipv6: Honor all IPv6 PIO Valid Lifetime values" 699eef4ed910 net: hns3: handle empty unknown interrupt for VF c9c81b393c74 net: cpsw: Properly initialise struct page_pool_params 729e54636b3e yam: fix a memory leak in yam_siocdevprivate() 93a6e920d8cc drm/msm/dpu: invalid parameter check in dpu_setup_dspp_pcc 0b7d8db87d0b drm/msm/hdmi: Fix missing put_device() call in msm_hdmi_get_phy d1d4616d3e75 video: hyperv_fb: Fix validation of screen resolution 0a60d04abc62 ibmvnic: don't spin in tasklet 55258b505996 ibmvnic: init ->running_cap_crqs early b469cf91fb63 ipv4: fix ip option filtering for locally generated fragments 9b4444197252 net: ipv4: Fix the warning for dereference 2f56c4845df9 net: ipv4: Move ip_options_fragment() out of loop 55402a461872 powerpc/perf: Fix power_pmu_disable to call clear_pmi_irq_pending only if PMI is pending 0bdbf93ee253 hwmon: (lm90) Mark alert as broken for MAX6654 c534287a57dc efi/libstub: arm64: Fix image check alignment at entry 3572205b194c rxrpc: Adjust retransmission backoff 5067f5699de7 octeontx2-pf: Forward error codes to VF bd024e36f681 phylib: fix potential use-after-free a839a79f4d6b net: phy: broadcom: hook up soft_reset for BCM54616S 57b2f3632b2f sched/pelt: Relax the sync of util_sum with util_avg 91b04e83c710 perf: Fix perf_event_read_local() time cffed7e631b5 kernel: delete repeated words in comments 1af995c98b81 netfilter: conntrack: don't increment invalid counter on NF_REPEAT 129c71829d7f powerpc64/bpf: Limit 'ldbrx' to processors compliant with ISA v2.06 7a32824f7a9c NFS: Ensure the server has an up to date ctime before renaming 666f6ab882ea NFS: Ensure the server has an up to date ctime before hardlinking 4cd0ef621509 ipv6: annotate accesses to fn->fn_sernum 79c0b5287ded drm/msm/dsi: invalid parameter check in msm_dsi_phy_enable 3ab44a408bba drm/msm/dsi: Fix missing put_device() call in dsi_get_phy 82c310d04b0f drm/msm: Fix wrong size calculation f57a99c9a55c net-procfs: show net devices bound packet types 87880e3803ce NFSv4: nfs_atomic_open() can race when looking up a non-regular file ce8c552b88ca NFSv4: Handle case where the lookup of a directory fails b48a05cee2c0 hwmon: (lm90) Reduce maximum conversion rate for G781 b26fed25e67b ipv4: avoid using shared IP generator for connected sockets 283aa5a5afbc ping: fix the sk_bound_dev_if match in ping_lookup 7bcb0c19abf4 hwmon: (lm90) Mark alert as broken for MAX6680 925cbd596aa2 hwmon: (lm90) Mark alert as broken for MAX6646/6647/6649 db044d97460e net: fix information leakage in /proc/net/ptype feb770cc00a8 ipv6_tunnel: Rate limit warning messages 00849de10f79 scsi: bnx2fc: Flush destroy_work queue before calling bnx2fc_interface_put() fcaf94c49a84 rpmsg: char: Fix race between the release of rpmsg_eptdev and cdev 1dbb206730f3 rpmsg: char: Fix race between the release of rpmsg_ctrldev and cdev 20f667582189 usb: roles: fix include/linux/usb/role.h compile issue 6aeff8a7c742 i40e: fix unsigned stat widths d2ed5997a94b i40e: Fix for failed to init adminq while VF reset 768eb705e638 i40e: Fix queues reservation for XDP 39896710f732 i40e: Fix issue when maximum queues is exceeded 9068bcb2195b i40e: Increase delay to 1 s after global EMP reset b4c9b6afa3a7 powerpc/32: Fix boot failure with GCC latent entropy plugin 50f5d0a8bd0e powerpc/32s: Fix kasan_init_region() for KASAN 5d3af1dfdf0f powerpc/32s: Allocate one 256k IBAT instead of two consecutives 128k IBATs 08f090bb9b69 x86/MCE/AMD: Allow thresholding interface updates after init 791e5d5daa2c sched/membarrier: Fix membarrier-rseq fence command missing from query bitmask afbde455ebf4 ocfs2: fix a deadlock when commit trans 97f75e7d4c30 jbd2: export jbd2_journal_[grab|put]_journal_head 3921d081c9c3 ucsi_ccg: Check DEV_INT bit only when starting CCG4 598a884c772c usb: typec: tcpm: Do not disconnect while receiving VBUS off e3b131e30e61 USB: core: Fix hang in usb_kill_urb by adding memory barriers 3ca928c82427 usb: gadget: f_sourcesink: Fix isoc transfer for USB_SPEED_SUPER_PLUS 053274bc6baa usb: common: ulpi: Fix crash in ulpi_match() 20c51a4c5220 usb: xhci-plat: fix crash when suspend if remote wake enable 38d1bf67a310 usb-storage: Add unusual-devs entry for VL817 USB-SATA bridge e0fcae7bd72b tty: Add support for Brainboxes UC cards. 7079283d32a2 tty: n_gsm: fix SW flow control encoding/handling 2683b0d5d7d5 serial: stm32: fix software flow control transfer 4628b26df51c serial: 8250: of: Fix mapped region size when using reg-offset property 94b23988c305 netfilter: nft_payload: do not update layer 4 checksum when mangling fragments bf0d4ae5c6c2 arm64: errata: Fix exec handling in erratum 1418040 workaround e92cac1dd803 KVM: x86: Update vCPU's runtime CPUID on write to MSR_IA32_XSS 6b55af102b39 drm/etnaviv: relax submit size limits 7a32d17fb73a perf/x86/intel/uncore: Fix CAS_COUNT_WRITE issue for ICX a2c8e1d9e41b Revert "KVM: SVM: avoid infinite loop on NPF from bad address" abae88fb37bf fsnotify: fix fsnotify hooks in pseudo filesystems 6ceac38e9b0c ceph: set pool_ns in new inode layout for async creates e7be12ca7d39 ceph: properly put ceph_string reference after async create attempt 39986696fef5 tracing: Don't inc err_log entry count if entry allocation fails d71b06aa9950 tracing/histogram: Fix a potential memory leak for kstrdup() 561a22d44acc PM: wakeup: simplify the output logic of pm_show_wakelocks() b0f1cc093bc2 efi: runtime: avoid EFIv2 runtime services on Apple x86 machines de7cc8bcca90 udf: Fix NULL ptr deref when converting from inline format 0a3cfd258923 udf: Restore i_lenAlloc when inode expansion fails f08801252d26 scsi: zfcp: Fix failed recovery on gone remote port with non-NPIV FCP devices ff6bdc205fd0 bpf: Guard against accessing NULL pt_regs in bpf_get_task_stack() 6520fedfcebb s390/hypfs: include z/VM guests with access control group set c10e0627c71c s390/module: fix loading modules with a lot of relocations ba7c71a777c1 net: stmmac: skip only stmmac_ptp_register when resume from suspend 11191406f2f1 net: sfp: ignore disabled SFP node e651772adced media: venus: core: Drop second v4l2 device unregister 83d5196b65d1 Bluetooth: refactor malicious adv data check 77656fde3c01 Linux 5.10.95 ae2b20f27732 drm/vmwgfx: Fix stale file descriptors on failed usercopy 11ba2c6dfb90 select: Fix indefinitely sleeping task in poll_schedule_timeout() a447d7f786ec KVM: x86/mmu: Fix write-protection of PTs mapped by the TDP MMU 12d3389b7af6 rcu: Tighten rcu_advance_cbs_nowake() checks 4d63363c88e3 bnx2x: Invalidate fastpath HSI version for VFs fdcfabd0952d bnx2x: Utilize firmware 7.13.21.0 6a6acf927895 drm/i915: Flush TLBs before releasing backing store c525532e4f87 Linux 5.10.94 c76c132444df scripts: sphinx-pre-install: Fix ctex support on Debian 133cef0b6154 scripts: sphinx-pre-install: add required ctex dependency 15ce9329a532 ath10k: Fix the MTU size on QCA9377 SDIO 25b1a6d33039 mtd: nand: bbt: Fix corner case in bad block table handling 8104e589fa4a lib/test_meminit: destroy cache in kmem_cache_alloc_bulk() test 629250370052 mm/hmm.c: allow VM_MIXEDMAP to work with hmm_range_fault 33bb7f027b06 lib82596: Fix IRQ check in sni_82596_probe 078b5a4498e0 scripts/dtc: dtx_diff: remove broken example from help text 21513c461557 dt-bindings: watchdog: Require samsung,syscon-phandle for Exynos7 23bcf3615be7 dt-bindings: display: meson-vpu: Add missing amlogic,canvas property 66467cc87a35 dt-bindings: display: meson-dw-hdmi: add missing sound-name-prefix property 4496e4a427a0 net: mscc: ocelot: fix using match before it is set ee64479c9ce6 net: sfp: fix high power modules without diagnostic monitoring 819e76bc572e net: ethernet: mtk_eth_soc: fix error checking in mtk_mac_config() 4691c9f047a8 bcmgenet: add WOL IRQ check 6973b38b9dba net_sched: restore "mpu xxx" handling 20949c381646 net: bonding: fix bond_xmit_broadcast return value error bug 799730d182d1 arm64: dts: qcom: msm8996: drop not documented adreno properties f6d4c0e017ec devlink: Remove misleading internal_flags from health reporter dump 2e51a761b7ab perf probe: Fix ppc64 'perf probe add events failed' case 59b44f77601d dmaengine: at_xdmac: Fix at_xdmac_lld struct definition 0078f053714d dmaengine: at_xdmac: Fix lld view setting 7ab120636d4e dmaengine: at_xdmac: Fix concurrency over xfers_list b5b27c5e3315 dmaengine: at_xdmac: Print debug message after realeasing the lock c536b351a75f dmaengine: at_xdmac: Start transfer for cyclic channels in issue_pending cd22e22e8eac dmaengine: at_xdmac: Don't start transactions at tx_submit level 68a83051c8b1 perf script: Fix hex dump character output 7b9d40e9f60d libcxgb: Don't accidentally set RTO_ONLINK in cxgb_find_route() cd5c24d2230f gre: Don't accidentally set RTO_ONLINK in gre_fill_metadata_dst() 7f2ca96bd266 xfrm: Don't accidentally set RTO_ONLINK in decode_session4() 2b1415c60b2e netns: add schedule point in ops_exit_list() edc09548ffc5 inet: frags: annotate races around fqdir->dead and fqdir->high_thresh 69e7e979ed66 taskstats: Cleanup the use of task->exit_code 56daa21414e9 virtio_ring: mark ring unused on error 0c4ebcb00d88 vdpa/mlx5: Fix wrong configuration of virtio_version_1_0 c736ec01a2fc rtc: pxa: fix null pointer dereference 8b8ff4c793ee HID: vivaldi: fix handling devices not using numbered reports d7544cf6939c net: axienet: increase default TX ring size to 128 557829d42d1f net: axienet: fix for TX busy handling 41831d496772 net: axienet: fix number of TX ring slots for available check 6301f3566aef net: axienet: Fix TX ring slot available check 7a3d3d7f6d7b net: axienet: limit minimum TX ring size 2f548489d64d net: axienet: add missing memory barriers bcc5d57e6091 net: axienet: reset core on initialization prior to MDIO access 46c0ccaff285 net: axienet: Wait for PhyRstCmplt after core reset 34942a228aec net: axienet: increase reset timeout a66b9bccf732 net/smc: Fix hung_task when removing SMC-R devices 51b52cf35485 clk: si5341: Fix clock HW provider cleanup fe40f7aef387 clk: Emit a stern warning with writable debugfs enabled 38221afa03af af_unix: annote lockless accesses to unix_tot_inflight & gc_in_progress a49e402f2309 f2fs: fix to reserve space for IO align feature 39ad0581176d f2fs: compress: fix potential deadlock of compress file e1840365ed4f parisc: pdc_stable: Fix memory leak in pdcs_register_pathentries d806eb5f4e23 net/fsl: xgmac_mdio: Fix incorrect iounmap when removing module 38c798384b90 net/fsl: xgmac_mdio: Add workaround for erratum A-009885 734f4b0f831e ipv4: avoid quadratic behavior in netns dismantle 86f0587f7432 ipv4: update fib_info_cnt under spinlock protection 10e99ae9b5da perf evsel: Override attr->sample_period for non-libpfm4 events 58fa3e900255 xdp: check prog type before updating BPF link 38ee417f59c8 bpftool: Remove inclusion of utilities.mak from Makefiles 2bcab471a26f block: Fix fsync always failed if once failed 5e59f885353e powerpc/fsl/dts: Enable WA for erratum A-009885 on fman3l MDIO buses 19aaef651948 powerpc/cell: Fix clang -Wimplicit-fallthrough warning 4cb7aba1e086 Revert "net/mlx5: Add retry mechanism to the command entry index allocation" 78cf5f63a3a9 dmaengine: stm32-mdma: fix STM32_MDMA_CTBR_TSEL_MASK 16ad0aa917c9 RDMA/rxe: Fix a typo in opcode name 885860717c29 RDMA/hns: Modify the mapping attribute of doorbell to device 57cd8597c3ef dmaengine: uniphier-xdmac: Fix type of address variables 4fe77b7cd272 scsi: core: Show SCMD_LAST in text form b30240911da4 Bluetooth: hci_sync: Fix not setting adv set duration 55698d11c8da Documentation: fix firewire.rst ABI file path error 5d38cbf66dd7 Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization abecf9d74836 Documentation: ACPI: Fix data node reference documentation d1e85fcd73b5 Documentation: dmaengine: Correctly describe dmatest with channel unset f6736bd81db4 media: correct MEDIA_TEST_SUPPORT help text 55b10b88ac86 drm/vc4: hdmi: Make sure the device is powered with CEC 81ac08a800b0 media: rcar-csi2: Optimize the selection PHTW register 0baa3729d2eb can: mcp251xfd: mcp251xfd_tef_obj_read(): fix typo in error message f62bf6ee4fa3 firmware: Update Kconfig help text for Google firmware 12224c0d19f3 of: base: Improve argument length mismatch error 7bb99c7e13f8 drm/radeon: fix error handling in radeon_driver_open_kms 0ca7ec6db20c ext4: don't use the orphan list when migrating an inode 679fb065326b ext4: fix null-ptr-deref in '__ext4_journal_ensure_credits' d60e9daba29e ext4: destroy ext4_fc_dentry_cachep kmemcache on module removal f26b24b4c115 ext4: fast commit may miss tracking unwritten range during ftruncate 04b562730677 ext4: use ext4_ext_remove_space() for fast commit replay delete range 53998b3f6dcd ext4: Fix BUG_ON in ext4_bread when write quota data da364ab35892 ext4: set csum seed in tmp inode while migrating to extents e4221629d5e1 ext4: fix fast commit may miss tracking range for FALLOC_FL_ZERO_RANGE 720508dd118d ext4: initialize err_blk before calling __ext4_get_inode_loc f9ed0ea0a9fc ext4: fix a possible ABBA deadlock due to busy PA 115b762b48ab ext4: make sure quota gets properly shutdown on error 762e4c33e9e5 ext4: make sure to reset inode lockdep class when quota enabling fails f8c3ec2e21b9 btrfs: respect the max size in the header when activating swap file e7764bccae77 btrfs: check the root node for uptodate before returning it 09e0ef287e93 btrfs: fix deadlock between quota enable and other quota operations 56f974d583fc xfrm: fix policy lookup for ipv6 gre packets 84166c1177f3 PCI: pci-bridge-emul: Set PCI_STATUS_CAP_LIST for PCIe device 7aeeb9fe9ca0 PCI: pci-bridge-emul: Correctly set PCIe capabilities af1d0acdaca7 PCI: pci-bridge-emul: Fix definitions of reserved bits 0f2ae6691e73 PCI: pci-bridge-emul: Properly mark reserved PCIe bits in PCI config space 2a0d437d8a76 PCI: pci-bridge-emul: Make expansion ROM Base Address register read-only def2825b09ec PCI: pciehp: Use down_read/write_nested(reset_lock) to fix lockdep errors 6cbe8f8deb62 PCI: xgene: Fix IB window setup e09f47e77b6e powerpc/64s/radix: Fix huge vmap false positive eb44b1386af5 parisc: Fix lpa and lpa_user defines 9b78ee2341d4 drm/bridge: analogix_dp: Make PSR-exit block less 8cbbf4a6f1ac drm/nouveau/kms/nv04: use vzalloc for nv04_display 605583fcccb5 drm/etnaviv: limit submit sizes 6c1e3d8b1bff device property: Fix fwnode_graph_devcon_match() fwnode leak ecb71f7bd584 s390/mm: fix 2KB pgtable release race 798754ba48b7 iwlwifi: mvm: Increase the scan timeout guard to 30 seconds c524f4cfb3e5 tracing/kprobes: 'nmissed' not showed correctly for kretprobe b72075e395b3 cputime, cpuacct: Include guest time in user time in cpuacct.stat 13518f058fde serial: Fix incorrect rs485 polarity on uart open 9668cf9e4af0 fuse: Pass correct lend value to filemap_write_and_wait_range() 9fbaddd783fd xen/gntdev: fix unmap notification order 67b078d996f7 spi: uniphier: Fix a bug that doesn't point to private data correctly 05026c4e94c9 tpm: fix NPE on probe for missing device 76006d33f1c8 ubifs: Error path in ubifs_remount_rw() seems to wrongly free write buffers 4f0762ac32b5 crypto: caam - replace this_cpu_ptr with raw_cpu_ptr 9e6ff2d5725b crypto: stm32/crc32 - Fix kernel BUG triggered in probe() 2031e0246e45 crypto: omap-aes - Fix broken pm_runtime_and_get() usage 43e94431c313 rpmsg: core: Clean up resources on announce_create failure. 082ff9e12b4a phy: mediatek: Fix missing check in mtk_mipi_tx_probe ff08cf1e34a1 ASoC: mediatek: mt8183: fix device_node leak f28672eef4a9 ASoC: mediatek: mt8173: fix device_node leak 0df51040089d scsi: sr: Don't use GFP_DMA de9a936b04c5 MIPS: Octeon: Fix build errors using clang da7df943e254 i2c: designware-pci: Fix to change data types of hcnt and lcnt parameters f09f7ccb28bb irqchip/gic-v4: Disable redistributors' view of the VPE table at boot time bc2d961d821b MIPS: OCTEON: add put_device() after of_find_device_by_node() ce34b03a71b6 udf: Fix error handling in udf_new_inode() 15be042e7fd9 powerpc/fadump: Fix inaccurate CPU state info in vmcore generated with panic f2e658d9bda2 powerpc: handle kdump appropriately with crash_kexec_post_notifiers option 044164b4198e selftests/powerpc/spectre_v2: Return skip code when miss_percent is high 21125e011620 powerpc/40x: Map 32Mbytes of memory at startup c330442f46ea MIPS: Loongson64: Use three arguments for slti af8d07735083 ALSA: seq: Set upper limit of processed events 297210783a7a scsi: lpfc: Trigger SLI4 firmware dump before doing driver cleanup dfde7afed711 dm: fix alloc_dax error handling in alloc_dev 2e2086f49e08 nvmem: core: set size for sysfs bin file 4a273a94bda8 w1: Misuse of get_user()/put_user() reported by sparse 87e91d6c6a5e KVM: PPC: Book3S: Suppress failed alloc warning in H_COPY_TOFROM_GUEST 23bb3f01ceb5 KVM: PPC: Book3S: Suppress warnings when allocating too big memory slots 03c1595a181c powerpc/powermac: Add missing lockdep_register_key() df29c01b9fbe clk: meson: gxbb: Fix the SDM_EN bit for MPLL0 on GXBB 30d35a1abd9e i2c: mpc: Correct I2C reset procedure 4b25aad655c9 powerpc/smp: Move setup_profiling_timer() under CONFIG_PROFILING 25714ad6bf5e i2c: i801: Don't silently correct invalid transfer size 75e2cfa5fae9 powerpc/watchdog: Fix missed watchdog reset due to memory ordering race a83639521a4f powerpc/btext: add missing of_node_put fc10d8f00a89 powerpc/cell: add missing of_node_put 297ff7d5f157 powerpc/powernv: add missing of_node_put c83ba875d7be powerpc/6xx: add missing of_node_put d240b08d8ac4 x86/kbuild: Enable CONFIG_KALLSYMS_ALL=y in the defconfigs 3681e9f3f0f7 parisc: Avoid calling faulthandler_disabled() twice f2a27dd7a2de random: do not throw away excess input to crng_fast_load f8fdebfb4b37 serial: core: Keep mctrl register state and cached copy in sync a03fd1b19891 serial: pl010: Drop CR register reset on set_termios 40ac33892630 regulator: qcom_smd: Align probe function with rpmh-regulator 3dc751213fe9 net: gemini: allow any RGMII interface mode 1063de897563 net: phy: marvell: configure RGMII delays for 88E1118 00580670b98b mlxsw: pci: Avoid flow control for EMAD packets eaf8cffcf5d5 dm space map common: add bounds check to sm_ll_lookup_bitmap() 5850bef8e955 dm btree: add a defensive bounds check to insert_at() 754b663ea916 mac80211: allow non-standard VHT MCS-10/11 e8da60b3a629 net: mdio: Demote probed message to debug print 6b22c9824ddb btrfs: remove BUG_ON(!eie) in find_parent_nodes 623c65bc7336 btrfs: remove BUG_ON() in find_parent_nodes() 44cbd2a16a07 ACPI: battery: Add the ThinkPad "Not Charging" quirk 7b6dc07c6e69 amdgpu/pm: Make sysfs pm attributes as read-only for VFs 516e332d6fce drm/amdgpu: fixup bad vram size on gmc v8 ee88ff140de2 ACPICA: Hardware: Do not flush CPU cache when entering S4 and S5 8544074762e2 ACPICA: Fix wrong interpretation of PCC address e70be176961d ACPICA: Executer: Fix the REFCLASS_REFOF case in acpi_ex_opcode_1A_0T_1R() 8ea9216d20b7 ACPICA: Utilities: Avoid deleting the same object twice in a row fcfd8282c5d2 ACPICA: actypes.h: Expand the ACPI_ACCESS_ definitions e3a51d6c90a8 jffs2: GC deadlock reading a page that is used in jffs2_write_begin() e35cb5b122fc drm/etnaviv: consider completed fence seqno in hang check a0b13335a342 xfrm: rate limit SA mapping change message to user space 0b7beb2fea8f Bluetooth: vhci: Set HCI_QUIRK_VALID_LE_STATES 6ac117edac18 ath11k: Fix napi related hang 756a7188b277 um: registers: Rename function names to avoid conflicts and build problems d817d10f7a00 iwlwifi: pcie: make sure prph_info is set when treating wakeup IRQ f266e1c5bf88 iwlwifi: mvm: Fix calculation of frame length 6e44b600543c iwlwifi: remove module loading failure message febab6b60d61 iwlwifi: fix leaks/bad data after failed firmware load 81d2e96ababb PM: AVS: qcom-cpr: Use div64_ul instead of do_div c0a1d844e3e7 rtw88: 8822c: update rx settings to prevent potential hw deadlock 3ef25f3122c0 ath9k: Fix out-of-bound memcpy in ath9k_hif_usb_rx_stream e10de3105547 usb: hub: Add delay for SuperSpeed hub resume to let links transit to U0 282286c632a2 cpufreq: Fix initialization of min and max frequency QoS requests 37b25de3af10 PM: runtime: Add safety net to supplier device release 5dfc6fa0b8c2 arm64: tegra: Adjust length of CCPLEX cluster MMIO region b68c56a149e4 arm64: dts: ls1028a-qds: move rtc node to the correct i2c bus b6f7f0ad5af5 audit: ensure userspace is penalized the same as the kernel when under pressure 5d54ed155031 mmc: core: Fixup storing of OCR for MMC_QUIRK_NONSTD_SDIO 51a5156bb779 media: saa7146: hexium_gemini: Fix a NULL pointer dereference in hexium_attach() f6bc6b178ce1 media: igorplugusb: receiver overflow should be reported d698e024be2e HID: quirks: Allow inverting the absolute X/Y values 59f03633463f bpf: Do not WARN in bpf_warn_invalid_xdp_action() 0e8805f73b69 net: bonding: debug: avoid printing debug logs when bond is not notifying peers 8c72de32ff13 x86/mce: Mark mce_read_aux() noinstr 1ad3e60f1fec x86/mce: Mark mce_end() noinstr f21ca973b43f x86/mce: Mark mce_panic() noinstr de360d944386 x86/mce: Allow instrumentation during task work queueing af371e0abb6c ath11k: Avoid false DEADLOCK warning reported by lockdep aec69e2f33b4 selftests/ftrace: make kprobe profile testcase description unique 07ecabf15ad3 gpio: aspeed: Convert aspeed_gpio.lock to raw_spinlock 7e09f9d15e43 net: phy: prefer 1000baseT over 1000baseKX 443133330a5d net-sysfs: update the queue counts in the unregistration path 58b4c1ce8328 ath10k: Fix tx hanging fcba0bce3357 ath11k: avoid deadlock by change ieee80211_queue_work for regd_update_work 93a108d466f8 iwlwifi: mvm: avoid clearing a just saved session protection id ec01e0fe2184 iwlwifi: mvm: synchronize with FW after multicast commands c1976a424807 thunderbolt: Runtime PM activate both ends of the device link 830e5d1b4344 media: m920x: don't use stack on USB reads c33f0f22bfea media: saa7146: hexium_orion: Fix a NULL pointer dereference in hexium_attach() 526b6c9b4521 media: rcar-vin: Update format alignment constraints 74e60c1dce06 media: uvcvideo: Increase UVC_CTRL_CONTROL_TIMEOUT to 5 seconds. d0e3ab637de1 drm: rcar-du: Fix CRTC timings when CMM is used e61aa46d0f27 x86/mm: Flush global TLB when switching to trampoline page-table 0946fdd9290a floppy: Add max size check for user space request 409d45bcd381 usb: uhci: add aspeed ast2600 uhci support d0aec428c072 arm64: dts: ti: j7200-main: Fix 'dtbs_check' serdes_ln_ctrl node fcb45ac39f90 ACPI / x86: Add not-present quirk for the PCI0.SDHB.BRC1 device on the GPD win b8b2e74a8751 ACPI / x86: Allow specifying acpi_device_override_status() quirks by path cda755506df4 ACPI: Change acpi_device_always_present() into acpi_device_override_status() b029625063c1 ACPI / x86: Drop PWM2 device on Lenovo Yoga Book from always present table cf3b1a160dc2 media: venus: avoid calling core_clk_setrate() concurrently during concurrent video sessions adbe14867277 ath11k: Avoid NULL ptr access during mgmt tx cleanup ab523ea096ef rsi: Fix out-of-bounds read in rsi_read_pkt() 752587675068 rsi: Fix use-after-free in rsi_rx_done_handler() 6036500fdf77 mwifiex: Fix skb_over_panic in mwifiex_usb_recv() 8a6371d84c5f crypto: jitter - consider 32 LSB for APT 240cf5d3cb5e HSI: core: Fix return freed object in hsi_new_client f4295b7dca87 gpiolib: acpi: Do not set the IRQ type if the IRQ is already in use f0653cd4da66 tty: serial: imx: disable UCR4_OREN in .stop_rx() instead of .shutdown() b8d10f601f22 drm/bridge: megachips: Ensure both bridges are probed before registration 43fc9e267e2e mlxsw: pci: Add shutdown method in PCI driver b2e921fa9219 soc: ti: pruss: fix referenced node in error message 07fbbc4dc79d drm/amdgpu/display: set vblank_disable_immediate for DC 019fe9723a83 drm/amd/display: check top_pipe_to_program pointer 3c3c0b6c4ae9 ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART f54d8cd831be EDAC/synopsys: Use the quirk for version instead of ddr version 0b85d73fdbc8 media: b2c2: Add missing check in flexcop_pci_isr: c978d39a8b14 HID: apple: Do not reset quirks when the Fn key is not found 2df002e3276b drm: panel-orientation-quirks: Add quirk for the Lenovo Yoga Book X91F/L 5aa57672c66c usb: gadget: f_fs: Use stream_open() for endpoint files 129e8faaee97 ath11k: Fix crash caused by uninitialized TX ring e8b271f2aadd media: atomisp: handle errors at sh_css_create_isp_params() ebe9c978d9e7 batman-adv: allow netlink usage in unprivileged containers ff452db96163 ARM: shmobile: rcar-gen2: Add missing of_node_put() ff2138d6c2a3 media: atomisp-ov2680: Fix ov2680_set_fmt() clobbering the exposure 51ef6582a218 media: atomisp: set per-device's default mode ac08140677c0 media: atomisp: fix try_fmt logic 518e059789f6 drm/nouveau/pmu/gm200-: avoid touching PMU outside of DEVINIT/PREOS/ACR e3ba02b043f2 drm/bridge: dw-hdmi: handle ELD when DRM_BRIDGE_ATTACH_NO_CONNECTOR 2f13f10fddf4 ar5523: Fix null-ptr-deref with unexpected WDCMSG_TARGET_START reply a9d2ccfc7d2c selftests/bpf: Fix bpf_object leak in skb_ctx selftest b207356933f4 drm/lima: fix warning when CONFIG_DEBUG_SG=y & CONFIG_DMA_API_DEBUG=y db1e878373bf fs: dlm: filter user dlm messages for kernel locks f9c9a46efd94 Bluetooth: Fix debugfs entry leak in hci_register_dev() 852d7d436fd1 ARM: dts: omap3-n900: Fix lp5523 for multi color b5793aff11d7 of: base: Fix phandle argument length mismatch error message e16e836d510c clk: bm1880: remove kfrees on static allocations 36d46e21c9c4 ASoC: fsl_asrc: refine the check of available clock divider 5a6864e2e6ab RDMA/cxgb4: Set queue pair state when being queried 80524c8cdf29 ASoC: fsl_mqs: fix MODULE_ALIAS 74988d017dd1 powerpc/xive: Add missing null check after calling kmalloc 588e0b81ce38 mips: bcm63xx: add support for clk_set_parent() e3de89d010c0 mips: lantiq: add support for clk_set_parent() 8f8468a089b0 arm64: tegra: Remove non existent Tegra194 reset 702902fc7fb0 arm64: tegra: Fix Tegra194 HDA {clock,reset}-names ordering 24b047d72c77 counter: stm32-lptimer-cnt: remove iio counter abi a39460610452 misc: lattice-ecp3-config: Fix task hung when firmware load failed 696a50abbc7c ASoC: samsung: idma: Check of ioremap return value d491a2c2cf96 ASoC: mediatek: Check for error clk pointer c73ccdd62d21 phy: uniphier-usb3ss: fix unintended writing zeros to PHY register d781f4cd8c71 scsi: block: pm: Always set request queue runtime active in blk_post_runtime_resume() 6e2a16954459 iommu/iova: Fix race between FQ timeout and teardown 57bc8985753c ASoC: Intel: catpt: Test dmaengine_submit() result before moving on 676049a3d2c6 iommu/amd: Restore GA log/tail pointer on host resume c2bd7c31de1a iommu/amd: Remove iommu_init_ga() 62ea255f2bde dmaengine: pxa/mmp: stop referencing config->slave_id 0be9ae1e532e mips: fix Kconfig reference to PHYS_ADDR_T_64BIT 88d78b25db1f mips: add SYS_HAS_CPU_MIPS64_R5 config for MIPS Release 5 support 51b8e814bcef clk: stm32: Fix ltdc's clock turn off by clk_disable_unused() after system enter shell dff359e04260 of: unittest: 64 bit dma address test requires arch support 918105df78b7 of: unittest: fix warning on PowerPC frame size warning 0e04518b1dd9 ASoC: rt5663: Handle device_property_read_u32_array error codes 7c0d9c815ce8 RDMA/cma: Let cma_resolve_ib_dev() continue search even after empty entry 2432d325f946 RDMA/core: Let ib_find_gid() continue search even after empty entry d77916df161b powerpc/powermac: Add additional missing lockdep_register_key() 8b3783e517f6 PCI/MSI: Fix pci_irq_vector()/pci_irq_get_affinity() 7be2a0bcaf8e RDMA/qedr: Fix reporting max_{send/recv}_wr attrs e19469468b7b scsi: ufs: Fix race conditions related to driver data ed43b2e048fe iommu/io-pgtable-arm: Fix table descriptor paddr formatting e9e4d1fb4590 openrisc: Add clone3 ABI wrapper 551a785c26f6 binder: fix handling of error during copy 88ddf033a5e4 char/mwave: Adjust io port register size 8937aee4c0fa ALSA: usb-audio: Drop superfluous '0' in Presonus Studio 1810c's ID bcd533417fd0 ALSA: oss: fix compile error when OSS_DEBUG is enabled fd99aeb97845 clocksource: Avoid accidental unstable marking of clocksources cacc6c30e3eb clocksource: Reduce clocksource-skew threshold 86ad478c99d2 powerpc/32s: Fix shift-out-of-bounds in KASAN init ef798cd035f3 powerpc/perf: Fix PMU callbacks to clear pending PMI before resetting an overflown PMC 58014442a9e8 powerpc/irq: Add helper to set regs->softe c9ffa84a3bd1 powerpc/perf: move perf irq/nmi handling details into traps.c a0758b3be46d powerpc/perf: MMCR0 control for PMU registers under PMCC=00 f4df6db5b0b8 powerpc/64s: Convert some cpu_setup() and cpu_restore() functions to C a9c9d2ff6423 dt-bindings: thermal: Fix definition of cooling-maps contribution property 2bd8d937957f ASoC: uniphier: drop selecting non-existing SND_SOC_UNIPHIER_AIO_DMA 5a821af769bb powerpc/prom_init: Fix improper check of prom_getprop() 9ca761ef946d clk: imx8mn: Fix imx8mn_clko1_sels 999528d8a749 scsi: pm80xx: Update WARN_ON check in pm8001_mpi_build_cmd() c5f414d69ac9 RDMA/hns: Validate the pkey index 04a032ea2498 RDMA/bnxt_re: Scan the whole bitmap when checking if "disabling RCFW with pending cmd-bit" 84cd5c029d48 ALSA: hda: Add missing rwsem around snd_ctl_remove() calls 180e9d7384c6 ALSA: PCM: Add missing rwsem around snd_ctl_remove() calls 49d76154ba8d ALSA: jack: Add missing rwsem around snd_ctl_remove() calls f871cd8ee0f0 ext4: avoid trim error on fs with small groups 99590e820feb net: mcs7830: handle usb read errors properly 2b948524ae65 iwlwifi: mvm: Use div_s64 instead of do_div in iwl_mvm_ftm_rtt_smoothing() 04ce9e2aeda7 pcmcia: fix setting of kthread task states 5064bfe046b0 can: xilinx_can: xcan_probe(): check for error irq b6dd1577bc92 can: softing: softing_startstop(): fix set but not used variable warning b9ac866c23bb tpm_tis: Fix an error handling path in 'tpm_tis_core_init()' fb46223c9f94 tpm: add request_locality before write TPM_INT_ENABLE 20edf903a3a5 can: mcp251xfd: add missing newline to printed strings d71fca5d0167 regmap: Call regmap_debugfs_exit() prior to _init() 838acddcdf75 netrom: fix api breakage in nr_setsockopt() 0d04479857bc ax25: uninitialized variable in ax25_setsockopt() 27e9910c4516 spi: spi-meson-spifc: Add missing pm_runtime_disable() in meson_spifc_probe 9d6350cf8e5a Bluetooth: L2CAP: uninitialized variables in l2cap_sock_setsockopt() 9defd7d4c084 lib/mpi: Add the return value check of kcalloc() e801f81cee3c net/mlx5: Set command entry semaphore up once got index free d2b9ce705d79 Revert "net/mlx5e: Block offload of outer header csum for UDP tunnels" 67e1a449a165 net/mlx5e: Don't block routes with nexthop objects in SW cc40fa05c0a6 net/mlx5e: Fix page DMA map/unmap attributes b3dda01d1d47 debugfs: lockdown: Allow reading debugfs files that are not world readable b9b5da3e187e HID: hid-uclogic-params: Invalid parameter check in uclogic_params_frame_init_v1_buttonpad 541c3a044b46 HID: hid-uclogic-params: Invalid parameter check in uclogic_params_huion_init c47f842e0c3c HID: hid-uclogic-params: Invalid parameter check in uclogic_params_get_str_desc cf5ad827ee69 HID: hid-uclogic-params: Invalid parameter check in uclogic_params_init 94177fcecc35 usb: dwc3: qcom: Fix NULL vs IS_ERR checking in dwc3_qcom_probe 4579954bf4cc Bluetooth: hci_qca: Fix NULL vs IS_ERR_OR_NULL check in qca_serdev_probe f6bf3d66393b Bluetooth: hci_bcm: Check for error irq f5e4f68d57d6 fsl/fman: Check for null pointer after calling devm_ioremap 60aca6fdc167 staging: greybus: audio: Check null pointer a1068bfee47a rocker: fix a sleeping in atomic bug 2db344725e17 ppp: ensure minimum packet size in ppp_write() 45643b1b6ce1 netfilter: nft_set_pipapo: allocate pcpu scratch maps on clone 8772700a9f1e bpf: Fix SO_RCVBUF/SO_SNDBUF handling in _bpf_setsockopt(). 342332fb0be6 bpf: Don't promote bogus looking registers after null check. 0036c78c492a netfilter: ipt_CLUSTERIP: fix refcount leak in clusterip_tg_check() 2e718389b986 power: reset: mt6397: Check for null res pointer 4210c35fe81b pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in nonstatic_find_mem_region() 2dee347f356d pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in __nonstatic_find_io_region() 0f03132191ba ACPI: scan: Create platform device for BCM4752 and LNV4752 ACPI nodes 595e1ec55b30 x86/mce/inject: Avoid out-of-bounds write when setting flags df1268181928 hwmon: (mr75203) fix wrong power-up delay value aea5302d9ddc x86/boot/compressed: Move CLANG_FLAGS to beginning of KBUILD_CFLAGS 70eec71f32eb Bluetooth: hci_qca: Stop IBS timer during BT OFF 1d4e722b62d2 software node: fix wrong node passed to find nargs_prop f8f3c1720d77 backlight: qcom-wled: Respect enabled-strings in set_brightness de79bcbfaf4d backlight: qcom-wled: Use cpu_to_le16 macro to perform conversion c79f9b8d8e26 backlight: qcom-wled: Override default length with qcom,enabled-strings bf4daf6153c9 backlight: qcom-wled: Fix off-by-one maximum with default num_strings 09aed85e8c98 backlight: qcom-wled: Pass number of elements to read to read_u32_array f4ed4fc504fd backlight: qcom-wled: Validate enabled string indices in DT e668ac6506d3 bpftool: Enable line buffering for stdout 009bb7ee1577 Bluetooth: L2CAP: Fix using wrong mode 1a2241ad400b um: virtio_uml: Fix time-travel external time propagation 8411722e5652 um: fix ndelay/udelay defines b2b1b490bd29 selinux: fix potential memleak in selinux_add_opt() 3253cf091464 mmc: meson-mx-sdio: add IRQ check decb2099549d mmc: meson-mx-sdhc: add IRQ check bdc6c9fc5f78 iwlwifi: mvm: test roc running status bits before removing the sta a750fcd604a6 iwlwifi: mvm: fix 32-bit build in FTM 86b0122d2682 ARM: dts: armada-38x: Add generic compatible to UART nodes 1f5428e43806 arm64: dts: marvell: cn9130: enable CP0 GPIO controllers 874b97e86278 arm64: dts: marvell: cn9130: add GPIO and SPI aliases 407ef1db4036 usb: ftdi-elan: fix memory leak on device disconnect 2a65da5a1ea3 ARM: 9159/1: decompressor: Avoid UNPREDICTABLE NOP encoding 47dd693c94bf xfrm: state and policy should fail if XFRMA_IF_ID 0 db369047e3b3 xfrm: interface with if_id 0 should return error 37441ddadc1e media: hantro: Fix probe func error path 3849ec830bf7 drm/tegra: vic: Fix DMA API misuse b230114bc57a drm/bridge: ti-sn65dsi86: Set max register for regmap db97fc2c4425 drm/msm/dpu: fix safe status debugfs file 3580055d1fca arm64: dts: qcom: ipq6018: Fix gpio-ranges property 6f20a5a98a90 arm64: dts: qcom: c630: Fix soundcard setup 394ee480aa3e ath11k: Fix a NULL pointer dereference in ath11k_mac_op_hw_scan() f6e4a6cbdb6f media: coda/imx-vdoa: Handle dma_set_coherent_mask error codes 1a8869de328a media: msi001: fix possible null-ptr-deref in msi001_probe() a79327bb0191 media: dw2102: Fix use after free 958a8819d414 ARM: dts: gemini: NAS4220-B: fis-index-block with 128 KiB sectors 3e51460638a6 ath11k: Fix deleting uninitialized kernel timer during fragment cache flush b35263f000a5 crypto: stm32 - Revert broken pm_runtime_resume_and_get changes 1f5b81874f27 crypto: stm32/cryp - fix bugs and crash in tests 1f6151b0774b crypto: stm32/cryp - fix lrw chaining mode 2bd40e3a3aa2 crypto: stm32/cryp - fix double pm exit 533af1621d1c crypto: stm32/cryp - check early input data 5deb24e50372 crypto: stm32/cryp - fix xts and race condition in crypto_engine requests e9e0dd5da8ca crypto: stm32/cryp - fix CTR counter carry c40b1bc851e0 crypto: stm32 - Fix last sparse warning in stm32_cryp_check_ctr_counter 93033bbbdc25 selftests: harness: avoid false negatives if test has no ASSERTs f568fd97d751 selftests: clone3: clone3: add case CLONE3_ARGS_NO_TEST d21b47c60737 x86/uaccess: Move variable into switch case statement 3e801ea43c4b xfrm: fix a small bug in xfrm_sa_len() b87034d7a2a8 mwifiex: Fix possible ABBA deadlock 0836f9404017 rcu/exp: Mark current CPU as exp-QS in IPI loop second pass 027165c491e4 drm/msm/dp: displayPort driver need algorithm rational 268f35245650 sched/rt: Try to restart rt period timer when rt runtime exceeded bb0579ab5077 wireless: iwlwifi: Fix a double free in iwl_txq_dyn_alloc_dma b4b911b1648c media: si2157: Fix "warm" tuner state detection 7009a5fbc589 media: saa7146: mxb: Fix a NULL pointer dereference in mxb_attach() df79d2bf95e0 media: dib8000: Fix a memleak in dib8000_init() f0cb43a2c674 arm64: clear_page() shouldn't use DC ZVA when DCZID_EL0.DZP == 1 88ed31aab481 arm64: lib: Annotate {clear, copy}_page() as position-independent 69e402a98541 bpf: Remove config check to enable bpf support for branch records 924886fa2246 bpf: Disallow BPF_LOG_KERNEL log level for bpf(BPF_BTF_LOAD) 218d952160f7 bpf: Adjust BTF log size limit. b77ef5b4ead6 sched/fair: Fix per-CPU kthread and wakee stacking for asym CPU capacity d7d5b3bc5263 sched/fair: Fix detection of per-CPU kthreads waking a task ec121517ac8d Bluetooth: btmtksdio: fix resume failure 2a7edcb3ef72 staging: rtl8192e: rtllib_module: fix error handle case in alloc_rtllib() 49f5cd2b7c41 staging: rtl8192e: return error code from rtllib_softmac_init() 04fdd426cef2 floppy: Fix hang in watchdog when disk is ejected 45bbe008013f serial: amba-pl011: do not request memory region twice 8409d2394cca tty: serial: uartlite: allow 64 bit address a001a15ab374 arm64: dts: ti: k3-j7200: Correct the d-cache-sets info 75919207c16a arm64: dts: ti: k3-j721e: Fix the L2 cache sets 2dcfa3c76596 arm64: dts: ti: k3-j7200: Fix the L2 cache sets f277978d6c46 drm/radeon/radeon_kms: Fix a NULL pointer dereference in radeon_driver_open_kms() 3ca1b3b82fe7 drm/amdgpu: Fix a NULL pointer dereference in amdgpu_connector_lcd_native_mode() 96e05d2d9370 thermal/drivers/imx8mm: Enable ADC when enabling monitor ef72449e2d79 ACPI: EC: Rework flushing of EC work while suspended to idle c0acd5a09796 cgroup: Trace event cgroup id fields should be u64 e7e178e26418 arm64: dts: qcom: msm8916: fix MMC controller aliases 894d91c6334b netfilter: bridge: add support for pppoe filtering 13f64bbe4255 thermal/drivers/imx: Implement runtime PM support c3a59f34e87c media: venus: core: Fix a resource leak in the error handling path of 'venus_probe()' 50c4244906d6 media: venus: core: Fix a potential NULL pointer dereference in an error handling path eeefa2eae8fc media: venus: core, venc, vdec: Fix probe dependency error 53f65afc260f media: venus: pm_helpers: Control core power domain manually 89f518b153d1 media: coda: fix CODA960 JPEG encoder buffer overflow 1da628d351a9 media: mtk-vcodec: call v4l2_m2m_ctx_release first when file is released 2028fb832da6 media: si470x-i2c: fix possible memory leak in si470x_i2c_probe() e8d78f924f02 media: imx-pxp: Initialize the spinlock prior to using it 621e8ce75d66 media: rcar-csi2: Correct the selection of hsfreqrange ad52b9890b83 mfd: atmel-flexcom: Use .resume_noirq 46d6a2311409 mfd: atmel-flexcom: Remove #ifdef CONFIG_PM_SLEEP f93c9aa1d36f tty: serial: atmel: Call dma_async_issue_pending() 755a6c873b9c tty: serial: atmel: Check return code of dmaengine_submit() bd85b2e77aa9 arm64: dts: ti: k3-j721e: correct cache-sets info 32e9947e6639 ath11k: Use host CE parameters for CE interrupts configuration 6a49acfacab5 crypto: qat - fix undetected PFVF timeout in ACK loop 475ac5c5653f crypto: qat - make pfvf send message direction agnostic ee1c74c3c9c2 crypto: qat - remove unnecessary collision prevention step in PFVF 472f76835200 crypto: qat - fix spelling mistake: "messge" -> "message" ae766527e6b7 ARM: dts: stm32: fix dtbs_check warning on ili9341 dts binding on stm32f429 disco eab4204588a0 mtd: hyperbus: rpc-if: fix bug in rpcif_hb_remove 867d4ace48da crypto: qce - fix uaf on qce_skcipher_register_one e19b3c1b5768 crypto: qce - fix uaf on qce_ahash_register_one 5de640f59f99 media: dmxdev: fix UAF when dvb_register_device() fails 1d64e2bd2222 arm64: dts: renesas: cat875: Add rx/tx delays a33eef23a658 drm/vboxvideo: fix a NULL vs IS_ERR() check 43220a61e7b8 fs: dlm: fix build with CONFIG_IPV6 disabled 0d7c5d10e7db tee: fix put order in teedev_close_context() 097e601eb887 ath11k: reset RSN/WPA present state for open BSS fa51addd391d ath11k: clear the keys properly via DISABLE_KEY df94b37e902b ath11k: Fix ETSI regd with weather radar overlap ffc9019bd991 Bluetooth: stop proccessing malicious adv data 3273541fed60 memory: renesas-rpc-if: Return error in case devm_ioremap_resource() fails 55917db35976 fs: dlm: don't call kernel_getpeername() in error_report() 98923ebb034b fs: dlm: use sk->sk_socket instead of con->sock 6edd1bd8e3d8 arm64: dts: meson-gxbb-wetek: fix missing GPIO binding eb1f75fa2458 arm64: dts: meson-gxbb-wetek: fix HDMI in early boot 6f012f2c445b arm64: dts: amlogic: Fix SPI NOR flash node name for ODROID N2/N2+ 96d710b1c6ff arm64: dts: amlogic: meson-g12: Fix GPU operating point table node name 0b57480ed51a media: aspeed: Update signal status immediately to ensure sane hw state 0ff0ae69d27c media: em28xx: fix memory leak in em28xx_init_dev b441d9428735 media: aspeed: fix mode-detect always time out at 2nd run 8d132d9dd8ba media: atomisp: fix uninitialized bug in gmin_get_pmic_id_and_addr() fc2b95e7aeae media: atomisp: fix enum formats logic 6e5353238c55 media: atomisp: add NULL check for asd obtained from atomisp_video_pipe 6cbabad304c4 media: staging: media: atomisp: pci: Balance braces around conditional statements in file atomisp_cmd.c 22b0b68f7d9f media: atomisp: fix ifdefs in sh_css.c 0bf5e8af6eb6 media: atomisp: fix inverted error check for ia_css_mipi_is_source_port_valid() 3cb3e66f583c media: atomisp: do not use err var when checking port validity for ISP2400 08e43223fb4e media: atomisp: fix inverted logic in buffers_needed() fb370f6dc7d5 media: atomisp: fix punit_ddr_dvfs_enable() argument for mrfld_power up case 1daacf9bb69a media: atomisp: add missing media_device_cleanup() in atomisp_unregister_entities() e1da9301cf54 media: videobuf2: Fix the size printk format 90807ab437e8 mtd: hyperbus: rpc-if: Check return value of rpcif_sw_init() 9bfed11dcf59 ath11k: Send PPDU_STATS_CFG with proper pdev mask to firmware 2fe056d9791a wcn36xx: fix RX BD rate mapping for 5GHz legacy rates 22406ed4e389 wcn36xx: populate band before determining rate on RX 92fea7bd5af3 wcn36xx: Put DXE block into reset before freeing memory 0d53c47f6ab5 wcn36xx: Release DMA channel descriptor allocations 1850195a852d wcn36xx: Fix DMA channel enable/disable cycle 38a7842889f5 wcn36xx: Indicate beacon not connection loss on MISSED_BEACON_IND fcb267bb9577 wcn36xx: ensure pairing of init_scan/finish_scan and start_scan/end_scan e53ff4dd7095 drm/vc4: hdmi: Set a default HSM rate b9c2343373f6 clk: bcm-2835: Remove rounding up the dividers 836dd37fe2bb clk: bcm-2835: Pick the closest clock rate 88f1b613c37f Bluetooth: cmtp: fix possible panic when cmtp_init_sockets() fails 9ddfa1c19191 drm/rockchip: dsi: Reconfigure hardware on resume() 58904ed18628 drm/rockchip: dsi: Disable PLL clock on bind error 6215cde02085 drm/rockchip: dsi: Hold pm-runtime across bind/unbind 8ccaafa1caf0 drm/rockchip: dsi: Fix unbalanced clock on probe error 9bc19022aa08 drm/panel: innolux-p079zca: Delete panel on attach() failure b01b7b868479 drm/panel: kingdisplay-kd097d04: Delete panel on attach() failure 0499c863a8db drm: fix null-ptr-deref in drm_dev_init_release() 7798757013ec drm/bridge: display-connector: fix an uninitialized pointer in probe() cb5813b0e591 Bluetooth: L2CAP: Fix not initializing sk_peer_pid ed0b1fd3ec6e drm/ttm: Put BO in its memory manager's lru list 7b9fa915a58d shmem: fix a race between shmem_unused_huge_shrink and shmem_evict_inode 6c6f86bb618b mm/page_alloc.c: do not warn allocation failure on zone DMA if no managed pages e04b1dfe15ce dma/pool: create dma atomic pool only if dma zone has managed pages d2e572411738 mm_zone: add function to check if managed dma zone exists 2142a7e9bd1f PCI: Add function 1 DMA alias quirk for Marvell 88SE9125 SATA controller 45c74f4f54db dma_fence_array: Fix PENDING_ERROR leak in dma_fence_array_signaled() 191a24ceae75 gpu: host1x: Add back arm_iommu_detach_device() 068067453690 iommu/io-pgtable-arm-v7s: Add error handle for page table allocation failure 3dae11f8e381 lkdtm: Fix content of section containing lkdtm_rodata_do_nothing() e4a2c924a17e iio: adc: ti-adc081c: Partial revert of removal of ACPI IDs 256302cb2f86 can: softing_cs: softingcs_probe(): fix memleak on registration failure aa57725e2d2a media: cec-pin: fix interrupt en/disable handling 2e566cacc321 media: stk1160: fix control-message timeouts 1a0ca711dff6 media: pvrusb2: fix control-message timeouts 2dbf430ead59 media: redrat3: fix control-message timeouts 6e9c120bf956 media: dib0700: fix undefined behavior in tuner shutdown 5e98ac260de6 media: s2255: fix control-message timeouts 09b0b918a69b media: cpia2: fix control-message timeouts d90833106c09 media: em28xx: fix control-message timeouts 2182575c83f9 media: mceusb: fix control-message timeouts 460525acc953 media: flexcop-usb: fix control-message timeouts 7cac8a562427 media: v4l2-ioctl.c: readbuffers depends on V4L2_CAP_READWRITE 1da0b1cd4212 rtc: cmos: take rtc_lock while reading from CMOS 14f6cfe0d790 tools/nolibc: fix incorrect truncation of exit code 5e258640ba54 tools/nolibc: i386: fix initial stack alignment 06f7528d641b tools/nolibc: x86-64: Fix startup code bug 98259dd54e8e x86/gpu: Reserve stolen memory for first integrated Intel GPU e2a17dcad56e mtd: rawnand: davinci: Rewrite function description 8933138a6660 mtd: rawnand: davinci: Avoid duplicated page read 677764634b42 mtd: rawnand: davinci: Don't calculate ECC when reading page a8a607b0049d mtd: Fixed breaking list in __mtd_del_partition. ff10cd7bb295 mtd: rawnand: gpmi: Remove explicit default gpmi clock setting for i.MX6 538a5e208e7d mtd: rawnand: gpmi: Add ERR007117 protection for nfc_apply_timings 777a700ccfa6 nfc: llcp: fix NULL error pointer dereference on sendmsg() after failed bind() 08283b076f4e f2fs: fix to do sanity check in is_alive() 57cfc965e375 HID: wacom: Avoid using stale array indicies to read contact count 7fd22c99bbed HID: wacom: Ignore the confidence flag when a touch is removed 9a4800e0f6a5 HID: wacom: Reset expected and received contact counts at the same time c2e39d5df028 HID: uhid: Fix worker destroying device without any protection aa1346113c75 KVM: VMX: switch blocked_vcpu_on_cpu_lock to raw spinlock Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 9bebdb447d39b9bca340f087bff6a008f199f34b) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 6 ++--- .../linux/linux-yocto-tiny_5.10.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 48d2694995e..4ee93cdd8b9 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "ba47a407fe04203adb0ab5e164597c958cd9e334" -SRCREV_meta ?= "7df27e6d296dfa16f289883c0661eed45059360c" +SRCREV_machine ?= "8aebbbd41d16fc564ff99709d4f01a116d07e7a4" +SRCREV_meta ?= "0db3f511b2a553a5ea31ac45249a42f084fc287c" 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.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.93" +LINUX_VERSION ?= "5.10.96" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index eb42c407fa4..0bde6e5c7fd 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.93" +LINUX_VERSION ?= "5.10.96" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 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 ?= "ceb1f194e59c9dd3bdd83d51bb0994f3db23bf61" -SRCREV_machine ?= "878e5c1469550bb0f8778d16d4adbe7d48b0b28d" -SRCREV_meta ?= "7df27e6d296dfa16f289883c0661eed45059360c" +SRCREV_machine_qemuarm ?= "ca361e2633ab577333303359eb2f7b0040647e5e" +SRCREV_machine ?= "36f032fc87112de000ca01b6e8a41313d418dcd9" +SRCREV_meta ?= "0db3f511b2a553a5ea31ac45249a42f084fc287c" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index e67bf54c98b..64b4ab5879c 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "50c0e06718fb2b264619ce8d82608877d1e62a81" -SRCREV_machine_qemuarm64 ?= "7907c5eb81e9a51307b5269d546999ebf47d9d59" -SRCREV_machine_qemumips ?= "e9c51de36554662082afc08c6e54599b310c7951" -SRCREV_machine_qemuppc ?= "77f361ea5eb293dcfe122ecb65f33ba32fd12501" -SRCREV_machine_qemuriscv64 ?= "a1bbb29fe30c94c21309aa8b8c0d06fa12f3368d" -SRCREV_machine_qemuriscv32 ?= "a1bbb29fe30c94c21309aa8b8c0d06fa12f3368d" -SRCREV_machine_qemux86 ?= "a1bbb29fe30c94c21309aa8b8c0d06fa12f3368d" -SRCREV_machine_qemux86-64 ?= "a1bbb29fe30c94c21309aa8b8c0d06fa12f3368d" -SRCREV_machine_qemumips64 ?= "b668a352c94a8c29e585608e8302cacb1350f5ed" -SRCREV_machine ?= "a1bbb29fe30c94c21309aa8b8c0d06fa12f3368d" -SRCREV_meta ?= "7df27e6d296dfa16f289883c0661eed45059360c" +SRCREV_machine_qemuarm ?= "7ad48434f8e0e848f7fe4891ee7ba670700c36fc" +SRCREV_machine_qemuarm64 ?= "932cd0e7a66273eba2da54b4ac67e3c6e384e614" +SRCREV_machine_qemumips ?= "27d7f99a1211d8eca210a84c88a9058772a751a5" +SRCREV_machine_qemuppc ?= "914396443522268b332c8efe83b3b0306befd1cb" +SRCREV_machine_qemuriscv64 ?= "74244dd30b3a2415a785d2228ab5abdef4536f03" +SRCREV_machine_qemuriscv32 ?= "74244dd30b3a2415a785d2228ab5abdef4536f03" +SRCREV_machine_qemux86 ?= "74244dd30b3a2415a785d2228ab5abdef4536f03" +SRCREV_machine_qemux86-64 ?= "74244dd30b3a2415a785d2228ab5abdef4536f03" +SRCREV_machine_qemumips64 ?= "ba30b538c1750a9fe5db275260862c99a5ed356a" +SRCREV_machine ?= "74244dd30b3a2415a785d2228ab5abdef4536f03" +SRCREV_meta ?= "0db3f511b2a553a5ea31ac45249a42f084fc287c" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -32,7 +32,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.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.93" +LINUX_VERSION ?= "5.10.96" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From 3d9f68e06736817871d8694fe0c6e779c005872b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 11 Feb 2022 17:42:03 +0000 Subject: [PATCH 019/108] default-distrovars.inc: Switch connectivity check to a yoctoproject.org page example.com is proving unreliable at present so switch to our own connectivity page instead. That page is very simple avoiding app overhead on our web server which was an original reason for switching to example.com. Signed-off-by: Richard Purdie (cherry picked from commit dc6b043cb75c5751b5a98afd2201aa31f9b4b9f6) Signed-off-by: Anuj Mittal --- meta/classes/sanity.bbclass | 2 +- meta/conf/distro/include/default-distrovars.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index a2ac4eeb80b..c8a42dc8bf9 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -395,7 +395,7 @@ def check_connectivity(d): msg += " Please ensure your host's network is configured correctly.\n" msg += " If your ISP or network is blocking the above URL,\n" msg += " try with another domain name, for example by setting:\n" - msg += " CONNECTIVITY_CHECK_URIS = \"https://www.yoctoproject.org/\"" + msg += " CONNECTIVITY_CHECK_URIS = \"https://www.example.com/\"" msg += " You could also set BB_NO_NETWORK = \"1\" to disable network\n" msg += " access if all required sources are on local disk.\n" retval = msg diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 0240589c815..038acc15046 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -48,4 +48,4 @@ KERNEL_IMAGETYPES ??= "${KERNEL_IMAGETYPE}" # fetch from the network (and warn you if not). To disable the test set # the variable to be empty. # Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master;branch=master -CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/" +CONNECTIVITY_CHECK_URIS ?= "https://yoctoproject.org/connectivity.html" From b8f68a73d0782b4bc6c1e953cc28fb408245f4cb Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sat, 12 Feb 2022 20:23:42 -0500 Subject: [PATCH 020/108] linux-yocto/5.10: update to v5.10.99 Updating linux-yocto/5.10 to the latest korg -stable release that comprises the following commits: fb063a6465f9 Linux 5.10.99 4889d6ee9e48 selftests: nft_concat_range: add test for reload with no element add/del 557727313534 cgroup/cpuset: Fix "suspicious RCU usage" lockdep warning f1f7d1a22fd7 net: dsa: mt7530: make NET_DSA_MT7530 select MEDIATEK_GE_PHY 84b76a509cc3 ext4: fix incorrect type issue during replay_del_range 62e46e0ffc02 ext4: fix error handling in ext4_fc_record_modified_inode() 764793b4a5d0 ext4: fix error handling in ext4_restore_inline_data() 6c5bd55e36d3 ext4: modify the logic of ext4_mb_new_blocks_simple 8d71fc23fcb8 ext4: prevent used blocks from being allocated during fast commit replay ef2053afd71e EDAC/xgene: Fix deferred probing 2a12faf55bae EDAC/altera: Fix deferred probing dd274cf85269 x86/perf: Default set FREEZE_ON_SMI for all 456f041e0359 perf/x86/intel/pt: Fix crash with stop filters in single-range mode 8c0e6a8a630e perf stat: Fix display of grouped aliased events 57e8859acc60 fbcon: Add option to enable legacy hardware acceleration 460f6b1a238d Revert "fbcon: Disable accelerated scrolling" 460aa9d87340 rtc: cmos: Evaluate century appropriate 2324f5fcdf9d tools/resolve_btfids: Do not print any commands when building silently 1536fafa23ac selftests: futex: Use variable MAKE instead of make 8f0fff8b5968 selftests/exec: Remove pipe from TEST_GEN_FILES 6304a613a97d bpf: Use VM_MAP instead of VM_ALLOC for ringbuf f744a064041c gve: fix the wrong AdminQ buffer queue index check 51e88e892273 nfsd: nfsd4_setclientid_confirm mistakenly expires confirmed client. ec4334152dae scsi: bnx2fc: Make bnx2fc_recv_frame() mp safe fd482f2d63db pinctrl: bcm2835: Fix a few error paths 752d9eafc64e pinctrl: intel: fix unexpected interrupt 14bc9978b486 pinctrl: intel: Fix a glitch when updating IRQ flags on a preconfigured line 5a45448ac95b ASoC: max9759: fix underflow in speaker_gain_control_put() 02f459719832 ASoC: cpcap: Check for NULL pointer after calling of_get_child_by_name cb5f1fbd1f22 ASoC: xilinx: xlnx_formatter_pcm: Make buffer bytes multiple of period bytes 56e0747d59ac ASoC: fsl: Add missing error handling in pcm030_fabric_probe 3e698375517d drm/i915/overlay: Prevent divide by zero bugs in scaling 9ea018536111 net: stmmac: ensure PTP time register reads are consistent 41df2da2c1f3 net: stmmac: dump gmac4 DMA registers correctly 114bf9350413 net: macsec: Verify that send_sci is on when setting Tx sci explicitly 2e7f5b6ee1a7 net: macsec: Fix offload support for NETDEV_UNREGISTER event 87b1c9fab6fe net: ieee802154: Return meaningful error codes from the netlink helpers 78b3f20c17cb net: ieee802154: ca8210: Stop leaking skb's 0bfe50dc5d91 net: ieee802154: mcr20a: Fix lifs/sifs periods 75bbda318987 net: ieee802154: hwsim: Ensure proper channel selection at probe time e895e067d73e spi: uniphier: fix reference count leak in uniphier_spi_probe() ec942d08e070 spi: meson-spicc: add IRQ check in meson_spicc_probe c2cf65e1008b spi: mediatek: Avoid NULL pointer crash in interrupt 30e05c98b99d spi: bcm-qspi: check for valid cs before applying chip select 6d226e8afe88 iommu/amd: Fix loop timeout issue in iommu_ga_log_enable() 9d9995b0371e iommu/vt-d: Fix potential memory leak in intel_setup_irq_remapping() b3958d315163 RDMA/mlx4: Don't continue event handler after memory allocation failure d3f8b927df2f RDMA/siw: Fix broken RDMA Read Fence/Resume logic. c7db20f5be73 IB/rdmavt: Validate remote_addr during loopback atomic tests 75c610212b9f RDMA/ucma: Protect mc during concurrent multicast leaves 371979069a57 RDMA/cma: Use correct address when leaving multicast group aa4ecd995f59 memcg: charge fs_context and legacy_fs_context 080f371d984e Revert "ASoC: mediatek: Check for error clk pointer" 4a9bd1e6780f IB/hfi1: Fix AIP early init panic 5d40f1bdad3d dma-buf: heaps: Fix potential spectre v1 gadget 30de3bc09978 block: bio-integrity: Advance seed correctly for larger interval sizes 352715593e81 mm/kmemleak: avoid scanning potential huge holes 7053188ddba3 mm/pgtable: define pte_index so that preprocessor could recognize it bce7f5d74d74 mm/debug_vm_pgtable: remove pte entry from the page table 2d83a7463d75 nvme-fabrics: fix state check in nvmf_ctlr_matches_baseopts() a0c73dbdd197 drm/amd/display: Force link_rate as LINK_RATE_RBR2 for 2018 15" Apple Retina panels f071d9fa8575 drm/nouveau: fix off by one in BIOS boundary checking 32747e01436a btrfs: fix deadlock between quota disable and qgroup rescan worker aa5d406153c5 ALSA: hda/realtek: Fix silent output on Gigabyte X570 Aorus Xtreme after reboot from Windows d4aa3a98596f ALSA: hda/realtek: Fix silent output on Gigabyte X570S Aorus Master (newer chipset) 3a8a8072e32b ALSA: hda/realtek: Add missing fixup-model entry for Gigabyte X570 ALC1220 quirks 532cde962f5f ALSA: hda/realtek: Add quirk for ASUS GU603 410f231fd70c ALSA: hda: realtek: Fix race at concurrent COEF updates a7de1002135c ALSA: hda: Fix UAF of leds class devs at unbinding 470bbb9cbd8f ALSA: usb-audio: Correct quirk for VF0770 6877f87579ed ASoC: ops: Reject out of bounds values in snd_soc_put_xr_sx() 038f8b7caa74 ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx() a9394f21fba0 ASoC: ops: Reject out of bounds values in snd_soc_put_volsw() 0ff6b8050695 audit: improve audit queue handling when "audit=1" on cmdline f446089a268c selinux: fix double free of cond_list on error paths 12a0a56cbae3 Linux 5.10.98 97a47e25559e Revert "drm/vc4: hdmi: Make sure the device is powered with CEC" again e27042060f81 Revert "drm/vc4: hdmi: Make sure the device is powered with CEC" c8ed22bd97d4 Linux 5.10.97 176356550ced tcp: add missing tcp_skb_can_collapse() test in tcp_shift_skb_data() 32e179971085 af_packet: fix data-race in packet_setsockopt / packet_setsockopt aa9e96db3121 cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask() 3bbe2019dd12 rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink() e7be56926397 net: sched: fix use-after-free in tc_new_tfilter() 7b4741644cf7 fanotify: Fix stale file descriptor in copy_event_to_user() 4d3fcfe84648 net: amd-xgbe: Fix skb data length underflow cadfa7dce526 net: amd-xgbe: ensure to reset the tx_timer_active flag 77534b114f24 ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback b4ced7a46d9f net/mlx5: E-Switch, Fix uninitialized variable modact 502c37b033fa net/mlx5: Use del_timer_sync in fw reset flow of halting poll a01ee1b8165f net/mlx5e: Fix handling of wrong devices during bond netevent 1fc3444cda9a cgroup-v1: Require capabilities to set release_agent ac4ba79bb028 drm/vc4: hdmi: Make sure the device is powered with CEC 46f919c6bdc5 x86/cpu: Add Xeon Icelake-D to list of CPUs that support PPIN fbdbf6743f77 x86/mce: Add Xeon Sapphire Rapids to list of CPUs that support PPIN d4e4e61d4a5b psi: Fix uaf issue when psi trigger is destroyed while being polled 080dbe7e9b86 KVM: x86: Forcibly leave nested virt when SMM state is toggled 063029a8820e Revert "drivers: bus: simple-pm-bus: Add support for probing simple bus only devices" 42fdbf8b7dab net: ipa: prevent concurrent replenish ad81380d3a48 net: ipa: use a bitmap for endpoint replenish_enabled 2ed912e3e057 net: ipa: fix atomic update in ipa_endpoint_replenish() 3b4c966fb156 PCI: pciehp: Fix infinite loop in IRQ handler upon power fault Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 1da72913333948e8c63d39033d38f19d9cdd322e) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 6 ++--- .../linux/linux-yocto-tiny_5.10.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 4ee93cdd8b9..f142da66ab2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "8aebbbd41d16fc564ff99709d4f01a116d07e7a4" -SRCREV_meta ?= "0db3f511b2a553a5ea31ac45249a42f084fc287c" +SRCREV_machine ?= "53a27dc510c8d9152ffa4d2d95b888db7d3d97b6" +SRCREV_meta ?= "a58f4e7cca3973e04d3f9a40356ef9c2c0bb10a5" 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.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.96" +LINUX_VERSION ?= "5.10.99" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 0bde6e5c7fd..8e33e703f79 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.96" +LINUX_VERSION ?= "5.10.99" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 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 ?= "ca361e2633ab577333303359eb2f7b0040647e5e" -SRCREV_machine ?= "36f032fc87112de000ca01b6e8a41313d418dcd9" -SRCREV_meta ?= "0db3f511b2a553a5ea31ac45249a42f084fc287c" +SRCREV_machine_qemuarm ?= "b7823b6ac25671f8dc5ee2c4cf74af3be88207cf" +SRCREV_machine ?= "7558a33fc5b60d4327b683c3376c5352cba11ed1" +SRCREV_meta ?= "a58f4e7cca3973e04d3f9a40356ef9c2c0bb10a5" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 64b4ab5879c..9c6ba1cb5e4 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "7ad48434f8e0e848f7fe4891ee7ba670700c36fc" -SRCREV_machine_qemuarm64 ?= "932cd0e7a66273eba2da54b4ac67e3c6e384e614" -SRCREV_machine_qemumips ?= "27d7f99a1211d8eca210a84c88a9058772a751a5" -SRCREV_machine_qemuppc ?= "914396443522268b332c8efe83b3b0306befd1cb" -SRCREV_machine_qemuriscv64 ?= "74244dd30b3a2415a785d2228ab5abdef4536f03" -SRCREV_machine_qemuriscv32 ?= "74244dd30b3a2415a785d2228ab5abdef4536f03" -SRCREV_machine_qemux86 ?= "74244dd30b3a2415a785d2228ab5abdef4536f03" -SRCREV_machine_qemux86-64 ?= "74244dd30b3a2415a785d2228ab5abdef4536f03" -SRCREV_machine_qemumips64 ?= "ba30b538c1750a9fe5db275260862c99a5ed356a" -SRCREV_machine ?= "74244dd30b3a2415a785d2228ab5abdef4536f03" -SRCREV_meta ?= "0db3f511b2a553a5ea31ac45249a42f084fc287c" +SRCREV_machine_qemuarm ?= "c3a59bad41cefbe15d6bcde0ec2fe5c7ea28ba2b" +SRCREV_machine_qemuarm64 ?= "07ca3e3c85445f2c31bd081b27741c9680536168" +SRCREV_machine_qemumips ?= "10ae40d47f14b3c05dd6506c70576383c5474670" +SRCREV_machine_qemuppc ?= "bc2a7c884103143e0a4360518247fe01bf2c13d3" +SRCREV_machine_qemuriscv64 ?= "84f6a75f64961e59d61bf3d70ab17e8bb430386b" +SRCREV_machine_qemuriscv32 ?= "84f6a75f64961e59d61bf3d70ab17e8bb430386b" +SRCREV_machine_qemux86 ?= "84f6a75f64961e59d61bf3d70ab17e8bb430386b" +SRCREV_machine_qemux86-64 ?= "84f6a75f64961e59d61bf3d70ab17e8bb430386b" +SRCREV_machine_qemumips64 ?= "13998bd0244737548a21a17d1969ca65af0712b1" +SRCREV_machine ?= "84f6a75f64961e59d61bf3d70ab17e8bb430386b" +SRCREV_meta ?= "a58f4e7cca3973e04d3f9a40356ef9c2c0bb10a5" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -32,7 +32,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.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.96" +LINUX_VERSION ?= "5.10.99" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From 66949926839a266a2dc28df3bd0fc5afc50c7c8f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 9 Feb 2022 18:03:50 -0500 Subject: [PATCH 021/108] linux-yocto/5.4: update to v5.4.173 Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: 4aa2e7393e14 Linux 5.4.173 e245aaefef39 ARM: 9025/1: Kconfig: CPU_BIG_ENDIAN depends on !LD_IS_LLD d40f6eeaf513 mtd: fixup CFI on ixp4xx 1451deb164e1 ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master after reboot from Windows 7b98f61b8388 KVM: x86: remove PMU FIXED_CTR3 from msrs_to_save_all 5c69ba9e80f0 firmware: qemu_fw_cfg: fix kobject leak in probe error path 1cc36ed56138 firmware: qemu_fw_cfg: fix NULL-pointer deref on duplicate entries b543e4141570 firmware: qemu_fw_cfg: fix sysfs information leak b25e9ef29d8f rtlwifi: rtl8192cu: Fix WARNING when calling local_irq_restore() with interrupts enabled 8716657b1b4b media: uvcvideo: fix division by zero at stream start 70ae85ca124e KVM: s390: Clarify SIGP orders versus STOP/RESTART 9b45f2007ea3 perf: Protect perf_guest_cbs with RCU bd2aed0464ae vfs: fs_context: fix up param length parsing in legacy_parse_param c2f067d4ad4a orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc() 5d6af67307e8 devtmpfs regression fix: reconfigure on each mount c117b116e6b3 kbuild: Add $(KBUILD_HOSTLDFLAGS) to 'has_libelf' test Signed-off-by: Bruce Ashfield Signed-off-by: Anuj Mittal --- .../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 b7a07bb17b6..bf57321aa6d 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 ?= "e92d76afe6d8592917c0e7b948912c085e661df2" -SRCREV_meta ?= "98cce1c95fcc9a26965cbc5f038fd71d53c387c8" +SRCREV_machine ?= "04f6e2728373decb06b2c159cdf599c8813a7ea2" +SRCREV_meta ?= "9e6e627445612ea0b6cc514bcdb879de3999f175" 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.172" +LINUX_VERSION ?= "5.4.173" 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 a75570df937..53f85c8cd42 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.172" +LINUX_VERSION ?= "5.4.173" 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 ?= "10b4756eee78aa43ff9ed64da700ec6e8d97ff22" -SRCREV_machine ?= "6ab93fdc53b64e146e4f16363375c1beb37b82e4" -SRCREV_meta ?= "98cce1c95fcc9a26965cbc5f038fd71d53c387c8" +SRCREV_machine_qemuarm ?= "dd1d37cf1243bb0194f63992294c386b91b883ee" +SRCREV_machine ?= "149a477216fedee100a2a7c749d7876a5af18c3d" +SRCREV_meta ?= "9e6e627445612ea0b6cc514bcdb879de3999f175" 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 db80789ba9a..3496e42df08 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 ?= "8de1da3dc354dedef2e435e694eec6d6e72c9822" -SRCREV_machine_qemuarm64 ?= "eed7c0a64f3a7a91a130bc2e507304dc8b446a31" -SRCREV_machine_qemumips ?= "996a9660e4fab70db5cecec9c831141cd03c3d36" -SRCREV_machine_qemuppc ?= "0197cf5754b1bd4eb035c342af9cc27e8c3339ca" -SRCREV_machine_qemuriscv64 ?= "c6b015510134942076c0e111e56357656acf3dd5" -SRCREV_machine_qemux86 ?= "c6b015510134942076c0e111e56357656acf3dd5" -SRCREV_machine_qemux86-64 ?= "c6b015510134942076c0e111e56357656acf3dd5" -SRCREV_machine_qemumips64 ?= "fe2769a7c268ed224ec70fd2aaab850e4eef70dc" -SRCREV_machine ?= "c6b015510134942076c0e111e56357656acf3dd5" -SRCREV_meta ?= "98cce1c95fcc9a26965cbc5f038fd71d53c387c8" +SRCREV_machine_qemuarm ?= "7d8ca1d1b0891c023c74d79ea39e045d1a794077" +SRCREV_machine_qemuarm64 ?= "79e8b8d059d36f1c2e7e20e38f883ea8c7381ffa" +SRCREV_machine_qemumips ?= "bed90b69d8120029e8b362166c11437a257b9fdc" +SRCREV_machine_qemuppc ?= "e886407de7b10259c99c61f9538af43181f2fec3" +SRCREV_machine_qemuriscv64 ?= "9d1d023f9d659fd8678f020f3e98d735b27896fb" +SRCREV_machine_qemux86 ?= "9d1d023f9d659fd8678f020f3e98d735b27896fb" +SRCREV_machine_qemux86-64 ?= "9d1d023f9d659fd8678f020f3e98d735b27896fb" +SRCREV_machine_qemumips64 ?= "20b16bf3c848f34be5b747f27c4cfc1237bcefbd" +SRCREV_machine ?= "9d1d023f9d659fd8678f020f3e98d735b27896fb" +SRCREV_meta ?= "9e6e627445612ea0b6cc514bcdb879de3999f175" # 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.172" +LINUX_VERSION ?= "5.4.173" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From 963a1f6b4121fb41ff7d1d35217a676376dea2c1 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 9 Feb 2022 18:03:51 -0500 Subject: [PATCH 022/108] linux-yocto/5.4: update to v5.4.176 Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: 2570bb2729c7 Linux 5.4.176 5e2a4d02252f mtd: rawnand: mpc5121: Remove unused variable in ads5121_select_chip() 6cbf4c731d78 block: Fix wrong offset in bio_truncate() 33a9ba52d5ea fsnotify: invalidate dcache before IN_DELETE event b52103cbb659 dt-bindings: can: tcan4x5x: fix mram-cfg RX FIFO config e913171594ea ipv4: remove sparse error in ip_neigh_gw4() c30ecdba9e5a ipv4: tcp: send zero IPID in SYNACK messages 51dde4ae5a37 ipv4: raw: lock the socket in raw_bind() 2d334469c29e net: hns3: handle empty unknown interrupt for VF 7afc09c8915b yam: fix a memory leak in yam_siocdevprivate() 51edc483af6c drm/msm/hdmi: Fix missing put_device() call in msm_hdmi_get_phy a15ed3e9887f ibmvnic: don't spin in tasklet c09702f43a6a ibmvnic: init ->running_cap_crqs early 86217a4ebd18 hwmon: (lm90) Mark alert as broken for MAX6654 18684bb996f3 rxrpc: Adjust retransmission backoff f39027cbada4 phylib: fix potential use-after-free 218cccb52124 net: phy: broadcom: hook up soft_reset for BCM54616S 0d26470b25d2 netfilter: conntrack: don't increment invalid counter on NF_REPEAT abcb9d80a4a5 NFS: Ensure the server has an up to date ctime before renaming 30965c768217 NFS: Ensure the server has an up to date ctime before hardlinking cdfaf8e985f8 ipv6: annotate accesses to fn->fn_sernum 581317b1f001 drm/msm/dsi: invalid parameter check in msm_dsi_phy_enable b3e3d584f0f1 drm/msm/dsi: Fix missing put_device() call in dsi_get_phy 4abd2a7735e1 drm/msm: Fix wrong size calculation 9f0a6acac4a1 net-procfs: show net devices bound packet types 4fd45ff2b404 NFSv4: nfs_atomic_open() can race when looking up a non-regular file 0dfacee40021 NFSv4: Handle case where the lookup of a directory fails c27abaa040f3 hwmon: (lm90) Reduce maximum conversion rate for G781 1f748455a8f0 ipv4: avoid using shared IP generator for connected sockets ca5355771ca8 ping: fix the sk_bound_dev_if match in ping_lookup 0b567a24addc hwmon: (lm90) Mark alert as broken for MAX6680 b63031651a05 hwmon: (lm90) Mark alert as broken for MAX6646/6647/6649 e372ecd455b6 net: fix information leakage in /proc/net/ptype 20b7af413153 ipv6_tunnel: Rate limit warning messages bf2bd892a0cb scsi: bnx2fc: Flush destroy_work queue before calling bnx2fc_interface_put() d380beb5e58d rpmsg: char: Fix race between the release of rpmsg_eptdev and cdev da27b834c1e0 rpmsg: char: Fix race between the release of rpmsg_ctrldev and cdev cb24af19e5a7 i40e: fix unsigned stat widths be6998f232b8 i40e: Fix queues reservation for XDP b16f1a078d63 i40e: Fix issue when maximum queues is exceeded f18aadbdf6ad i40e: Increase delay to 1 s after global EMP reset 7e94539448ed powerpc/32: Fix boot failure with GCC latent entropy plugin ff19d70b665d net: sfp: ignore disabled SFP node 5ede72d48cab ucsi_ccg: Check DEV_INT bit only when starting CCG4 3922b6e1c9ea usb: typec: tcpm: Do not disconnect while receiving VBUS off 9c61fce322ac USB: core: Fix hang in usb_kill_urb by adding memory barriers 4fc6519bdecb usb: gadget: f_sourcesink: Fix isoc transfer for USB_SPEED_SUPER_PLUS 64e671a22163 usb: common: ulpi: Fix crash in ulpi_match() d66dc656c5f9 usb-storage: Add unusual-devs entry for VL817 USB-SATA bridge a06cba5ad125 tty: Add support for Brainboxes UC cards. f5e6c946732a tty: n_gsm: fix SW flow control encoding/handling 05b330118888 serial: stm32: fix software flow control transfer 0b92eda2d801 serial: 8250: of: Fix mapped region size when using reg-offset property 2bf7dee6f423 netfilter: nft_payload: do not update layer 4 checksum when mangling fragments a6d588572568 arm64: errata: Fix exec handling in erratum 1418040 workaround 5cbcd1f5a20a drm/etnaviv: relax submit size limits 5463cfd83397 fsnotify: fix fsnotify hooks in pseudo filesystems 1614bd844eef tracing: Don't inc err_log entry count if entry allocation fails 8a8878ebb596 tracing/histogram: Fix a potential memory leak for kstrdup() 73578a9b2b72 PM: wakeup: simplify the output logic of pm_show_wakelocks() 31136e5467f3 udf: Fix NULL ptr deref when converting from inline format 86bcc670d300 udf: Restore i_lenAlloc when inode expansion fails c54445af64ca scsi: zfcp: Fix failed recovery on gone remote port with non-NPIV FCP devices 4d041e75c4c4 s390/hypfs: include z/VM guests with access control group set 835d37068525 Bluetooth: refactor malicious adv data check 7cdf2951f80d Linux 5.4.175 84b1259fe36a drm/vmwgfx: Fix stale file descriptors on failed usercopy 16895e4eac36 select: Fix indefinitely sleeping task in poll_schedule_timeout() 53d5b08d8e98 mmc: sdhci-esdhc-imx: disable CMDQ support c3fa7ce43cdd ARM: dts: gpio-ranges property is now required 75278f1aff5e pinctrl: bcm2835: Change init order for gpio hogs 0d006bb08d76 pinctrl: bcm2835: Add support for wake-up interrupts 08fd6274380a pinctrl: bcm2835: Match BCM7211 compatible string ac3daf50c150 pinctrl: bcm2835: Add support for all GPIOs on BCM2711 e5237171117c pinctrl: bcm2835: Refactor platform data 33e48b5305eb pinctrl: bcm2835: Drop unused define 75ca9c1d96c7 rcu: Tighten rcu_advance_cbs_nowake() checks 1b5553c79d52 drm/i915: Flush TLBs before releasing backing store 411d8da1c843 Linux 5.4.174 2c9650faa19c Revert "ia64: kprobes: Use generic kretprobe trampoline handler" d106693dfd21 mtd: nand: bbt: Fix corner case in bad block table handling 0c1b20381926 lib/test_meminit: destroy cache in kmem_cache_alloc_bulk() test a836180fc53a lib82596: Fix IRQ check in sni_82596_probe 3903f65a5a9f scripts/dtc: dtx_diff: remove broken example from help text b0e5b352fe12 dt-bindings: display: meson-vpu: Add missing amlogic,canvas property e3e561707c28 dt-bindings: display: meson-dw-hdmi: add missing sound-name-prefix property 810d3fac215d net: ethernet: mtk_eth_soc: fix error checking in mtk_mac_config() e81d42e5445a bcmgenet: add WOL IRQ check 3bd7629eb8b2 net_sched: restore "mpu xxx" handling 918b3dbf0315 arm64: dts: qcom: msm8996: drop not documented adreno properties 1e0e01eb2589 dmaengine: at_xdmac: Fix at_xdmac_lld struct definition ca48aa7de702 dmaengine: at_xdmac: Fix lld view setting 0366901b7b02 dmaengine: at_xdmac: Fix concurrency over xfers_list d56e1fcb7b5b dmaengine: at_xdmac: Print debug message after realeasing the lock 7163076f252e dmaengine: at_xdmac: Don't start transactions at tx_submit level 9fbe8ea8df20 perf script: Fix hex dump character output e7e3f9634ae6 libcxgb: Don't accidentally set RTO_ONLINK in cxgb_find_route() 91e58091a6bd gre: Don't accidentally set RTO_ONLINK in gre_fill_metadata_dst() 1e06cb37febe xfrm: Don't accidentally set RTO_ONLINK in decode_session4() d6bfcc8d9541 netns: add schedule point in ops_exit_list() 577d3c5291dc inet: frags: annotate races around fqdir->dead and fqdir->high_thresh 967ec4b05918 rtc: pxa: fix null pointer dereference 1623e00e407c net: axienet: increase default TX ring size to 128 88d7727796a6 net: axienet: fix number of TX ring slots for available check d2765d89fe38 net: axienet: limit minimum TX ring size 2612e3567665 clk: si5341: Fix clock HW provider cleanup 7a831993a9a8 af_unix: annote lockless accesses to unix_tot_inflight & gc_in_progress fdc1ce979061 f2fs: fix to reserve space for IO align feature f852afb6c072 parisc: pdc_stable: Fix memory leak in pdcs_register_pathentries d25fe9c255b6 net/fsl: xgmac_mdio: Fix incorrect iounmap when removing module 682a1e0ecbda ipv4: avoid quadratic behavior in netns dismantle e6669fba04ad bpftool: Remove inclusion of utilities.mak from Makefiles 9e5a74b6326b powerpc/fsl/dts: Enable WA for erratum A-009885 on fman3l MDIO buses 461aedcf68e0 powerpc/cell: Fix clang -Wimplicit-fallthrough warning 261f9917648e Revert "net/mlx5: Add retry mechanism to the command entry index allocation" 6926d427941a dmaengine: stm32-mdma: fix STM32_MDMA_CTBR_TSEL_MASK d2d453940b62 RDMA/rxe: Fix a typo in opcode name 1a3f263e05d1 RDMA/hns: Modify the mapping attribute of doorbell to device 0cb05af4bf87 scsi: core: Show SCMD_LAST in text form 59c7ff950915 Documentation: fix firewire.rst ABI file path error dafbd79e423e Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization 2ecbe50b2b8e Documentation: ACPI: Fix data node reference documentation 49daee55004b Documentation: dmaengine: Correctly describe dmatest with channel unset 05594394dc27 media: rcar-csi2: Optimize the selection PHTW register 547ea2d23ec6 firmware: Update Kconfig help text for Google firmware 515ca9f56833 of: base: Improve argument length mismatch error 227afbfe47b5 drm/radeon: fix error handling in radeon_driver_open_kms d820cb636563 ext4: don't use the orphan list when migrating an inode 85c121cf17fd ext4: Fix BUG_ON in ext4_bread when write quota data b985c8521dac ext4: set csum seed in tmp inode while migrating to extents 6e23e0bb1a11 ext4: make sure quota gets properly shutdown on error 86be63aea2b1 ext4: make sure to reset inode lockdep class when quota enabling fails e5999c49cd90 btrfs: respect the max size in the header when activating swap file 85dc4aac7e99 btrfs: check the root node for uptodate before returning it eeec77bb53a5 btrfs: fix deadlock between quota enable and other quota operations e89514082668 xfrm: fix policy lookup for ipv6 gre packets 09af149541d9 PCI: pci-bridge-emul: Set PCI_STATUS_CAP_LIST for PCIe device e904b46073a1 PCI: pci-bridge-emul: Correctly set PCIe capabilities ab57ac7299e2 PCI: pci-bridge-emul: Properly mark reserved PCIe bits in PCI config space db531b57cb50 drm/bridge: analogix_dp: Make PSR-exit block less 17d492d39e17 drm/nouveau/kms/nv04: use vzalloc for nv04_display 0d0e56a1a945 drm/etnaviv: limit submit sizes 72a953efcbd6 s390/mm: fix 2KB pgtable release race da4e1facccc7 iwlwifi: mvm: Increase the scan timeout guard to 30 seconds 11604a3a6bed tracing/kprobes: 'nmissed' not showed correctly for kretprobe ae2e0b2f2ba3 cputime, cpuacct: Include guest time in user time in cpuacct.stat c526d53edd21 serial: Fix incorrect rs485 polarity on uart open 19a61f92fa6b fuse: Pass correct lend value to filemap_write_and_wait_range() 8130a1c0bf8a ubifs: Error path in ubifs_remount_rw() seems to wrongly free write buffers 011024b0f695 crypto: caam - replace this_cpu_ptr with raw_cpu_ptr 973669290ad3 crypto: stm32/crc32 - Fix kernel BUG triggered in probe() 0c0fd11c9c77 crypto: omap-aes - Fix broken pm_runtime_and_get() usage b728b5295d1b rpmsg: core: Clean up resources on announce_create failure. 9e2c8bd78488 power: bq25890: Enable continuous conversion for ADC at charging f16a5bce3fd3 ASoC: mediatek: mt8173: fix device_node leak 5d635c25983e scsi: sr: Don't use GFP_DMA 1785538d273c MIPS: Octeon: Fix build errors using clang bb7d1de681f9 i2c: designware-pci: Fix to change data types of hcnt and lcnt parameters 6abdf6722cd2 MIPS: OCTEON: add put_device() after of_find_device_by_node() 2a8870f5cb2a powerpc: handle kdump appropriately with crash_kexec_post_notifiers option 2dbb618e241a ALSA: seq: Set upper limit of processed events 1ad4f94630c0 scsi: lpfc: Trigger SLI4 firmware dump before doing driver cleanup 73ed9127b8e8 w1: Misuse of get_user()/put_user() reported by sparse b8e5376c273c KVM: PPC: Book3S: Suppress failed alloc warning in H_COPY_TOFROM_GUEST aecdb1d24210 powerpc/powermac: Add missing lockdep_register_key() 2c146cf97bcb clk: meson: gxbb: Fix the SDM_EN bit for MPLL0 on GXBB e441d3cb760b i2c: mpc: Correct I2C reset procedure f231d1d22bad powerpc/smp: Move setup_profiling_timer() under CONFIG_PROFILING aca56c298e2a i2c: i801: Don't silently correct invalid transfer size aea9d368480f powerpc/watchdog: Fix missed watchdog reset due to memory ordering race 5a3cda54ffd0 powerpc/btext: add missing of_node_put fd0135fc6f0a powerpc/cell: add missing of_node_put 67329fb6a8e2 powerpc/powernv: add missing of_node_put 5bea763aec17 powerpc/6xx: add missing of_node_put ecfe73aec681 parisc: Avoid calling faulthandler_disabled() twice 5e126f68808c random: do not throw away excess input to crng_fast_load 8f6cecfff36c serial: core: Keep mctrl register state and cached copy in sync 6f7bd9f7c893 serial: pl010: Drop CR register reset on set_termios c5e156a62744 regulator: qcom_smd: Align probe function with rpmh-regulator 4a55b02b647e net: gemini: allow any RGMII interface mode 4bee2316c574 net: phy: marvell: configure RGMII delays for 88E1118 b3fbe7565f8e dm space map common: add bounds check to sm_ll_lookup_bitmap() 052f64013701 dm btree: add a defensive bounds check to insert_at() aaefb1833309 mac80211: allow non-standard VHT MCS-10/11 5253794b19f6 net: mdio: Demote probed message to debug print 8508caebe60e btrfs: remove BUG_ON(!eie) in find_parent_nodes 7d4f4075e78b btrfs: remove BUG_ON() in find_parent_nodes() ba72fa2cb2f2 ACPI: battery: Add the ThinkPad "Not Charging" quirk 7c366d75a44a drm/amdgpu: fixup bad vram size on gmc v8 88b5abc0c61d ACPICA: Hardware: Do not flush CPU cache when entering S4 and S5 de85f5861894 ACPICA: Fix wrong interpretation of PCC address 1fa8e71d0022 ACPICA: Executer: Fix the REFCLASS_REFOF case in acpi_ex_opcode_1A_0T_1R() aee78b668ef5 ACPICA: Utilities: Avoid deleting the same object twice in a row a4c6cde223d2 ACPICA: actypes.h: Expand the ACPI_ACCESS_ definitions 56c308c7302b jffs2: GC deadlock reading a page that is used in jffs2_write_begin() c02454b3c85b um: registers: Rename function names to avoid conflicts and build problems 51b44e9b14a6 iwlwifi: mvm: Fix calculation of frame length 95017cf0a367 iwlwifi: remove module loading failure message 0446cafa843e iwlwifi: fix leaks/bad data after failed firmware load c8fe499c4565 ath9k: Fix out-of-bound memcpy in ath9k_hif_usb_rx_stream 46fdba26cdff usb: hub: Add delay for SuperSpeed hub resume to let links transit to U0 8ac2cf0253a5 cpufreq: Fix initialization of min and max frequency QoS requests bfcc1e9c2e00 arm64: tegra: Adjust length of CCPLEX cluster MMIO region 65816c103476 arm64: dts: ls1028a-qds: move rtc node to the correct i2c bus dcf1d9f76f71 audit: ensure userspace is penalized the same as the kernel when under pressure 5cc8a367851b mmc: core: Fixup storing of OCR for MMC_QUIRK_NONSTD_SDIO 3a7f37eb2083 media: saa7146: hexium_gemini: Fix a NULL pointer dereference in hexium_attach() 71b6d05db553 media: igorplugusb: receiver overflow should be reported 1af9e1d4885a HID: quirks: Allow inverting the absolute X/Y values 75f7885dc257 bpf: Do not WARN in bpf_warn_invalid_xdp_action() 086181b0ffde net: bonding: debug: avoid printing debug logs when bond is not notifying peers fcd7e8ccc437 x86/mce: Mark mce_read_aux() noinstr a0d171398dcd x86/mce: Mark mce_end() noinstr bca5aa920274 x86/mce: Mark mce_panic() noinstr 2481ee0ce59c gpio: aspeed: Convert aspeed_gpio.lock to raw_spinlock 743911a2bf8b net: phy: prefer 1000baseT over 1000baseKX a5d8e6189b13 net-sysfs: update the queue counts in the unregistration path d08cc0223a78 ath10k: Fix tx hanging 054281b3548d iwlwifi: mvm: synchronize with FW after multicast commands fe791612afab media: m920x: don't use stack on USB reads a821532ce5ec media: saa7146: hexium_orion: Fix a NULL pointer dereference in hexium_attach() b867a9c3de09 media: uvcvideo: Increase UVC_CTRL_CONTROL_TIMEOUT to 5 seconds. ff867910e87c x86/mm: Flush global TLB when switching to trampoline page-table 16f2ef98cccf floppy: Add max size check for user space request 3ad5c9e50263 usb: uhci: add aspeed ast2600 uhci support c27a52321190 rsi: Fix out-of-bounds read in rsi_read_pkt() 51ad4c448611 rsi: Fix use-after-free in rsi_rx_done_handler() ae56c5524a75 mwifiex: Fix skb_over_panic in mwifiex_usb_recv() 4ff69cf3b1c8 HSI: core: Fix return freed object in hsi_new_client 009d6d9fea8c gpiolib: acpi: Do not set the IRQ type if the IRQ is already in use 50ad94f8654a drm/bridge: megachips: Ensure both bridges are probed before registration c640dc459b7e mlxsw: pci: Add shutdown method in PCI driver f6b650941942 EDAC/synopsys: Use the quirk for version instead of ddr version 2134ebc2d0ad media: b2c2: Add missing check in flexcop_pci_isr: 2933aa510907 HID: apple: Do not reset quirks when the Fn key is not found a62523988129 drm: panel-orientation-quirks: Add quirk for the Lenovo Yoga Book X91F/L 0cba42c09ac8 usb: gadget: f_fs: Use stream_open() for endpoint files c7e4004b38aa batman-adv: allow netlink usage in unprivileged containers c93a934f812e ARM: shmobile: rcar-gen2: Add missing of_node_put() c9ec3d85c0ee drm/nouveau/pmu/gm200-: avoid touching PMU outside of DEVINIT/PREOS/ACR 3642493839af ar5523: Fix null-ptr-deref with unexpected WDCMSG_TARGET_START reply c7186605d878 drm/lima: fix warning when CONFIG_DEBUG_SG=y & CONFIG_DMA_API_DEBUG=y 58cddfe67745 fs: dlm: filter user dlm messages for kernel locks fa4ca508c25c Bluetooth: Fix debugfs entry leak in hci_register_dev() 2b09cb8d92a5 of: base: Fix phandle argument length mismatch error message f88ccfb3f2d9 RDMA/cxgb4: Set queue pair state when being queried 38d97204a24b mips: bcm63xx: add support for clk_set_parent() d12b5cfab493 mips: lantiq: add support for clk_set_parent() 770e92dbc9f6 misc: lattice-ecp3-config: Fix task hung when firmware load failed 458c253b2577 ASoC: samsung: idma: Check of ioremap return value 8b894d503ed7 ASoC: mediatek: Check for error clk pointer 41d2dc9110e0 phy: uniphier-usb3ss: fix unintended writing zeros to PHY register dc03527ca12b iommu/iova: Fix race between FQ timeout and teardown 86233ee4b4b9 dmaengine: pxa/mmp: stop referencing config->slave_id 741a26cf3134 clk: stm32: Fix ltdc's clock turn off by clk_disable_unused() after system enter shell 35d7be242cd9 ASoC: rt5663: Handle device_property_read_u32_array error codes 200f00382f08 RDMA/cma: Let cma_resolve_ib_dev() continue search even after empty entry 6314e22a998e RDMA/core: Let ib_find_gid() continue search even after empty entry 2e89a39fd702 powerpc/powermac: Add additional missing lockdep_register_key() 9367675e76b8 PCI/MSI: Fix pci_irq_vector()/pci_irq_get_affinity() 27a90275e8f7 scsi: ufs: Fix race conditions related to driver data b9b691de3c99 iommu/io-pgtable-arm: Fix table descriptor paddr formatting 48fc8eebd174 binder: fix handling of error during copy f3c2c7f3f884 char/mwave: Adjust io port register size e607cd712d5d ALSA: oss: fix compile error when OSS_DEBUG is enabled 5daf39257079 ASoC: uniphier: drop selecting non-existing SND_SOC_UNIPHIER_AIO_DMA 7e2ce332aacc powerpc/prom_init: Fix improper check of prom_getprop() 506184ded655 clk: imx8mn: Fix imx8mn_clko1_sels 852f447ce0c1 RDMA/hns: Validate the pkey index 9927848b1ce5 ALSA: hda: Add missing rwsem around snd_ctl_remove() calls 79b89d3ab5a9 ALSA: PCM: Add missing rwsem around snd_ctl_remove() calls 86fecb7f50b5 ALSA: jack: Add missing rwsem around snd_ctl_remove() calls 970d9082043d ext4: avoid trim error on fs with small groups 2e5f08a5f8b5 net: mcs7830: handle usb read errors properly ff09d5951b81 pcmcia: fix setting of kthread task states f56b423bce1e can: xilinx_can: xcan_probe(): check for error irq 58533bbd5cf1 can: softing: softing_startstop(): fix set but not used variable warning 13af3a9b1ba6 tpm: add request_locality before write TPM_INT_ENABLE 5d5223beb6e2 spi: spi-meson-spifc: Add missing pm_runtime_disable() in meson_spifc_probe 74dd45122b84 net/mlx5: Set command entry semaphore up once got index free 2b7816b1e90e Revert "net/mlx5e: Block offload of outer header csum for UDP tunnels" 2f2336ca68b9 net/mlx5e: Don't block routes with nexthop objects in SW fca92bb20ced debugfs: lockdown: Allow reading debugfs files that are not world readable 46541f21de5c HID: hid-uclogic-params: Invalid parameter check in uclogic_params_frame_init_v1_buttonpad f6fbc6a0502c HID: hid-uclogic-params: Invalid parameter check in uclogic_params_huion_init 1f660b3ff5d6 HID: hid-uclogic-params: Invalid parameter check in uclogic_params_get_str_desc 3f4823c651bd HID: hid-uclogic-params: Invalid parameter check in uclogic_params_init 1b7443f4ebf1 Bluetooth: hci_bcm: Check for error irq 4ceb319006e8 fsl/fman: Check for null pointer after calling devm_ioremap e2e1ceb8ca7a staging: greybus: audio: Check null pointer b78473575fbe rocker: fix a sleeping in atomic bug 385b8fe39802 ppp: ensure minimum packet size in ppp_write() c7a99af48c55 bpf: Fix SO_RCVBUF/SO_SNDBUF handling in _bpf_setsockopt(). 4e8307203d73 netfilter: ipt_CLUSTERIP: fix refcount leak in clusterip_tg_check() ad6674562819 pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in nonstatic_find_mem_region() 17162e260178 pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in __nonstatic_find_io_region() 6cdbf5b6e4cf ACPI: scan: Create platform device for BCM4752 and LNV4752 ACPI nodes d49992de0077 x86/mce/inject: Avoid out-of-bounds write when setting flags a259c73dddb3 bpftool: Enable line buffering for stdout eb599bf3bae5 selinux: fix potential memleak in selinux_add_opt() 8fe5e6ed36a5 mmc: meson-mx-sdio: add IRQ check db6eb2f94ad7 ARM: dts: armada-38x: Add generic compatible to UART nodes 1b10eb460dc1 usb: ftdi-elan: fix memory leak on device disconnect 3f8edc28c02b ARM: 9159/1: decompressor: Avoid UNPREDICTABLE NOP encoding 25dfc85fceeb xfrm: state and policy should fail if XFRMA_IF_ID 0 b34fadb521c9 xfrm: interface with if_id 0 should return error ba7d5b3e33a5 media: hantro: Fix probe func error path 26cf595abd9a drm/bridge: ti-sn65dsi86: Set max register for regmap a6d408452c16 drm/msm/dpu: fix safe status debugfs file 036fcde6c7d0 media: coda/imx-vdoa: Handle dma_set_coherent_mask error codes 7089b97b46b6 media: msi001: fix possible null-ptr-deref in msi001_probe() 04691afdbc34 media: dw2102: Fix use after free b153346f0ffe ARM: dts: gemini: NAS4220-B: fis-index-block with 128 KiB sectors 4c66717867b9 crypto: stm32/cryp - fix lrw chaining mode 46d85cdd472a crypto: stm32/cryp - fix double pm exit 17bb09710c6b crypto: stm32/cryp - fix xts and race condition in crypto_engine requests fe211ebe8e14 xfrm: fix a small bug in xfrm_sa_len() b3e50e041b68 mwifiex: Fix possible ABBA deadlock 236399a60ec9 rcu/exp: Mark current CPU as exp-QS in IPI loop second pass b67881059f8f sched/rt: Try to restart rt period timer when rt runtime exceeded a26a338f4df6 media: si2157: Fix "warm" tuner state detection dc3b4b60a0d6 media: saa7146: mxb: Fix a NULL pointer dereference in mxb_attach() f39bd2900fd4 media: dib8000: Fix a memleak in dib8000_init() 62bff2a806b0 Bluetooth: btmtksdio: fix resume failure 80f81e4bcc2a staging: rtl8192e: rtllib_module: fix error handle case in alloc_rtllib() 9f49cf5196d9 staging: rtl8192e: return error code from rtllib_softmac_init() 84e568531b9e floppy: Fix hang in watchdog when disk is ejected 6a4160c9f2ec serial: amba-pl011: do not request memory region twice 96591a7e66ba tty: serial: uartlite: allow 64 bit address d3aee4338f1d arm64: dts: ti: k3-j721e: Fix the L2 cache sets 15115464eba2 drm/radeon/radeon_kms: Fix a NULL pointer dereference in radeon_driver_open_kms() 46ec86ea0d02 drm/amdgpu: Fix a NULL pointer dereference in amdgpu_connector_lcd_native_mode() 77af47f26987 ACPI: EC: Rework flushing of EC work while suspended to idle f996dab1a846 arm64: dts: qcom: msm8916: fix MMC controller aliases 54b5ab456e00 netfilter: bridge: add support for pppoe filtering 04bb89f51cba media: venus: core: Fix a resource leak in the error handling path of 'venus_probe()' 8034d6c40e43 media: mtk-vcodec: call v4l2_m2m_ctx_release first when file is released f77b90341055 media: si470x-i2c: fix possible memory leak in si470x_i2c_probe() a3c5386a515f media: imx-pxp: Initialize the spinlock prior to using it 0410f7ac04b3 media: rcar-csi2: Correct the selection of hsfreqrange 62866d6542ea tty: serial: atmel: Call dma_async_issue_pending() cd867ffa14a8 tty: serial: atmel: Check return code of dmaengine_submit() 06d6f696873b arm64: dts: ti: k3-j721e: correct cache-sets info ac718d92b6dc crypto: qce - fix uaf on qce_ahash_register_one be6ee09c9ece media: dmxdev: fix UAF when dvb_register_device() fails da0b42d1c3fb tee: fix put order in teedev_close_context() 24161b9c43de Bluetooth: stop proccessing malicious adv data 50a981742363 arm64: dts: meson-gxbb-wetek: fix missing GPIO binding e48e1d3e0f85 arm64: dts: meson-gxbb-wetek: fix HDMI in early boot 1221b3adf539 media: aspeed: Update signal status immediately to ensure sane hw state 15df887c6248 media: em28xx: fix memory leak in em28xx_init_dev 58f08f024c72 media: aspeed: fix mode-detect always time out at 2nd run dc644dd8a00c media: videobuf2: Fix the size printk format e51b0099c870 wcn36xx: Release DMA channel descriptor allocations 2aa2da3fb522 wcn36xx: Indicate beacon not connection loss on MISSED_BEACON_IND 457b05f39116 clk: bcm-2835: Remove rounding up the dividers aac1ed30597c clk: bcm-2835: Pick the closest clock rate ba4cc4968917 Bluetooth: cmtp: fix possible panic when cmtp_init_sockets() fails 141a9a9cae28 drm/rockchip: dsi: Fix unbalanced clock on probe error bcd6bfe12be0 drm/panel: innolux-p079zca: Delete panel on attach() failure 4c255e98aa05 drm/panel: kingdisplay-kd097d04: Delete panel on attach() failure 5cc7480e63a3 drm/rockchip: dsi: Reconfigure hardware on resume() 0620aabea8d8 drm/rockchip: dsi: Hold pm-runtime across bind/unbind 6264d0fef906 shmem: fix a race between shmem_unused_huge_shrink and shmem_evict_inode 9d8fb273d5ee mm/page_alloc.c: do not warn allocation failure on zone DMA if no managed pages 7ad300800c43 mm_zone: add function to check if managed dma zone exists c4212d52f926 PCI: Add function 1 DMA alias quirk for Marvell 88SE9125 SATA controller 9e5bb22beb3c dma_fence_array: Fix PENDING_ERROR leak in dma_fence_array_signaled() e12f983c4a3c iommu/io-pgtable-arm-v7s: Add error handle for page table allocation failure 81a026b9c33d lkdtm: Fix content of section containing lkdtm_rodata_do_nothing() 3cead5b7a88c can: softing_cs: softingcs_probe(): fix memleak on registration failure 38e28033a56b media: stk1160: fix control-message timeouts 0ac3d5f6f956 media: pvrusb2: fix control-message timeouts d1c57f558d24 media: redrat3: fix control-message timeouts 7a9d34be181f media: dib0700: fix undefined behavior in tuner shutdown f64b379bde39 media: s2255: fix control-message timeouts 3a49cd738b07 media: cpia2: fix control-message timeouts c9ef6e1d5025 media: em28xx: fix control-message timeouts c89df039e811 media: mceusb: fix control-message timeouts 22325141e94c media: flexcop-usb: fix control-message timeouts 7458b0189e87 media: v4l2-ioctl.c: readbuffers depends on V4L2_CAP_READWRITE 023357dd2eaf rtc: cmos: take rtc_lock while reading from CMOS 9a82bfb442b7 tools/nolibc: fix incorrect truncation of exit code 2e83886c0420 tools/nolibc: i386: fix initial stack alignment aca2988eddb9 tools/nolibc: x86-64: Fix startup code bug a4b5d9af4af5 x86/gpu: Reserve stolen memory for first integrated Intel GPU f55dbf729872 mtd: rawnand: gpmi: Remove explicit default gpmi clock setting for i.MX6 29218853877a mtd: rawnand: gpmi: Add ERR007117 protection for nfc_apply_timings ba2539b5f958 nfc: llcp: fix NULL error pointer dereference on sendmsg() after failed bind() eb116c891ba1 f2fs: fix to do sanity check in is_alive() bf9e52c0a9d9 HID: wacom: Avoid using stale array indicies to read contact count 5d1023f33c6d HID: wacom: Ignore the confidence flag when a touch is removed 60257988d6f9 HID: wacom: Reset expected and received contact counts at the same time 898e69caad0f HID: uhid: Fix worker destroying device without any protection Signed-off-by: Bruce Ashfield Signed-off-by: Anuj Mittal --- .../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 bf57321aa6d..db54fd29d97 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 ?= "04f6e2728373decb06b2c159cdf599c8813a7ea2" -SRCREV_meta ?= "9e6e627445612ea0b6cc514bcdb879de3999f175" +SRCREV_machine ?= "b24dd7e4d381fb2b855e46428087f1d2d5a2e98f" +SRCREV_meta ?= "25910e8585d93aa555c747a9aaedccbc405c5134" 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.173" +LINUX_VERSION ?= "5.4.176" 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 53f85c8cd42..227356a1261 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.173" +LINUX_VERSION ?= "5.4.176" 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 ?= "dd1d37cf1243bb0194f63992294c386b91b883ee" -SRCREV_machine ?= "149a477216fedee100a2a7c749d7876a5af18c3d" -SRCREV_meta ?= "9e6e627445612ea0b6cc514bcdb879de3999f175" +SRCREV_machine_qemuarm ?= "ce298ed73f24a8529058476004cb973c86432cd9" +SRCREV_machine ?= "0b50f433a66bfa7ff4baaf1383a53aa9bfec7b66" +SRCREV_meta ?= "25910e8585d93aa555c747a9aaedccbc405c5134" 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 3496e42df08..af6c916639c 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 ?= "7d8ca1d1b0891c023c74d79ea39e045d1a794077" -SRCREV_machine_qemuarm64 ?= "79e8b8d059d36f1c2e7e20e38f883ea8c7381ffa" -SRCREV_machine_qemumips ?= "bed90b69d8120029e8b362166c11437a257b9fdc" -SRCREV_machine_qemuppc ?= "e886407de7b10259c99c61f9538af43181f2fec3" -SRCREV_machine_qemuriscv64 ?= "9d1d023f9d659fd8678f020f3e98d735b27896fb" -SRCREV_machine_qemux86 ?= "9d1d023f9d659fd8678f020f3e98d735b27896fb" -SRCREV_machine_qemux86-64 ?= "9d1d023f9d659fd8678f020f3e98d735b27896fb" -SRCREV_machine_qemumips64 ?= "20b16bf3c848f34be5b747f27c4cfc1237bcefbd" -SRCREV_machine ?= "9d1d023f9d659fd8678f020f3e98d735b27896fb" -SRCREV_meta ?= "9e6e627445612ea0b6cc514bcdb879de3999f175" +SRCREV_machine_qemuarm ?= "eecb4a32b034e7ac5f3e54f68cf5263499f79b6f" +SRCREV_machine_qemuarm64 ?= "6786585bee3d0de9cd8886fa4be54eafd0aeac8a" +SRCREV_machine_qemumips ?= "4fe08e5a1c9b437ad0276448cfa63c5fa1b8303b" +SRCREV_machine_qemuppc ?= "0f5916a777fc69030480f19b097b0e9fc035f4bf" +SRCREV_machine_qemuriscv64 ?= "7cff5cd60103d5af3dd1e6b13bff1c7a9ef8e99d" +SRCREV_machine_qemux86 ?= "7cff5cd60103d5af3dd1e6b13bff1c7a9ef8e99d" +SRCREV_machine_qemux86-64 ?= "7cff5cd60103d5af3dd1e6b13bff1c7a9ef8e99d" +SRCREV_machine_qemumips64 ?= "f15ba204e8f1c7fe33b248ae19d1b0b851c7272d" +SRCREV_machine ?= "7cff5cd60103d5af3dd1e6b13bff1c7a9ef8e99d" +SRCREV_meta ?= "25910e8585d93aa555c747a9aaedccbc405c5134" # 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.173" +LINUX_VERSION ?= "5.4.176" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From 10072a58481f025176fc289bdffecc28185ad462 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 9 Feb 2022 18:03:52 -0500 Subject: [PATCH 023/108] linux-yocto/5.4: update to v5.4.178 Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: 76fd334f07cc Linux 5.4.178 ed339069725a cgroup/cpuset: Fix "suspicious RCU usage" lockdep warning c8d7d7c58e64 ext4: fix error handling in ext4_restore_inline_data() f4a575eada7c EDAC/xgene: Fix deferred probing 0f1ca7cea596 EDAC/altera: Fix deferred probing 66c5aa5726bc rtc: cmos: Evaluate century appropriate 2ffe36c9c4b6 selftests: futex: Use variable MAKE instead of make c17a316f3d53 nfsd: nfsd4_setclientid_confirm mistakenly expires confirmed client. 53e4f71763c6 scsi: bnx2fc: Make bnx2fc_recv_frame() mp safe bfba4e8088ca pinctrl: bcm2835: Fix a few error paths 71e60c170105 ASoC: max9759: fix underflow in speaker_gain_control_put() e7e396324fe2 ASoC: cpcap: Check for NULL pointer after calling of_get_child_by_name 7709133f1f7a ASoC: xilinx: xlnx_formatter_pcm: Make buffer bytes multiple of period bytes e51b323f891f ASoC: fsl: Add missing error handling in pcm030_fabric_probe 04698be843dc drm/i915/overlay: Prevent divide by zero bugs in scaling 4a674b8e8a3c net: stmmac: ensure PTP time register reads are consistent 9afc02864031 net: stmmac: dump gmac4 DMA registers correctly 77454c9ada77 net: macsec: Verify that send_sci is on when setting Tx sci explicitly dc8c2f0d010c net: ieee802154: Return meaningful error codes from the netlink helpers 6f38d3a6ec11 net: ieee802154: ca8210: Stop leaking skb's 859ded7ac2a6 net: ieee802154: mcr20a: Fix lifs/sifs periods 13be1165efda net: ieee802154: hwsim: Ensure proper channel selection at probe time 8cfa026a212e spi: meson-spicc: add IRQ check in meson_spicc_probe fe58eb96bb41 spi: mediatek: Avoid NULL pointer crash in interrupt c9fc48511c65 spi: bcm-qspi: check for valid cs before applying chip select 6e0498e24b13 iommu/amd: Fix loop timeout issue in iommu_ga_log_enable() 5c43d46daa0d iommu/vt-d: Fix potential memory leak in intel_setup_irq_remapping() cff7faba8884 RDMA/mlx4: Don't continue event handler after memory allocation failure bc5d3e8b70d5 RDMA/siw: Fix broken RDMA Read Fence/Resume logic. 60af6e686084 IB/rdmavt: Validate remote_addr during loopback atomic tests 4bbb6e6a1caa memcg: charge fs_context and legacy_fs_context 2f837785c2ec Revert "ASoC: mediatek: Check for error clk pointer" 952717785218 block: bio-integrity: Advance seed correctly for larger interval sizes d3533ee20e9a mm/kmemleak: avoid scanning potential huge holes acc887ba8833 drm/nouveau: fix off by one in BIOS boundary checking 26b3901d20bf btrfs: fix deadlock between quota disable and qgroup rescan worker e680e4d30186 ALSA: hda/realtek: Fix silent output on Gigabyte X570 Aorus Xtreme after reboot from Windows 7e59f0554410 ALSA: hda/realtek: Fix silent output on Gigabyte X570S Aorus Master (newer chipset) d8fbf567e703 ALSA: hda/realtek: Add missing fixup-model entry for Gigabyte X570 ALC1220 quirks 66b5dd10c2b0 ALSA: hda/realtek: Add quirk for ASUS GU603 f2c5fde84cee ALSA: usb-audio: Simplify quirk entries with a macro fd9a23319f16 ASoC: ops: Reject out of bounds values in snd_soc_put_xr_sx() c33402b056de ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx() 68fd71872428 ASoC: ops: Reject out of bounds values in snd_soc_put_volsw() 01baaf3bede9 audit: improve audit queue handling when "audit=1" on cmdline b8f53f917128 Linux 5.4.177 4fc41403f0b6 af_packet: fix data-race in packet_setsockopt / packet_setsockopt db6c57d2666d cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask() bd43771ee975 rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink() b1d17e920dfc net: sched: fix use-after-free in tc_new_tfilter() 9892742f035f net: amd-xgbe: Fix skb data length underflow 28bdf65a5612 net: amd-xgbe: ensure to reset the tx_timer_active flag f2a186a44e7e ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback 0e8283cbe499 cgroup-v1: Require capabilities to set release_agent 2fd752ed77ab psi: Fix uaf issue when psi trigger is destroyed while being polled 464da38ba827 PCI: pciehp: Fix infinite loop in IRQ handler upon power fault Signed-off-by: Bruce Ashfield Signed-off-by: Anuj Mittal --- .../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 db54fd29d97..2134f848b28 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 ?= "b24dd7e4d381fb2b855e46428087f1d2d5a2e98f" -SRCREV_meta ?= "25910e8585d93aa555c747a9aaedccbc405c5134" +SRCREV_machine ?= "40423bc7ab2cc609f955a3dc16a0d854c1504ce3" +SRCREV_meta ?= "e8c675c7e11fbd96cd812dfb9f4f6fb6f92b6abb" 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.176" +LINUX_VERSION ?= "5.4.178" 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 227356a1261..35177d4f6c6 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.176" +LINUX_VERSION ?= "5.4.178" 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 ?= "ce298ed73f24a8529058476004cb973c86432cd9" -SRCREV_machine ?= "0b50f433a66bfa7ff4baaf1383a53aa9bfec7b66" -SRCREV_meta ?= "25910e8585d93aa555c747a9aaedccbc405c5134" +SRCREV_machine_qemuarm ?= "f6e09845d8bf3c307da395497b21c1ff17ef575c" +SRCREV_machine ?= "a7ba52065be4401b5d73b6b020770f7d260b7bf1" +SRCREV_meta ?= "e8c675c7e11fbd96cd812dfb9f4f6fb6f92b6abb" 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 af6c916639c..ae9dbca3af1 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 ?= "eecb4a32b034e7ac5f3e54f68cf5263499f79b6f" -SRCREV_machine_qemuarm64 ?= "6786585bee3d0de9cd8886fa4be54eafd0aeac8a" -SRCREV_machine_qemumips ?= "4fe08e5a1c9b437ad0276448cfa63c5fa1b8303b" -SRCREV_machine_qemuppc ?= "0f5916a777fc69030480f19b097b0e9fc035f4bf" -SRCREV_machine_qemuriscv64 ?= "7cff5cd60103d5af3dd1e6b13bff1c7a9ef8e99d" -SRCREV_machine_qemux86 ?= "7cff5cd60103d5af3dd1e6b13bff1c7a9ef8e99d" -SRCREV_machine_qemux86-64 ?= "7cff5cd60103d5af3dd1e6b13bff1c7a9ef8e99d" -SRCREV_machine_qemumips64 ?= "f15ba204e8f1c7fe33b248ae19d1b0b851c7272d" -SRCREV_machine ?= "7cff5cd60103d5af3dd1e6b13bff1c7a9ef8e99d" -SRCREV_meta ?= "25910e8585d93aa555c747a9aaedccbc405c5134" +SRCREV_machine_qemuarm ?= "b3ee7c62bf5a5ce3c7e30aff6c3dd9f70a847a28" +SRCREV_machine_qemuarm64 ?= "bf6581eba15cb43af60fda7053edaf66990c18ac" +SRCREV_machine_qemumips ?= "05580fff716df568dc3f737b288e0e514a908572" +SRCREV_machine_qemuppc ?= "0a016b0775980f67d686e47cc8637adec46856dc" +SRCREV_machine_qemuriscv64 ?= "e2020dbe2ccaef50d7e8f37a5bf08c68a006a064" +SRCREV_machine_qemux86 ?= "e2020dbe2ccaef50d7e8f37a5bf08c68a006a064" +SRCREV_machine_qemux86-64 ?= "e2020dbe2ccaef50d7e8f37a5bf08c68a006a064" +SRCREV_machine_qemumips64 ?= "68f35eeca08d2a681495fd3a7b823ac34d9a97bc" +SRCREV_machine ?= "e2020dbe2ccaef50d7e8f37a5bf08c68a006a064" +SRCREV_meta ?= "e8c675c7e11fbd96cd812dfb9f4f6fb6f92b6abb" # 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.176" +LINUX_VERSION ?= "5.4.178" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From 1ef8e3ec21b32d6d3654319561b24b8b1ce63243 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 17 Jan 2022 11:20:55 +0000 Subject: [PATCH 024/108] vim: update to include latest CVE fixes Update the version to 4.2.4118, which incorporates the following CVE fixes: - CVE-2021-4187 - CVE-2022-0128 - CVE-2022-0156 - CVE-2022-0158 Also remove the explicit whitelisting of CVE-2021-3968 as this is now handled with an accurate CPE specifying the fixed version. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 764519ad0da6b881918667ca272fcc273b56168a) Signed-off-by: Anuj Mittal --- 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 7174d818ff1..0be75b63068 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://racefix.patch \ " -PV .= ".3752" -SRCREV = "8603be338ac810446f23c092f21bc6082f787519" +PV .= ".4118" +SRCREV = "0023f82a76cf43a12b41e71f97a2e860d0444e1b" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+)\.0" From e6fe342dd578ca37beeb9dfc991b67dc72c60d06 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 31 Jan 2022 12:44:07 +0000 Subject: [PATCH 025/108] vim: upgrade to patch 4269 Upgrade to the latest patch release to fix the following CVEs: - CVE-2022-0261 - CVE-2022-0318 - CVE-2022-0319 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 96442e681c3acd82b09e3becd78e902709945f1f) Signed-off-by: Anuj Mittal --- 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 0be75b63068..e2907c1f432 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://racefix.patch \ " -PV .= ".4118" -SRCREV = "0023f82a76cf43a12b41e71f97a2e860d0444e1b" +PV .= ".4269" +SRCREV = "48a604845e33399893d6bf293e71bcd2a412800d" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+)\.0" From 4c3d0463b413a0c070aa34d50e60bf184c726512 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 17 Feb 2022 08:56:32 +0800 Subject: [PATCH 026/108] runtime_test: skip virgl test on fedora 34 The gtk and headless tests fail on Fedora 34 because of the host libdrm version so skip them. | runqemu - ERROR - Failed to run qemu: MESA-LOADER: failed to open iris: /lib64/libdrm_nouveau.so.2: undefined symbol: drmCloseBufferHandle (search paths /usr/lib64/dri) | failed to load driver: iris | MESA-LOADER: failed to open kms_swrast: /lib64/libdrm_nouveau.so.2: undefined symbol: drmCloseBufferHandle (search paths /usr/lib64/dri) | failed to load driver: kms_swrast | MESA-LOADER: failed to open swrast: /lib64/libdrm_nouveau.so.2: undefined symbol: drmCloseBufferHandle (search paths /usr/lib64/dri) | failed to load swrast driver | qemu-system-x86_64: egl: gbm_create_device failed | qemu-system-x86_64: egl: render node init failed Signed-off-by: Anuj Mittal --- meta/lib/oeqa/selftest/cases/runtime_test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 2148e84ff3c..f9649339e56 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -232,6 +232,9 @@ def test_testimage_virgl_headless(self): dripath = subprocess.check_output("pkg-config --variable=dridriverdir dri", shell=True) except subprocess.CalledProcessError as e: self.skipTest("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.") + distro = oe.lsb.distro_identifier() + if distro and distro == 'fedora-34': + self.skipTest('virgl isn\'t working with Fedora 34') qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') features = 'INHERIT += "testimage"\n' if 'opengl' not in qemu_distrofeatures: From 29cd1d796057ef5599fe17c39b42aa099f7b1c29 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 20 Feb 2022 15:32:32 +0000 Subject: [PATCH 027/108] build-appliance-image: Update to hardknott head revision Signed-off-by: Richard Purdie --- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 455fe825c82..5631cd8ae65 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -24,7 +24,7 @@ IMAGE_FSTYPES = "wic.vmdk wic.vhd wic.vhdx" inherit core-image setuptools3 -SRCREV ?= "ec3ac9d883d53ebbf3c6b9a80694df69c9e9ccc7" +SRCREV ?= "2954fa87a4d325f1a3c722d6fb8bf13b17f9e7a0" SRC_URI = "git://git.yoctoproject.org/poky;branch=hardknott \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ From 225f8b28ff0b3357382f517f39eb315b4bac9138 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Wed, 16 Feb 2022 15:12:04 -0800 Subject: [PATCH 028/108] virglrenderer: fix CVE-2022-0135 and -0175 CVE-2022-0135 concerns out-of-bounds writes in read_transfer_data(). CVE-2022-0175 concerns using malloc() instead of calloc(). We cherry-pick from master. Signed-off-by: Joe Slater Signed-off-by: Richard Purdie (cherry picked from commit 91f7511df79c5c1f93add9f2827a5a266453614e) Modify -0175 patch to apply to hardknott branch. Signed-off-by: Joe Slater Signed-off-by: Anuj Mittal --- .../virglrenderer/cve-2022-0135.patch | 117 ++++++++++++++++++ .../virglrenderer/cve-2022-0175.patch | 112 +++++++++++++++++ .../virglrenderer/virglrenderer_0.8.2.bb | 2 + 3 files changed, 231 insertions(+) create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0135.patch create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0175.patch diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0135.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0135.patch new file mode 100644 index 00000000000..ae42dc8f6cf --- /dev/null +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0135.patch @@ -0,0 +1,117 @@ +From 63aee871365f9c9e7fa9125672302a0fb250d34d Mon Sep 17 00:00:00 2001 +From: Gert Wollny +Date: Tue, 30 Nov 2021 09:16:24 +0100 +Subject: [PATCH 2/2] vrend: propperly check whether the shader image range is + correct + +Also add a test to check the integer underflow. + +Closes: #251 +Signed-off-by: Gert Wollny +Reviewed-by: Chia-I Wu + +cherry-pick from anongit.freedesktop.org/virglrenderer +commit 2aed5d4... + +CVE: CVE-2022-0135 +Upstream-Status: Backport +Signed-off-by: Joe Slater + +--- + src/vrend_decode.c | 3 +- + tests/test_fuzzer_formats.c | 57 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 59 insertions(+), 1 deletion(-) + +diff --git a/src/vrend_decode.c b/src/vrend_decode.c +index 91f5f24..6771b10 100644 +--- a/src/vrend_decode.c ++++ b/src/vrend_decode.c +@@ -1249,8 +1249,9 @@ static int vrend_decode_set_shader_images(struct vrend_context *ctx, const uint3 + if (num_images < 1) { + return 0; + } ++ + if (start_slot > PIPE_MAX_SHADER_IMAGES || +- start_slot > PIPE_MAX_SHADER_IMAGES - num_images) ++ start_slot + num_images > PIPE_MAX_SHADER_IMAGES) + return EINVAL; + + for (uint32_t i = 0; i < num_images; i++) { +diff --git a/tests/test_fuzzer_formats.c b/tests/test_fuzzer_formats.c +index 154a2e5..e32caf0 100644 +--- a/tests/test_fuzzer_formats.c ++++ b/tests/test_fuzzer_formats.c +@@ -958,6 +958,61 @@ static void test_vrend_set_signle_abo_heap_overflow() { + virgl_renderer_submit_cmd((void *) cmd, ctx_id, 0xde); + } + ++static void test_vrend_set_shader_images_overflow() ++{ ++ uint32_t num_shaders = PIPE_MAX_SHADER_IMAGES + 1; ++ uint32_t size = num_shaders * VIRGL_SET_SHADER_IMAGE_ELEMENT_SIZE + 3; ++ uint32_t cmd[size]; ++ int i = 0; ++ cmd[i++] = ((size - 1)<< 16) | 0 << 8 | VIRGL_CCMD_SET_SHADER_IMAGES; ++ cmd[i++] = PIPE_SHADER_FRAGMENT; ++ memset(&cmd[i], 0, size - i); ++ ++ virgl_renderer_submit_cmd((void *) cmd, ctx_id, size); ++} ++ ++/* Test adapted from yaojun8558363@gmail.com: ++ * https://gitlab.freedesktop.org/virgl/virglrenderer/-/issues/250 ++*/ ++static void test_vrend_3d_resource_overflow() { ++ ++ struct virgl_renderer_resource_create_args resource; ++ resource.handle = 0x4c474572; ++ resource.target = PIPE_TEXTURE_2D_ARRAY; ++ resource.format = VIRGL_FORMAT_Z24X8_UNORM; ++ resource.nr_samples = 2; ++ resource.last_level = 0; ++ resource.array_size = 3; ++ resource.bind = VIRGL_BIND_SAMPLER_VIEW; ++ resource.depth = 1; ++ resource.width = 8; ++ resource.height = 4; ++ resource.flags = 0; ++ ++ virgl_renderer_resource_create(&resource, NULL, 0); ++ virgl_renderer_ctx_attach_resource(ctx_id, resource.handle); ++ ++ uint32_t size = 0x400; ++ uint32_t cmd[size]; ++ int i = 0; ++ cmd[i++] = (size - 1) << 16 | 0 << 8 | VIRGL_CCMD_RESOURCE_INLINE_WRITE; ++ cmd[i++] = resource.handle; ++ cmd[i++] = 0; // level ++ cmd[i++] = 0; // usage ++ cmd[i++] = 0; // stride ++ cmd[i++] = 0; // layer_stride ++ cmd[i++] = 0; // x ++ cmd[i++] = 0; // y ++ cmd[i++] = 0; // z ++ cmd[i++] = 8; // w ++ cmd[i++] = 4; // h ++ cmd[i++] = 3; // d ++ memset(&cmd[i], 0, size - i); ++ ++ virgl_renderer_submit_cmd((void *) cmd, ctx_id, size); ++} ++ ++ + int main() + { + initialize_environment(); +@@ -980,6 +1035,8 @@ int main() + test_cs_nullpointer_deference(); + test_vrend_set_signle_abo_heap_overflow(); + ++ test_vrend_set_shader_images_overflow(); ++ test_vrend_3d_resource_overflow(); + + virgl_renderer_context_destroy(ctx_id); + virgl_renderer_cleanup(&cookie); +-- +2.25.1 + diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0175.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0175.patch new file mode 100644 index 00000000000..8bbb9eb5791 --- /dev/null +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0175.patch @@ -0,0 +1,112 @@ +From 5ca7aca001092c557f0b6fc1ba3db7dcdab860b7 Mon Sep 17 00:00:00 2001 +From: Gert Wollny +Date: Tue, 30 Nov 2021 09:29:42 +0100 +Subject: [PATCH 1/2] vrend: clear memory when allocating a host-backed memory + resource + +Closes: #249 +Signed-off-by: Gert Wollny +Reviewed-by: Chia-I Wu + +cherry-pick from anongit.freedesktop.org/virglrenderer +commit b05bb61... + +CVE: CVE-2022-0175 +Upstream-Status: Backport +Signed-off-by: Joe Slater + +Patch to vrend_renderer.c modified to apply to version used by hardknott. +Patch to test_virgl_transfer.c unchanged. + +Signed-off-by: Joe Slater + +--- + src/vrend_renderer.c | 2 +- + tests/test_virgl_transfer.c | 51 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 52 insertions(+), 1 deletion(-) + +diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c +index ad7a351..d84f785 100644 +--- a/src/vrend_renderer.c ++++ b/src/vrend_renderer.c +@@ -6646,7 +6646,7 @@ int vrend_renderer_resource_create(struct vrend_renderer_resource_create_args *a + if (args->bind == VIRGL_BIND_CUSTOM) { + /* use iovec directly when attached */ + gr->storage_bits |= VREND_STORAGE_HOST_SYSTEM_MEMORY; +- gr->ptr = malloc(args->width); ++ gr->ptr = calloc(1, args->width); + if (!gr->ptr) { + FREE(gr); + return ENOMEM; +diff --git a/tests/test_virgl_transfer.c b/tests/test_virgl_transfer.c +index 2c8669a..8f8e98a 100644 +--- a/tests/test_virgl_transfer.c ++++ b/tests/test_virgl_transfer.c +@@ -952,6 +952,56 @@ START_TEST(virgl_test_transfer_near_res_bounds_with_stride_succeeds) + } + END_TEST + ++START_TEST(test_vrend_host_backed_memory_no_data_leak) ++{ ++ struct iovec iovs[1]; ++ int niovs = 1; ++ ++ struct virgl_context ctx = {0}; ++ ++ int ret = testvirgl_init_ctx_cmdbuf(&ctx); ++ ++ struct virgl_renderer_resource_create_args res; ++ res.handle = 0x400; ++ res.target = PIPE_BUFFER; ++ res.format = VIRGL_FORMAT_R8_UNORM; ++ res.nr_samples = 0; ++ res.last_level = 0; ++ res.array_size = 1; ++ res.bind = VIRGL_BIND_CUSTOM; ++ res.depth = 1; ++ res.width = 32; ++ res.height = 1; ++ res.flags = 0; ++ ++ uint32_t size = 32; ++ uint8_t* data = calloc(1, size); ++ memset(data, 1, 32); ++ iovs[0].iov_base = data; ++ iovs[0].iov_len = size; ++ ++ struct pipe_box box = {0,0,0, size, 1,1}; ++ ++ virgl_renderer_resource_create(&res, NULL, 0); ++ virgl_renderer_ctx_attach_resource(ctx.ctx_id, res.handle); ++ ++ ret = virgl_renderer_transfer_read_iov(res.handle, ctx.ctx_id, 0, 0, 0, ++ (struct virgl_box *)&box, 0, iovs, niovs); ++ ++ ck_assert_int_eq(ret, 0); ++ ++ for (int i = 0; i < 32; ++i) ++ ck_assert_int_eq(data[i], 0); ++ ++ virgl_renderer_ctx_detach_resource(1, res.handle); ++ ++ virgl_renderer_resource_unref(res.handle); ++ free(data); ++ ++} ++END_TEST ++ ++ + static Suite *virgl_init_suite(void) + { + Suite *s; +@@ -981,6 +1031,7 @@ static Suite *virgl_init_suite(void) + tcase_add_test(tc_core, virgl_test_transfer_buffer_bad_strides); + tcase_add_test(tc_core, virgl_test_transfer_2d_array_bad_layer_stride); + tcase_add_test(tc_core, virgl_test_transfer_2d_bad_level); ++ tcase_add_test(tc_core, test_vrend_host_backed_memory_no_data_leak); + + tcase_add_loop_test(tc_core, virgl_test_transfer_res_read_valid, 0, PIPE_MAX_TEXTURE_TYPES); + tcase_add_loop_test(tc_core, virgl_test_transfer_res_write_valid, 0, PIPE_MAX_TEXTURE_TYPES); +-- +2.31.1 + diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb index 7f035f820aa..d92359565a4 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb @@ -13,6 +13,8 @@ SRCREV = "7d204f3927be65fb3365dce01dbcd04d447a4985" SRC_URI = "git://anongit.freedesktop.org/virglrenderer;branch=master \ file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ file://0001-meson.build-use-python3-directly-for-python.patch \ + file://cve-2022-0135.patch \ + file://cve-2022-0175.patch \ " S = "${WORKDIR}/git" From dc30243e7cc1b1c392b999de114b4096d432ef02 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 23 Feb 2022 11:15:29 +0800 Subject: [PATCH 029/108] expat: fix CVE-2022-23990 CVE: CVE-2022-23990 Based on Steve Sakoman's patch for branch dunfell, fix CVE-2022-23990 for expat in branch hardknott. And correct indent as well. Signed-off-by: Kai Kang Signed-off-by: Anuj Mittal --- .../expat/expat/CVE-2022-23990.patch | 49 +++++++++++++++++++ meta/recipes-core/expat/expat_2.2.10.bb | 7 +-- 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-core/expat/expat/CVE-2022-23990.patch diff --git a/meta/recipes-core/expat/expat/CVE-2022-23990.patch b/meta/recipes-core/expat/expat/CVE-2022-23990.patch new file mode 100644 index 00000000000..c599517b3ed --- /dev/null +++ b/meta/recipes-core/expat/expat/CVE-2022-23990.patch @@ -0,0 +1,49 @@ +From ede41d1e186ed2aba88a06e84cac839b770af3a1 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Wed, 26 Jan 2022 02:36:43 +0100 +Subject: [PATCH] lib: Prevent integer overflow in doProlog (CVE-2022-23990) + +The change from "int nameLen" to "size_t nameLen" +addresses the overflow on "nameLen++" in code +"for (; name[nameLen++];)" right above the second +change in the patch. + +Upstream-Status: Backport: +https://github.com/libexpat/libexpat/pull/551/commits/ede41d1e186ed2aba88a06e84cac839b770af3a1 + +CVE: CVE-2022-23990 + +Signed-off-by: Steve Sakoman + +--- + lib/xmlparse.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/lib/xmlparse.c b/expat/lib/xmlparse.c +index 5ce31402..d1d17005 100644 +--- a/lib/xmlparse.c ++++ b/lib/xmlparse.c +@@ -5372,7 +5372,7 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end, + if (dtd->in_eldecl) { + ELEMENT_TYPE *el; + const XML_Char *name; +- int nameLen; ++ size_t nameLen; + const char *nxt + = (quant == XML_CQUANT_NONE ? next : next - enc->minBytesPerChar); + int myindex = nextScaffoldPart(parser); +@@ -5388,7 +5388,13 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end, + nameLen = 0; + for (; name[nameLen++];) + ; +- dtd->contentStringLen += nameLen; ++ ++ /* Detect and prevent integer overflow */ ++ if (nameLen > UINT_MAX - dtd->contentStringLen) { ++ return XML_ERROR_NO_MEMORY; ++ } ++ ++ dtd->contentStringLen += (unsigned)nameLen; + if (parser->m_elementDeclHandler) + handleDefault = XML_FALSE; + } diff --git a/meta/recipes-core/expat/expat_2.2.10.bb b/meta/recipes-core/expat/expat_2.2.10.bb index 074441dc2a3..a851e54b2ae 100644 --- a/meta/recipes-core/expat/expat_2.2.10.bb +++ b/meta/recipes-core/expat/expat_2.2.10.bb @@ -10,13 +10,14 @@ VERSION_TAG = "${@d.getVar('PV').replace('.', '_')}" SRC_URI = "https://github.com/libexpat/libexpat/releases/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2 \ file://libtool-tag.patch \ - file://run-ptest \ - file://0001-Add-output-of-tests-result.patch \ + file://run-ptest \ + file://0001-Add-output-of-tests-result.patch \ file://CVE-2022-22822-27.patch \ file://CVE-2021-45960.patch \ file://CVE-2021-46143.patch \ file://CVE-2022-23852.patch \ - " + file://CVE-2022-23990.patch \ + " UPSTREAM_CHECK_URI = "https://github.com/libexpat/libexpat/releases/" From 9fe70a643a2d8723001421a18b5736e70a1eaa34 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 21 Feb 2022 16:08:15 +0800 Subject: [PATCH 030/108] e2fsprogs: backport to fix one regression Backport a patch in 1.46.3 which fix one regression: This is what the changelog says: Fix e2fsck so that the if the s_interval is zero, and the last mount or write time is in the future, it will fix invalid last mount/write timestamps in the superblock. (This was a regression introduced in v1.45.5.) Signed-off-by: Changqing Li Signed-off-by: Anuj Mittal --- meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 3 +- ...mount-write-time-when-e2fsck-is-forc.patch | 66 +++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-fix-last-mount-write-time-when-e2fsck-is-forc.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc index fb02b2006ef..1250a9b99c3 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc @@ -19,7 +19,8 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \ SECTION = "base" DEPENDS = "util-linux attr autoconf-archive" -SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master" +SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master \ + file://0001-e2fsck-fix-last-mount-write-time-when-e2fsck-is-forc.patch" S = "${WORKDIR}/git" inherit autotools gettext texinfo pkgconfig multilib_header update-alternatives ptest diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-fix-last-mount-write-time-when-e2fsck-is-forc.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-fix-last-mount-write-time-when-e2fsck-is-forc.patch new file mode 100644 index 00000000000..d679b25b1d0 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-fix-last-mount-write-time-when-e2fsck-is-forc.patch @@ -0,0 +1,66 @@ +From 2c69c94217b6db083d601d4fd62d6ab6c1628fee Mon Sep 17 00:00:00 2001 +From: Lukas Czerner +Date: Mon, 14 Jun 2021 15:27:25 +0200 +Subject: [PATCH] e2fsck: fix last mount/write time when e2fsck is forced + +With commit c52d930f e2fsck is no longer able to fix bad last +mount/write time by default because it is conditioned on s_checkinterval +not being zero, which it is by default. + +One place where it matters is when other e2fsprogs tools require to run +full file system check before a certain operation. If the last mount +time is for any reason in future, it will not allow it to run even if +full e2fsck is ran. + +Fix it by checking the last mount/write time when the e2fsck is forced, +except for the case where we know the system clock is broken. + +[ Reworked the conditionals so error messages claiming that the last + write/mount time were corrupted wouldn't be always printed when the + e2fsck was run with the -f option, thus causing 299 out of 372 + regression tests to fail. -- TYT ] + +Fixes: c52d930f ("e2fsck: don't check for future superblock times if checkinterval == 0") +Reported-by: Dusty Mabe +Signed-off-by: Lukas Czerner +Signed-off-by: Theodore Ts'o + +Upstream-Status: Backport [https://github.com/tytso/e2fsprogs/commit/2c69c94217b6db083d601d4fd62d6ab6c1628fee] +Signed-off-by: Changqing Li +--- + e2fsck/super.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/e2fsck/super.c b/e2fsck/super.c +index e1c3f935..31e2ffb2 100644 +--- a/e2fsck/super.c ++++ b/e2fsck/super.c +@@ -1038,9 +1038,9 @@ void check_super_block(e2fsck_t ctx) + * Check to see if the superblock last mount time or last + * write time is in the future. + */ +- if (!broken_system_clock && fs->super->s_checkinterval && +- !(ctx->flags & E2F_FLAG_TIME_INSANE) && +- fs->super->s_mtime > (__u32) ctx->now) { ++ if (((ctx->options & E2F_OPT_FORCE) || fs->super->s_checkinterval) && ++ !broken_system_clock && !(ctx->flags & E2F_FLAG_TIME_INSANE) && ++ (fs->super->s_mtime > (__u32) ctx->now)) { + pctx.num = fs->super->s_mtime; + problem = PR_0_FUTURE_SB_LAST_MOUNT; + if (fs->super->s_mtime <= (__u32) ctx->now + ctx->time_fudge) +@@ -1050,9 +1050,9 @@ void check_super_block(e2fsck_t ctx) + fs->flags |= EXT2_FLAG_DIRTY; + } + } +- if (!broken_system_clock && fs->super->s_checkinterval && +- !(ctx->flags & E2F_FLAG_TIME_INSANE) && +- fs->super->s_wtime > (__u32) ctx->now) { ++ if (((ctx->options & E2F_OPT_FORCE) || fs->super->s_checkinterval) && ++ !broken_system_clock && !(ctx->flags & E2F_FLAG_TIME_INSANE) && ++ (fs->super->s_wtime > (__u32) ctx->now)) { + pctx.num = fs->super->s_wtime; + problem = PR_0_FUTURE_SB_LAST_WRITE; + if (fs->super->s_wtime <= (__u32) ctx->now + ctx->time_fudge) +-- +2.25.1 + From 78c540178a9dfef163d3956309562ab5f0709b8e Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 4 Oct 2021 00:41:55 +0100 Subject: [PATCH 031/108] gstreamer1.0: 1.18.4 -> 1.18.5 Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit d325f0d31bb1cbe889c7303ac2999c4dae391b34) Signed-off-by: Anuj Mittal --- .../0002-Remove-unused-valgrind-detection.patch | 14 +++++++------- ...treamer1.0_1.18.4.bb => gstreamer1.0_1.18.5.bb} | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.18.4.bb => gstreamer1.0_1.18.5.bb} (97%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch index 96abef17b09..5121044734d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch @@ -1,4 +1,4 @@ -From 598d108e2c438d8f2ecd3bf948fa3ebbd3681490 Mon Sep 17 00:00:00 2001 +From e275ba2bd854ac15a4b65a8f07d9f042021950da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 14 Aug 2020 16:38:26 +0100 Subject: [PATCH 2/3] Remove unused valgrind detection @@ -19,7 +19,7 @@ Signed-off-by: Jose Quaresma 3 files changed, 42 deletions(-) diff --git a/gst/gst_private.h b/gst/gst_private.h -index eefd044d9..8252ede51 100644 +index eefd044..8252ede 100644 --- a/gst/gst_private.h +++ b/gst/gst_private.h @@ -116,8 +116,6 @@ G_GNUC_INTERNAL gboolean _priv_plugin_deps_env_vars_changed (GstPlugin * plugin @@ -32,12 +32,12 @@ index eefd044d9..8252ede51 100644 G_GNUC_INTERNAL void _priv_gst_quarks_initialize (void); G_GNUC_INTERNAL void _priv_gst_mini_object_initialize (void); diff --git a/gst/gstinfo.c b/gst/gstinfo.c -index 5d317877b..097f8b20d 100644 +index eea1a21..d3035d6 100644 --- a/gst/gstinfo.c +++ b/gst/gstinfo.c @@ -305,36 +305,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT; - static volatile gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT; - static volatile gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON; + static gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT; + static gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON; -/* FIXME: export this? */ -gboolean @@ -82,7 +82,7 @@ index 5d317877b..097f8b20d 100644 env = g_getenv ("GST_DEBUG_OPTIONS"); if (env != NULL) { if (strstr (env, "full_tags") || strstr (env, "full-tags")) -@@ -2503,12 +2470,6 @@ gst_debug_construct_win_color (guint colorinfo) +@@ -2505,12 +2472,6 @@ gst_debug_construct_win_color (guint colorinfo) return 0; } @@ -96,7 +96,7 @@ index 5d317877b..097f8b20d 100644 _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file, const gchar * func, gint line, GObject * obj, const gchar * msg, diff --git a/meson.build b/meson.build -index ce1921aa4..7a84d0981 100644 +index 82a1728..42ae617 100644 --- a/meson.build +++ b/meson.build @@ -200,7 +200,6 @@ check_headers = [ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb similarity index 97% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.4.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb index 85620709687..abf68be785a 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb @@ -21,7 +21,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x file://0003-meson-Add-option-for-installed-tests.patch \ file://0001-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch \ " -SRC_URI[sha256sum] = "9aeec99b38e310817012aa2d1d76573b787af47f8a725a65b833880a094dfbc5" +SRC_URI[sha256sum] = "55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ check \ From 89fd2e074eefab0dda55816944169eb56a975a20 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 4 Oct 2021 00:41:56 +0100 Subject: [PATCH 032/108] gstreamer1.0-plugins-base: 1.18.4 -> 1.18.5 Drop backport patches: * 4ef5c91697a141fea7317aff7f0f28e5a861db99.patch Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit de0ee4323a19a27b6bcef7cc791d0373c311ef22) Signed-off-by: Anuj Mittal --- ...ugins-base_1.18.4.bb => gstreamer1.0-plugins-base_1.18.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.18.4.bb => gstreamer1.0-plugins-base_1.18.5.bb} (98%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb similarity index 98% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb index 728a99e08b4..4e57873577d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb @@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ file://0004-glimagesink-Downrank-to-marginal.patch \ " -SRC_URI[sha256sum] = "29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323" +SRC_URI[sha256sum] = "960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3" S = "${WORKDIR}/gst-plugins-base-${PV}" From 4e5d05ee524a9f260089e1abf8bc315647204817 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 4 Oct 2021 00:41:58 +0100 Subject: [PATCH 033/108] gstreamer1.0-plugins-bad: 1.18.4 -> 1.18.5 Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit 4e7789ecfdb1bd7afa6ff5be40f1d0e2a1a09e4c) Signed-off-by: Anuj Mittal --- ...plugins-bad_1.18.4.bb => gstreamer1.0-plugins-bad_1.18.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.18.4.bb => gstreamer1.0-plugins-bad_1.18.5.bb} (98%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb similarity index 98% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.4.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb index ce2082ee32e..f71d52fc317 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb @@ -11,7 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ file://0005-msdk-fix-includedir-path.patch \ " -SRC_URI[sha256sum] = "74e806bc5595b18c70e9ca93571e27e79dfb808e5d2e7967afa952b52e99c85f" +SRC_URI[sha256sum] = "a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e" S = "${WORKDIR}/gst-plugins-bad-${PV}" From 27c6230ddcd2723c60846a7cc2a9388a92b67ab9 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 4 Oct 2021 00:41:57 +0100 Subject: [PATCH 034/108] gstreamer1.0-plugins-good: 1.18.4 -> 1.18.5 Drop backport patches: * 0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch * 0003-Remove-volatile-from-static-vars-to-fix-build-with-g.patch https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/commit/a1bf3d8d540a25268d612a489e1e836d6ea737b0 Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit b51d46790e582556a7230a1fe8f67375e785cc43) Signed-off-by: Anuj Mittal --- ...Fix-parsing-of-the-mediaclk-direct-f.patch | 33 ------------------- ...bb => gstreamer1.0-plugins-good_1.18.5.bb} | 3 +- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.18.4.bb => gstreamer1.0-plugins-good_1.18.5.bb} (95%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch deleted file mode 100644 index 14a9fe23aac..00000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ec1949dffd931d0ec7e4f67108a08ab1e2af0cfe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Tue, 16 Mar 2021 19:25:36 +0200 -Subject: [PATCH] rtpjitterbuffer: Fix parsing of the mediaclk:direct= field - -Due to an off-by-one when parsing the string, the most significant digit -or the clock offset was skipped when parsing the offset. - -Part-of: - -Upstream-Status: Backport [b5bb4ede3a42273fafc1054f9cf106ca527e3c26] - -Signed-off-by: Jose Quaresma ---- - gst/rtpmanager/gstrtpjitterbuffer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c -index 60d8ad875..02fe15adc 100644 ---- a/gst/rtpmanager/gstrtpjitterbuffer.c -+++ b/gst/rtpmanager/gstrtpjitterbuffer.c -@@ -1534,7 +1534,7 @@ gst_jitter_buffer_sink_parse_caps (GstRtpJitterBuffer * jitterbuffer, - GST_DEBUG_OBJECT (jitterbuffer, "Got media clock %s", mediaclk); - - if (!g_str_has_prefix (mediaclk, "direct=") || -- !g_ascii_string_to_unsigned (&mediaclk[8], 10, 0, G_MAXUINT64, -+ !g_ascii_string_to_unsigned (&mediaclk[7], 10, 0, G_MAXUINT64, - &clock_offset, NULL)) - GST_FIXME_OBJECT (jitterbuffer, "Unsupported media clock"); - if (strstr (mediaclk, "rate=") != NULL) { --- -2.31.0 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.4.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb index 07cacdc68ac..6f642d01ef1 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb @@ -6,10 +6,9 @@ BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ - file://0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch \ " -SRC_URI[sha256sum] = "b6e50e3a9bbcd56ee6ec71c33aa8332cc9c926b0c1fae995aac8b3040ebe39b0" +SRC_URI[sha256sum] = "3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b" S = "${WORKDIR}/gst-plugins-good-${PV}" From 802c2b2fc83f05d4b6f38bedabcb51f2f18e7a36 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 4 Oct 2021 00:42:00 +0100 Subject: [PATCH 035/108] gstreamer1.0-rtsp-server: 1.18.4 -> 1.18.5 Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit 809db373816ed896048f551275589bac0f04ff92) Signed-off-by: Anuj Mittal --- ...rtsp-server_1.18.4.bb => gstreamer1.0-rtsp-server_1.18.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.18.4.bb => gstreamer1.0-rtsp-server_1.18.5.bb} (90%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.5.bb similarity index 90% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.4.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.5.bb index f7bfe98985a..50426ad46dd 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.5.bb @@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "a46bb8de40b971a048580279d2660e616796f871ad3ed00c8a95fe4d273a6c94" +SRC_URI[sha256sum] = "04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f" S = "${WORKDIR}/${PNREAL}-${PV}" From f4898a69ba2510ab55809e52063589caa50f2052 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 4 Oct 2021 00:42:01 +0100 Subject: [PATCH 036/108] gstreamer1.0-libav: 1.18.4 -> 1.18.5 Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit 6a52088c1938c197d8e89e10d8e6622fa4b41465) Signed-off-by: Anuj Mittal --- ...streamer1.0-libav_1.18.4.bb => gstreamer1.0-libav_1.18.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.18.4.bb => gstreamer1.0-libav_1.18.5.bb} (91%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb similarity index 91% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.4.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb index 6a84f92f31d..bf1401975cc 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ " SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" -SRC_URI[sha256sum] = "344a463badca216c2cef6ee36f9510c190862bdee48dc4591c0a430df7e8c396" +SRC_URI[sha256sum] = "822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548" S = "${WORKDIR}/gst-libav-${PV}" From 7ecce4b6a68f3d1a1bbf4e2cb763531e48d50da1 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 4 Oct 2021 00:42:02 +0100 Subject: [PATCH 037/108] gstreamer1.0-vaapi: 1.18.4 -> 1.18.5 Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit a46b9209b5f2f45b4206a7819e00c48795885093) Signed-off-by: Anuj Mittal --- ...streamer1.0-vaapi_1.18.4.bb => gstreamer1.0-vaapi_1.18.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.18.4.bb => gstreamer1.0-vaapi_1.18.5.bb} (95%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.5.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.4.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.5.bb index a268d79541f..23ed535c8ba 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.5.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "92db98af86f3150d429c9ab17e88d2364f9c07a140c8f445ed739e8f10252aea" +SRC_URI[sha256sum] = "4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b" S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" From 4abf16486d64275e55b619b0fca37b0fc192ac11 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 4 Oct 2021 00:42:03 +0100 Subject: [PATCH 038/108] gstreamer1.0-omx: 1.18.4 -> 1.18.5 Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit 65ed3c4e6c0fbade647ec31a6a77f06ed4e97e7a) Signed-off-by: Anuj Mittal --- .../{gstreamer1.0-omx_1.18.4.bb => gstreamer1.0-omx_1.18.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.18.4.bb => gstreamer1.0-omx_1.18.5.bb} (95%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.5.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.4.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.5.bb index d38be035f9c..dc2d23ebadd 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.5.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI[sha256sum] = "e35051cf891eb2f31d6fcf176ff37d985f97f33874ac31b0b3ad3b5b95035043" +SRC_URI[sha256sum] = "2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42" S = "${WORKDIR}/gst-omx-${PV}" From e725b559a3076415421b954d7d1152c3767140fb Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 4 Oct 2021 00:42:04 +0100 Subject: [PATCH 039/108] gstreamer1.0-python: 1.18.4 -> 1.18.5 Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit 3c68529eb99c74de5a30520261f62a5544be9b39) Signed-off-by: Anuj Mittal --- ...reamer1.0-python_1.18.4.bb => gstreamer1.0-python_1.18.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.18.4.bb => gstreamer1.0-python_1.18.5.bb} (91%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb similarity index 91% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.4.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb index 49de3dac841..a6ab9589eae 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb @@ -8,7 +8,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "cb68e08a7e825e08b83a12a22dcd6e4f1b328a7b02a7ac84f42f68f4ddc7098e" +SRC_URI[sha256sum] = "533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" RDEPENDS_${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" From 9d3b427a53c49347c0164406860bb2eb161e599d Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 4 Oct 2021 00:42:05 +0100 Subject: [PATCH 040/108] gst-devtools: 1.18.4 -> 1.18.5 Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit fe1345f72e41fe0fd0a8c69ac8e7cb7551666fcb) Signed-off-by: Anuj Mittal --- .../{gst-devtools_1.18.4.bb => gst-devtools_1.18.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.18.4.bb => gst-devtools_1.18.5.bb} (94%) diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.5.bb similarity index 94% rename from meta/recipes-multimedia/gstreamer/gst-devtools_1.18.4.bb rename to meta/recipes-multimedia/gstreamer/gst-devtools_1.18.5.bb index 2a56967f7b7..d6372b06915 100644 --- a/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.4.bb +++ b/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.5.bb @@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV} file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[sha256sum] = "ffbd194c40912cb5e7fca2863648bf9dd8257b7af97d3a60c4fcd4efd8526ccf" +SRC_URI[sha256sum] = "fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS_${PN} = "git" From 446273b7abba2be768b566bac1bf8f9713d34373 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 4 Oct 2021 00:42:06 +0100 Subject: [PATCH 041/108] gst-examples: 1.18.4 -> 1.18.5 Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit b1bddc80dc172563b7cd469a8de6b9db2e6ad985) Signed-off-by: Anuj Mittal --- .../{gst-examples_1.18.4.bb => gst-examples_1.18.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gst-examples_1.18.4.bb => gst-examples_1.18.5.bb} (96%) diff --git a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb similarity index 96% rename from meta/recipes-multimedia/gstreamer/gst-examples_1.18.4.bb rename to meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb index 4670ab34db8..7b11cd228da 100644 --- a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.4.bb +++ b/meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb @@ -12,7 +12,7 @@ SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=http file://gst-player.desktop \ " -SRCREV = "959bb246a5b1f5f9c78557da11c3f22b42ff89c0" +SRCREV = "fe9a365dc0f1ff632abcfe3322ac5527a2cf30a0" S = "${WORKDIR}/git" From 85a95f43ae2c6639899f5e378be81af738ff8709 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 4 Oct 2021 00:41:59 +0100 Subject: [PATCH 042/108] gstreamer1.0-plugins-ugly: 1.18.4 -> 1.18.5 Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit 09373e8c33cd0c585e146b55d9f7680832f2ad09) Signed-off-by: Anuj Mittal --- ...ugins-ugly_1.18.4.bb => gstreamer1.0-plugins-ugly_1.18.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.18.4.bb => gstreamer1.0-plugins-ugly_1.18.5.bb} (94%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb similarity index 94% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.4.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb index 932fa7f6fb5..eae0c75d15f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb @@ -13,7 +13,7 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "218df0ce0d31e8ca9cdeb01a3b0c573172cc9c21bb3d41811c7820145623d13c" +SRC_URI[sha256sum] = "df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9" S = "${WORKDIR}/gst-plugins-ugly-${PV}" From 03bab61a17a513f79ec12d885a22a988713928dc Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 19 Feb 2022 20:15:03 +0000 Subject: [PATCH 043/108] gstreamer1.0: 1.18.5 -> 1.18.6 Signed-off-by: Jose Quaresma Signed-off-by: Anuj Mittal --- .../{gstreamer1.0_1.18.5.bb => gstreamer1.0_1.18.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.18.5.bb => gstreamer1.0_1.18.6.bb} (97%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.6.bb similarity index 97% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.6.bb index abf68be785a..82fb476a471 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.6.bb @@ -21,7 +21,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x file://0003-meson-Add-option-for-installed-tests.patch \ file://0001-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch \ " -SRC_URI[sha256sum] = "55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a" +SRC_URI[sha256sum] = "4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ check \ From 47f0d3779bbb2bc14a7c751cc81d028c981c9078 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 19 Feb 2022 20:15:04 +0000 Subject: [PATCH 044/108] gstreamer1.0-plugins-base: 1.18.5 -> 1.18.6 Signed-off-by: Jose Quaresma Signed-off-by: Anuj Mittal --- ...ugins-base_1.18.5.bb => gstreamer1.0-plugins-base_1.18.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.18.5.bb => gstreamer1.0-plugins-base_1.18.6.bb} (98%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.6.bb similarity index 98% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.6.bb index 4e57873577d..4e7fc62ec72 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.6.bb @@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ file://0004-glimagesink-Downrank-to-marginal.patch \ " -SRC_URI[sha256sum] = "960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3" +SRC_URI[sha256sum] = "56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b" S = "${WORKDIR}/gst-plugins-base-${PV}" From 9faccf79c3400f3d9664d1d9a0660a9db1f9472e Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 19 Feb 2022 20:15:05 +0000 Subject: [PATCH 045/108] gstreamer1.0-plugins-good: 1.18.5 -> 1.18.6 Signed-off-by: Jose Quaresma Signed-off-by: Anuj Mittal --- ...ugins-good_1.18.5.bb => gstreamer1.0-plugins-good_1.18.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.18.5.bb => gstreamer1.0-plugins-good_1.18.6.bb} (97%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.6.bb similarity index 97% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.6.bb index 6f642d01ef1..72ad8eff084 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.6.bb @@ -8,7 +8,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-go file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ " -SRC_URI[sha256sum] = "3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b" +SRC_URI[sha256sum] = "26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed" S = "${WORKDIR}/gst-plugins-good-${PV}" From 49b65ada7207a4a6cf6695ec1a0131647ee081d2 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 19 Feb 2022 20:15:06 +0000 Subject: [PATCH 046/108] gstreamer1.0-plugins-bad: 1.18.5 -> 1.18.6 Signed-off-by: Jose Quaresma Signed-off-by: Anuj Mittal --- ...plugins-bad_1.18.5.bb => gstreamer1.0-plugins-bad_1.18.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.18.5.bb => gstreamer1.0-plugins-bad_1.18.6.bb} (98%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.6.bb similarity index 98% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.6.bb index f71d52fc317..63e3488e9e0 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.6.bb @@ -11,7 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ file://0005-msdk-fix-includedir-path.patch \ " -SRC_URI[sha256sum] = "a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e" +SRC_URI[sha256sum] = "0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9" S = "${WORKDIR}/gst-plugins-bad-${PV}" From fe9825a3d992b2f2edcbef5d9ede5e7fb7f3fecd Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 19 Feb 2022 20:15:07 +0000 Subject: [PATCH 047/108] gstreamer1.0-plugins-ugly: 1.18.5 -> 1.18.6 Signed-off-by: Jose Quaresma Signed-off-by: Anuj Mittal --- ...ugins-ugly_1.18.5.bb => gstreamer1.0-plugins-ugly_1.18.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.18.5.bb => gstreamer1.0-plugins-ugly_1.18.6.bb} (94%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.6.bb similarity index 94% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.6.bb index eae0c75d15f..4774a17c1e1 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.6.bb @@ -13,7 +13,7 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9" +SRC_URI[sha256sum] = "4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f" S = "${WORKDIR}/gst-plugins-ugly-${PV}" From 5697581a53f0e30a9726b5fa6cc2f09a04be053b Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 19 Feb 2022 20:15:08 +0000 Subject: [PATCH 048/108] gstreamer1.0-vaapi: 1.18.5 -> 1.18.6 Signed-off-by: Jose Quaresma Signed-off-by: Anuj Mittal --- ...streamer1.0-vaapi_1.18.5.bb => gstreamer1.0-vaapi_1.18.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.18.5.bb => gstreamer1.0-vaapi_1.18.6.bb} (95%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.6.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.6.bb index 23ed535c8ba..a604b5ebce5 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.6.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b" +SRC_URI[sha256sum] = "ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0" S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" From e1b51a93615b832ca42ea59456699ec4eb491e05 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 19 Feb 2022 20:15:09 +0000 Subject: [PATCH 049/108] gstreamer1.0-libav: 1.18.5 -> 1.18.6 Signed-off-by: Jose Quaresma Signed-off-by: Anuj Mittal --- ...streamer1.0-libav_1.18.5.bb => gstreamer1.0-libav_1.18.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.18.5.bb => gstreamer1.0-libav_1.18.6.bb} (91%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.6.bb similarity index 91% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.6.bb index bf1401975cc..6229bb4d622 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.6.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ " SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" -SRC_URI[sha256sum] = "822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548" +SRC_URI[sha256sum] = "e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81" S = "${WORKDIR}/gst-libav-${PV}" From be1c1adb7b2b8d07647cefbfef3a52823526805c Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 19 Feb 2022 20:15:10 +0000 Subject: [PATCH 050/108] gstreamer1.0-omx: 1.18.5 -> 1.18.6 Signed-off-by: Jose Quaresma Signed-off-by: Anuj Mittal --- .../{gstreamer1.0-omx_1.18.5.bb => gstreamer1.0-omx_1.18.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.18.5.bb => gstreamer1.0-omx_1.18.6.bb} (95%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.6.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.6.bb index dc2d23ebadd..04b5dcc4f4f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.6.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI[sha256sum] = "2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42" +SRC_URI[sha256sum] = "b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163" S = "${WORKDIR}/gst-omx-${PV}" From 4cb69f75a01e9e2fdbf7ac62488a49b85c8b2fbd Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 19 Feb 2022 20:15:11 +0000 Subject: [PATCH 051/108] gstreamer1.0-rtsp-server: 1.18.5 -> 1.18.6 Signed-off-by: Jose Quaresma Signed-off-by: Anuj Mittal --- ...rtsp-server_1.18.5.bb => gstreamer1.0-rtsp-server_1.18.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.18.5.bb => gstreamer1.0-rtsp-server_1.18.6.bb} (90%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.6.bb similarity index 90% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.6.bb index 50426ad46dd..f105713f339 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.6.bb @@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f" +SRC_URI[sha256sum] = "826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9" S = "${WORKDIR}/${PNREAL}-${PV}" From f72a3ab5455df01610d643de55e00dd53de272f7 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 19 Feb 2022 20:15:14 +0000 Subject: [PATCH 052/108] gst-examples: 1.18.5 -> 1.18.6 Signed-off-by: Jose Quaresma Signed-off-by: Anuj Mittal --- .../{gst-examples_1.18.5.bb => gst-examples_1.18.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gst-examples_1.18.5.bb => gst-examples_1.18.6.bb} (96%) diff --git a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb similarity index 96% rename from meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb index 7b11cd228da..5af43d1edaf 100644 --- a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb @@ -12,7 +12,7 @@ SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=http file://gst-player.desktop \ " -SRCREV = "fe9a365dc0f1ff632abcfe3322ac5527a2cf30a0" +SRCREV = "70e4fcf4fc8ae19641aa990de5f37d758cdfcea4" S = "${WORKDIR}/git" From 8cabb662e4298ca786a7e082c91938bc3858b611 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 19 Feb 2022 20:15:12 +0000 Subject: [PATCH 053/108] gstreamer1.0-python: 1.18.5 -> 1.18.6 Signed-off-by: Jose Quaresma Signed-off-by: Anuj Mittal --- ...reamer1.0-python_1.18.5.bb => gstreamer1.0-python_1.18.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.18.5.bb => gstreamer1.0-python_1.18.6.bb} (91%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.6.bb similarity index 91% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.6.bb index a6ab9589eae..1a3ae5dde63 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.6.bb @@ -8,7 +8,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52" +SRC_URI[sha256sum] = "bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" RDEPENDS_${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" From 1233bc8cb88b5722e97dd19a06b7e7737f1263bd Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 19 Feb 2022 20:15:13 +0000 Subject: [PATCH 054/108] gst-devtools: 1.18.5 -> 1.18.6 Signed-off-by: Jose Quaresma Signed-off-by: Anuj Mittal --- .../{gst-devtools_1.18.5.bb => gst-devtools_1.18.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.18.5.bb => gst-devtools_1.18.6.bb} (94%) diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.6.bb similarity index 94% rename from meta/recipes-multimedia/gstreamer/gst-devtools_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gst-devtools_1.18.6.bb index d6372b06915..258a0e899c6 100644 --- a/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.6.bb @@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV} file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[sha256sum] = "fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079" +SRC_URI[sha256sum] = "3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS_${PN} = "git" From 1d9dbc540a23a77f6ddfbdf34a81a639f2ff82f5 Mon Sep 17 00:00:00 2001 From: Christian Eggers Date: Wed, 16 Feb 2022 12:14:30 +0100 Subject: [PATCH 055/108] mc: fix build if ncurses have been configured without wide characters Some distros like poky-tiny set ENABLE_WIDEC=false, which disables wide character support for ncurses. The new patch fixes the build of mc for this case. Since 9000f8033662, NCURSES_WIDECHAR is set explicitly to 1 for musl. This doesn't work for ENABLE_WIDEC==false. In this case, NCURSES_WIDECHAR must be set explicitly to 0, as curses.h does not record whether the ncurses library has actually been built with or without wide characters. Fixes: 9000f8033662 ("mc: upgrade 4.8.25 -> 4.8.26") Signed-off-by: Christian Eggers Signed-off-by: Richard Purdie Signed-off-by: Anuj Mittal --- ...FTBFS-with-ncurses-build-with-disabl.patch | 87 +++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.26.bb | 5 +- 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/mc/files/0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch diff --git a/meta/recipes-extended/mc/files/0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch b/meta/recipes-extended/mc/files/0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch new file mode 100644 index 00000000000..408473664f5 --- /dev/null +++ b/meta/recipes-extended/mc/files/0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch @@ -0,0 +1,87 @@ +From e7bbf72544ab62db9c92bfe7bd1155227e78c621 Mon Sep 17 00:00:00 2001 +From: Andrew Borodin +Date: Sat, 28 Aug 2021 11:46:53 +0300 +Subject: [PATCH] Ticket #4200: fix FTBFS with ncurses build with + --disable-widec. + +Upstream-Status: Accepted [https://github.com/MidnightCommander/mc/commit/e7bbf72544] +Signed-off-by: Andrew Borodin +--- + lib/tty/tty-ncurses.c | 8 ++++++++ + lib/tty/tty-ncurses.h | 5 +++++ + lib/tty/tty-slang.h | 2 ++ + src/filemanager/boxes.c | 2 ++ + 4 files changed, 17 insertions(+) + +diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c +index f619c0a7bf31..13058a624208 100644 +--- a/lib/tty/tty-ncurses.c ++++ b/lib/tty/tty-ncurses.c +@@ -560,6 +560,7 @@ tty_fill_region (int y, int x, int rows, int cols, unsigned char ch) + void + tty_colorize_area (int y, int x, int rows, int cols, int color) + { ++#ifdef ENABLE_SHADOWS + cchar_t *ctext; + wchar_t wch[10]; /* TODO not sure if the length is correct */ + attr_t attrs; +@@ -585,6 +586,13 @@ tty_colorize_area (int y, int x, int rows, int cols, int color) + } + + g_free (ctext); ++#else ++ (void) y; ++ (void) x; ++ (void) rows; ++ (void) cols; ++ (void) color; ++#endif /* ENABLE_SHADOWS */ + } + + /* --------------------------------------------------------------------------------------------- */ +diff --git a/lib/tty/tty-ncurses.h b/lib/tty/tty-ncurses.h +index d75df9533ab9..8feb17ccd045 100644 +--- a/lib/tty/tty-ncurses.h ++++ b/lib/tty/tty-ncurses.h +@@ -30,6 +30,11 @@ + #define NCURSES_CONST const + #endif + ++/* do not draw shadows if NCurses is built with --disable-widec */ ++#if defined(NCURSES_WIDECHAR) && NCURSES_WIDECHAR ++#define ENABLE_SHADOWS 1 ++#endif ++ + /*** typedefs(not structures) and defined constants **********************************************/ + + /*** enums ***************************************************************************************/ +diff --git a/lib/tty/tty-slang.h b/lib/tty/tty-slang.h +index 5b12c6512853..eeaade388af4 100644 +--- a/lib/tty/tty-slang.h ++++ b/lib/tty/tty-slang.h +@@ -23,6 +23,8 @@ + #define COLS SLtt_Screen_Cols + #define LINES SLtt_Screen_Rows + ++#define ENABLE_SHADOWS 1 ++ + /*** enums ***************************************************************************************/ + + enum +diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c +index 3eb525be4a9b..98df5ff2ed9a 100644 +--- a/src/filemanager/boxes.c ++++ b/src/filemanager/boxes.c +@@ -280,7 +280,9 @@ appearance_box_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm + switch (msg) + { + case MSG_INIT: ++#ifdef ENABLE_SHADOWS + if (!tty_use_colors ()) ++#endif + { + Widget *shadow; + +-- +2.34.1 + diff --git a/meta/recipes-extended/mc/mc_4.8.26.bb b/meta/recipes-extended/mc/mc_4.8.26.bb index 6bc7e6e8e15..906778400ec 100644 --- a/meta/recipes-extended/mc/mc_4.8.26.bb +++ b/meta/recipes-extended/mc/mc_4.8.26.bb @@ -12,6 +12,7 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ file://nomandate.patch \ file://CVE-2021-36370.patch \ + file://0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch \ " SRC_URI[sha256sum] = "9d6358d0a351a455a1410aab57f33b6b48b0fcf31344b9a10b0ff497595979d1" @@ -24,7 +25,9 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[smb] = "--enable-vfs-smb,--disable-vfs-smb,samba," PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," -CFLAGS_append_libc-musl = ' -DNCURSES_WIDECHAR=1 ' +# enable NCURSES_WIDECHAR=1 only if ENABLE_WIDEC has not been explicitly disabled (e.g. by the distro config). +# When compiling against the ncurses library, NCURSES_WIDECHAR needs to explicitly set to 0 in this case. +CFLAGS_append_libc-musl = "${@' -DNCURSES_WIDECHAR=1' if bb.utils.to_boolean((d.getVar('ENABLE_WIDEC') or 'True')) else ' -DNCURSES_WIDECHAR=0'}" EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable-configure-args" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" From c17205c6fea6b7805786e3168a2c6c702f8f4b2e Mon Sep 17 00:00:00 2001 From: Florian Amstutz Date: Wed, 2 Feb 2022 02:15:14 -0800 Subject: [PATCH 056/108] devtool: deploy-target: Remove stripped binaries in pseudo context deploy-target may fail the second time with "pseudo abort" because devtool-deploy-target-stripped is deleted outside of pseudo's fakeroot context. Signed-off-by: Florian Amstutz Signed-off-by: Richard Purdie (cherry picked from commit 2338a33b690b0bbe279cde3f73764911b239cb50) Signed-off-by: Anuj Mittal --- scripts/lib/devtool/deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py index 833322571f0..e14a5874177 100644 --- a/scripts/lib/devtool/deploy.py +++ b/scripts/lib/devtool/deploy.py @@ -170,7 +170,7 @@ def deploy(args, config, basepath, workspace): srcdir = recipe_outdir recipe_outdir = os.path.join(rd.getVar('WORKDIR'), 'devtool-deploy-target-stripped') if os.path.isdir(recipe_outdir): - bb.utils.remove(recipe_outdir, True) + exec_fakeroot(rd, "rm -rf %s" % recipe_outdir, shell=True) exec_fakeroot(rd, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True) os.environ['PATH'] = ':'.join([os.environ['PATH'], rd.getVar('PATH') or '']) oe.package.strip_execs(args.recipename, recipe_outdir, rd.getVar('STRIP'), rd.getVar('libdir'), From 140247e499b85ef2d5c48f9723ed2e2ec9108fb1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 6 Feb 2022 20:52:43 +0000 Subject: [PATCH 057/108] vim: Upgrade 4269 -> 4134 License text underwent changes on how to submit Uganda donations, switch from http to https urls and an update date change but the license itself is unchanged. Also, add an entry for the top level license file. This is also the vim license so LICENSE is unchanged but we should monitor it too. Signed-off-by: Richard Purdie (cherry picked from commit d195005e415b0b2d7c8b0b65c0aef888d4d6fc8e) Signed-off-by: Anuj Mittal --- meta/recipes-support/vim/vim.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index e2907c1f432..26310ed591c 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -10,7 +10,8 @@ DEPENDS = "ncurses gettext-native" RSUGGESTS_${PN} = "diffutils" LICENSE = "vim" -LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=909f1394892b7e0f9c2a95306c0c552b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99 \ + file://runtime/doc/uganda.txt;md5=600a38dc53e8931fdfb1238276ee09b0" SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://disable_acl_header_check.patch \ @@ -20,8 +21,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://racefix.patch \ " -PV .= ".4269" -SRCREV = "48a604845e33399893d6bf293e71bcd2a412800d" +PV .= ".4314" +SRCREV = "8cbf2499179db39a46e700ab04d0b36e22bcc1bb" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+)\.0" From 999883990235251127b65f2277dcb40004e7f657 Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Thu, 10 Feb 2022 15:23:22 -0500 Subject: [PATCH 058/108] initramfs-framework: unmount automounts before switch_root If mounts are left lingering, then after we switch_root, attempts to modify the block devices will result in an EBUSY with no way to unmount them. As we're about to switch_root anyways, there isn't much use to keep anything mounted unless it has the new rootfs. Signed-off-by: Justin Bronder Signed-off-by: Richard Purdie (cherry picked from commit 4dc7af6d25597ea10ea43e76c7c3d7251462c0e5) Signed-off-by: Anuj Mittal (cherry picked from commit 991631492f4fafc1852113a34a60b025342518b6) Signed-off-by: Anuj Mittal --- .../initrdscripts/initramfs-framework/finish | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/finish b/meta/recipes-core/initrdscripts/initramfs-framework/finish index 717383ebac8..f08a9208675 100755 --- a/meta/recipes-core/initrdscripts/initramfs-framework/finish +++ b/meta/recipes-core/initrdscripts/initramfs-framework/finish @@ -12,6 +12,18 @@ finish_run() { fatal "ERROR: There's no '/dev' on rootfs." fi + # Unmount anything that was automounted by busybox via mdev-mount.sh. + # We're about to switch_root, and leaving anything mounted will prevent + # the next rootfs from modifying the block device. Ignore ROOT_DISK, + # if it was set by setup-live, because it'll be mounted over loopback + # to ROOTFS_DIR. + local dev + for dev in /run/media/*; do + if mountpoint -q "${dev}" && [ "${dev##*/}" != "${ROOT_DISK}" ]; then + umount -f "${dev}" || debug "Failed to unmount ${dev}" + fi + done + info "Switching root to '$ROOTFS_DIR'..." debug "Moving /dev, /proc and /sys onto rootfs..." From 450fc48e36710c303df89d462c678d8661cd00e8 Mon Sep 17 00:00:00 2001 From: wangmy Date: Tue, 15 Feb 2022 07:54:34 +0800 Subject: [PATCH 059/108] linux-firmware: upgrade 20211216 -> 20220209 License-Update: Version of some driver files updated Added files for some drivers Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (cherry picked from commit 1a2a64082d2a4845bebe802afed2a65dac994043) Signed-off-by: Anuj Mittal --- ...{linux-firmware_20211216.bb => linux-firmware_20220209.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20211216.bb => linux-firmware_20220209.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20220209.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20220209.bb index 07389f69822..9cb357fa90d 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20220209.bb @@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=79f477f9d53eedee5a65b45193785963 \ + file://WHENCE;md5=ed3d7426e4df06fbadcca24ebf00cc5f \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -205,7 +205,7 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d" +SRC_URI[sha256sum] = "e2e46fa618414952bbf2f6920cd3abcddbef45bfb7d1352994b4bfc35394d177" inherit allarch From 6a262ad3afb672f1976633118ecc390bf4de1ae1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 20 Feb 2022 14:51:40 +0000 Subject: [PATCH 060/108] vim: Upgrade 8.2.4314 -> 8.2.4424 License file had some grammar fixes. Includes CVE-2022-0554. Signed-off-by: Richard Purdie (cherry picked from commit a8d0a4026359c2c8a445dba9456f8a05470293c1) Signed-off-by: Anuj Mittal --- meta/recipes-support/vim/vim.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 26310ed591c..6caa89c7335 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -11,7 +11,7 @@ RSUGGESTS_${PN} = "diffutils" LICENSE = "vim" LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99 \ - file://runtime/doc/uganda.txt;md5=600a38dc53e8931fdfb1238276ee09b0" + file://runtime/doc/uganda.txt;md5=a3f193c20c6faff93c69185d5d070535" SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://disable_acl_header_check.patch \ @@ -21,8 +21,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://racefix.patch \ " -PV .= ".4314" -SRCREV = "8cbf2499179db39a46e700ab04d0b36e22bcc1bb" +PV .= ".4424" +SRCREV = "cdf717283ca70b18f20b8a2cefe7957083280c6f" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+)\.0" From 5bde365accec6837dc5751e1ac01b767898a2c5d Mon Sep 17 00:00:00 2001 From: Michael Halstead Date: Fri, 11 Feb 2022 10:10:45 -0800 Subject: [PATCH 061/108] uninative: Upgrade to 3.5 Add support for glibc 2.35. Signed-off-by: Michael Halstead Signed-off-by: Richard Purdie (cherry picked from commit 347b8c87fb4e2c398644f900728cf6e22ba4516d) Signed-off-by: Anuj Mittal (cherry picked from commit eeae63c343c8ebd418679915ee20aa8c02fa0fdc) Signed-off-by: Anuj Mittal --- meta/conf/distro/include/yocto-uninative.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index 6833072cd3a..bfe05ce1eb5 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -6,10 +6,10 @@ # to the distro running on the build machine. # -UNINATIVE_MAXGLIBCVERSION = "2.34" -UNINATIVE_VERSION = "3.4" +UNINATIVE_MAXGLIBCVERSION = "2.35" +UNINATIVE_VERSION = "3.5" UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/" -UNINATIVE_CHECKSUM[aarch64] ?= "3013cdda8f0dc6639ce1c80f33eabce66f06b890bd5b58739a6d7a92a0bb7100" -UNINATIVE_CHECKSUM[i686] ?= "abed500de584aad63ec237546db20cdd0c69d8870a6f8e94ac31721ace64b376" -UNINATIVE_CHECKSUM[x86_64] ?= "126f4f7f6f21084ee140dac3eb4c536b963837826b7c38599db0b512c3377ba2" +UNINATIVE_CHECKSUM[aarch64] ?= "6de0771bd21e0fcb5e80388e5b561a8023b24083bcbf46e056a089982aff75d7" +UNINATIVE_CHECKSUM[i686] ?= "8c8745becbfa1c341bae839c7eab56ddf17ce36c303bcd73d3b2f2f788b631c2" +UNINATIVE_CHECKSUM[x86_64] ?= "e8047a5748e6f266165da141eb6d08b23674f30e477b0e5505b6403d50fbc4b2" From d2985bdd2c13423d8121373fe5502bd6fafb6283 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 19 Oct 2021 17:33:54 +0200 Subject: [PATCH 062/108] libarchive: upgrade 3.5.1 -> 3.5.2 Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit f8f39cd5757907d50444203e0e6e2c5ed0a47152) Signed-off-by: Anuj Mittal --- .../libarchive/{libarchive_3.5.1.bb => libarchive_3.5.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/libarchive/{libarchive_3.5.1.bb => libarchive_3.5.2.bb} (96%) diff --git a/meta/recipes-extended/libarchive/libarchive_3.5.1.bb b/meta/recipes-extended/libarchive/libarchive_3.5.2.bb similarity index 96% rename from meta/recipes-extended/libarchive/libarchive_3.5.1.bb rename to meta/recipes-extended/libarchive/libarchive_3.5.2.bb index 1387b69066b..1cd6397f2d9 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.5.1.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.5.2.bb @@ -34,7 +34,7 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI[sha256sum] = "9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a" +SRC_URI[sha256sum] = "5f245bd5176bc5f67428eb0aa497e09979264a153a074d35416521a5b8e86189" inherit autotools update-alternatives pkgconfig From 143db8bc1a0837b4a266cdfbb64a025918398f2c Mon Sep 17 00:00:00 2001 From: Lee Chee Yang Date: Thu, 24 Feb 2022 10:41:22 +0800 Subject: [PATCH 063/108] libarchive : update to 3.5.3 Libarchive 3.5.3 is a security release Security Fixes: extended fix for following symlinks when processing the fixup list (#1566, #1617, CVE-2021-31566) fix invalid memory access and out of bounds read in RAR5 reader (#1491, #1492, #1493, CVE-2021-36976) Signed-off-by: Lee Chee Yang Signed-off-by: Anuj Mittal --- .../libarchive/{libarchive_3.5.2.bb => libarchive_3.5.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/libarchive/{libarchive_3.5.2.bb => libarchive_3.5.3.bb} (96%) diff --git a/meta/recipes-extended/libarchive/libarchive_3.5.2.bb b/meta/recipes-extended/libarchive/libarchive_3.5.3.bb similarity index 96% rename from meta/recipes-extended/libarchive/libarchive_3.5.2.bb rename to meta/recipes-extended/libarchive/libarchive_3.5.3.bb index 1cd6397f2d9..92bb223784d 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.5.2.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.5.3.bb @@ -34,7 +34,7 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI[sha256sum] = "5f245bd5176bc5f67428eb0aa497e09979264a153a074d35416521a5b8e86189" +SRC_URI[sha256sum] = "72788e5f58d16febddfa262a5215e05fc9c79f2670f641ac039e6df44330ef51" inherit autotools update-alternatives pkgconfig From 86cdad6283148232c69128870a4d27c6ac84663b Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy Date: Wed, 29 Dec 2021 06:42:03 -0800 Subject: [PATCH 064/108] package_manager: ipk: Fix host manifest generation Since honister host manifest stopped to generate, i.e. manifest file is empty but all ipks/files into sdk is ok. Signed-off-by: Oleksiy Obitotskyy Signed-off-by: Richard Purdie (cherry picked from commit 79a2392f5d2a4cb6509a83afb40bca01bac59914) Signed-off-by: Anuj Mittal --- meta/lib/oe/sdk.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index 37b59afd1a9..27347667e84 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py @@ -115,6 +115,10 @@ def sdk_list_installed_packages(d, target, rootfs_dir=None): rootfs_dir = [sdk_output, os.path.join(sdk_output, target_path)][target is True] + if target is False: + ipkgconf_sdk_target = d.getVar("IPKGCONF_SDK") + d.setVar("IPKGCONF_TARGET", ipkgconf_sdk_target) + img_type = d.getVar('IMAGE_PKGTYPE') import importlib cls = importlib.import_module('oe.package_manager.' + img_type) From f153f42c910c06dd8e812fa9c803964c60e6cfcc Mon Sep 17 00:00:00 2001 From: wangmy Date: Wed, 31 Mar 2021 22:22:25 +0800 Subject: [PATCH 065/108] ccache: upgrade 4.2 -> 4.2.1 License-Update: add license information of src/third_party/win32/winerror_to_errno.h Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (cherry picked from commit 12f0aa9533edc7ac5a65b1c165797b049349b19e) Signed-off-by: Anuj Mittal --- .../ccache/{ccache_4.2.bb => ccache_4.2.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/ccache/{ccache_4.2.bb => ccache_4.2.1.bb} (82%) diff --git a/meta/recipes-devtools/ccache/ccache_4.2.bb b/meta/recipes-devtools/ccache/ccache_4.2.1.bb similarity index 82% rename from meta/recipes-devtools/ccache/ccache_4.2.bb rename to meta/recipes-devtools/ccache/ccache_4.2.1.bb index b76bf043f01..99bbe0eca24 100644 --- a/meta/recipes-devtools/ccache/ccache_4.2.bb +++ b/meta/recipes-devtools/ccache/ccache_4.2.1.bb @@ -7,14 +7,14 @@ HOMEPAGE = "http://ccache.samba.org" SECTION = "devel" LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=28afb89f649f309e7ac1aab554564637" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=698a26b57e513d678e1e7727bf56395b" DEPENDS = "zstd" SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz" SRC_URI += "file://0001-CMake-make-build-of-documentation-optional-842.patch" -SRC_URI[sha256sum] = "dbf139ff32031b54cb47f2d7983269f328df14b5a427882f89f7721e5c411b7e" +SRC_URI[sha256sum] = "320d2b17d2f76393e5d4bb28c8dee5ca783248e9cd23dff0654694d60f8a4b62" UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" From 94db7109f21cdefd50baea5660b691e5fe44a0d1 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Sat, 30 Oct 2021 08:35:15 -0700 Subject: [PATCH 066/108] scripts/buildhistory-diff: drop use of distutils The use of distutils.version.LooseVersion to check for GitPython > 0.3.1 is not really needed anymore since any supported distribution has at least 1.0.0 (centos-7 via epel7, debian-9, ubuntu-16.04) If we want to reinstate this check, alternatives would be to require python3-packaging on all hosts and use packaging.version.Version or use an imported LooseVersion in bb.version. [YOCTO #14610] Signed-off-by: Tim Orling Signed-off-by: Richard Purdie (cherry picked from commit bc90dcae9f53ddc246942f4d9b8ae8943e3b9754) Signed-off-by: Anuj Mittal --- scripts/buildhistory-diff | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/buildhistory-diff b/scripts/buildhistory-diff index 3bd40a2a1ea..a6e785aa238 100755 --- a/scripts/buildhistory-diff +++ b/scripts/buildhistory-diff @@ -11,7 +11,6 @@ import sys import os import argparse -from distutils.version import LooseVersion # Ensure PythonGit is installed (buildhistory_analysis needs it) try: @@ -73,10 +72,6 @@ def main(): parser = get_args_parser() args = parser.parse_args() - if LooseVersion(git.__version__) < '0.3.1': - sys.stderr.write("Version of GitPython is too old, please install GitPython (python-git) 0.3.1 or later in order to use this script\n") - sys.exit(1) - if len(args.revisions) > 2: sys.stderr.write('Invalid argument(s) specified: %s\n\n' % ' '.join(args.revisions[2:])) parser.print_help() From 7b5723ae41b7fcdc73a24f04ec0cda4fba8f8622 Mon Sep 17 00:00:00 2001 From: Sakib Sajal Date: Tue, 1 Mar 2022 12:07:15 -0500 Subject: [PATCH 067/108] go: upgrade 1.16.13 -> 1.16.14 go 1.16.14 release includes fix for CVE-2022-23806. Signed-off-by: Sakib Sajal Signed-off-by: Anuj Mittal --- meta/recipes-devtools/go/{go-1.16.13.inc => go-1.16.14.inc} | 4 ++-- ...o-binary-native_1.16.13.bb => go-binary-native_1.16.14.bb} | 4 ++-- ...cross-canadian_1.16.13.bb => go-cross-canadian_1.16.14.bb} | 0 .../go/{go-cross_1.16.13.bb => go-cross_1.16.14.bb} | 0 .../go/{go-crosssdk_1.16.13.bb => go-crosssdk_1.16.14.bb} | 0 .../go/{go-native_1.16.13.bb => go-native_1.16.14.bb} | 0 .../go/{go-runtime_1.16.13.bb => go-runtime_1.16.14.bb} | 0 meta/recipes-devtools/go/{go_1.16.13.bb => go_1.16.14.bb} | 0 8 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-devtools/go/{go-1.16.13.inc => go-1.16.14.inc} (91%) rename meta/recipes-devtools/go/{go-binary-native_1.16.13.bb => go-binary-native_1.16.14.bb} (83%) rename meta/recipes-devtools/go/{go-cross-canadian_1.16.13.bb => go-cross-canadian_1.16.14.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.16.13.bb => go-cross_1.16.14.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.16.13.bb => go-crosssdk_1.16.14.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.16.13.bb => go-native_1.16.14.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.16.13.bb => go-runtime_1.16.14.bb} (100%) rename meta/recipes-devtools/go/{go_1.16.13.bb => go_1.16.14.bb} (100%) diff --git a/meta/recipes-devtools/go/go-1.16.13.inc b/meta/recipes-devtools/go/go-1.16.14.inc similarity index 91% rename from meta/recipes-devtools/go/go-1.16.13.inc rename to meta/recipes-devtools/go/go-1.16.14.inc index 8675afc3bb0..6482c6fa7c7 100644 --- a/meta/recipes-devtools/go/go-1.16.13.inc +++ b/meta/recipes-devtools/go/go-1.16.14.inc @@ -1,7 +1,7 @@ require go-common.inc GO_BASEVERSION = "1.16" -PV = "1.16.13" +PV = "1.16.14" FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" @@ -18,7 +18,7 @@ SRC_URI += "\ file://0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch \ file://0001-encoding-xml-handle-leading-trailing-or-double-colon.patch \ " -SRC_URI[main.sha256sum] = "b0926654eaeb01ef43816638f42d7b1681f2d3f41b9559f07735522b7afad41a" +SRC_URI[main.sha256sum] = "467898cd3a216de54dcb9014f541efe77e9b79a7154dbc1fd2dd778b0c63fb56" # Upstream don't believe it is a signifiant real world issue and will only # fix in 1.17 onwards where we can drop this. diff --git a/meta/recipes-devtools/go/go-binary-native_1.16.13.bb b/meta/recipes-devtools/go/go-binary-native_1.16.14.bb similarity index 83% rename from meta/recipes-devtools/go/go-binary-native_1.16.13.bb rename to meta/recipes-devtools/go/go-binary-native_1.16.14.bb index 6e498a17bec..419fc4ffcf1 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.16.13.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.16.14.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" PROVIDES = "go-native" SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "275fc03c90c13b0bbff13125a43f1f7a9f9c00a0d5a9f2d5b16dbc2fa2c6e12a" -SRC_URI[go_linux_arm64.sha256sum] = "3dd8e14837105cbfedf7124c7f8c524ce492748c370036c7316ef99e18d116d7" +SRC_URI[go_linux_amd64.sha256sum] = "f4f5f02eb6809ac5bf19b5ad517b23504fd5fc036f6487651968ad36aa7a20e0" +SRC_URI[go_linux_arm64.sha256sum] = "5e59056e36704acb25809bcdb27191f27593cb7aba4d716b523008135a1e764a" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.16.13.bb b/meta/recipes-devtools/go/go-cross-canadian_1.16.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.16.13.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.16.14.bb diff --git a/meta/recipes-devtools/go/go-cross_1.16.13.bb b/meta/recipes-devtools/go/go-cross_1.16.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.16.13.bb rename to meta/recipes-devtools/go/go-cross_1.16.14.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.16.13.bb b/meta/recipes-devtools/go/go-crosssdk_1.16.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.16.13.bb rename to meta/recipes-devtools/go/go-crosssdk_1.16.14.bb diff --git a/meta/recipes-devtools/go/go-native_1.16.13.bb b/meta/recipes-devtools/go/go-native_1.16.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-native_1.16.13.bb rename to meta/recipes-devtools/go/go-native_1.16.14.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.16.13.bb b/meta/recipes-devtools/go/go-runtime_1.16.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.16.13.bb rename to meta/recipes-devtools/go/go-runtime_1.16.14.bb diff --git a/meta/recipes-devtools/go/go_1.16.13.bb b/meta/recipes-devtools/go/go_1.16.14.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.16.13.bb rename to meta/recipes-devtools/go/go_1.16.14.bb From edb6df08cb47a39918d28c709675d995c9e10031 Mon Sep 17 00:00:00 2001 From: Lee Chee Yang Date: Mon, 28 Feb 2022 11:38:37 +0800 Subject: [PATCH 068/108] ruby : update to 3.0.3 Do not tweak a file that is no longer installed. Ruby 3.0.3 includes security fixes. CVE-2021-41817: Regular Expression Denial of Service Vulnerability of Date Parsing Methods CVE-2021-41816: Buffer Overrun in CGI.escape_html CVE-2021-41819: Cookie Prefix Spoofing in CGI::Cookie.parse Ruby 3.0.2 release includes security fixes. CVE-2021-31810: Trusting FTP PASV responses vulnerability in Net::FTP CVE-2021-32066: A StartTLS stripping vulnerability in Net::IMAP CVE-2021-31799: A command injection vulnerability in RDoc Signed-off-by: Lee Chee Yang Signed-off-by: Anuj Mittal --- .../ruby/ruby/CVE-2021-31799.patch | 57 ---- .../ruby/ruby/CVE-2021-31810.patch | 258 ------------------ .../ruby/ruby/CVE-2021-32066.patch | 102 ------- .../ruby/{ruby_3.0.1.bb => ruby_3.0.3.bb} | 7 +- 4 files changed, 1 insertion(+), 423 deletions(-) delete mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2021-31799.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2021-31810.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2021-32066.patch rename meta/recipes-devtools/ruby/{ruby_3.0.1.bb => ruby_3.0.3.bb} (90%) diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2021-31799.patch b/meta/recipes-devtools/ruby/ruby/CVE-2021-31799.patch deleted file mode 100644 index 83064e85abf..00000000000 --- a/meta/recipes-devtools/ruby/ruby/CVE-2021-31799.patch +++ /dev/null @@ -1,57 +0,0 @@ -From b1c73f239fe9af97de837331849f55d67c27561e Mon Sep 17 00:00:00 2001 -From: aycabta -Date: Sun, 2 May 2021 20:52:23 +0900 -Subject: [PATCH] [ruby/rdoc] Use File.open to fix the OS Command Injection - vulnerability in CVE-2021-31799 - -https://github.com/ruby/rdoc/commit/a7f5d6ab88 - -CVE: CVE-2021-31799 - -Upstream-Status: Backport[https://github.com/ruby/ruby/commit/b1c73f239fe9af97de837331849f55d67c27561e] - -Signed-off-by: Mingli Yu ---- - lib/rdoc/rdoc.rb | 2 +- - test/rdoc/test_rdoc_rdoc.rb | 12 ++++++++++++ - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb -index 680a8612f7..904625f105 100644 ---- a/lib/rdoc/rdoc.rb -+++ b/lib/rdoc/rdoc.rb -@@ -444,7 +444,7 @@ def remove_unparseable files - files.reject do |file, *| - file =~ /\.(?:class|eps|erb|scpt\.txt|svg|ttf|yml)$/i or - (file =~ /tags$/i and -- open(file, 'rb') { |io| -+ File.open(file, 'rb') { |io| - io.read(100) =~ /\A(\f\n[^,]+,\d+$|!_TAG_)/ - }) - end -diff --git a/test/rdoc/test_rdoc_rdoc.rb b/test/rdoc/test_rdoc_rdoc.rb -index 3910dd4656..a83d5a1b88 100644 ---- a/test/rdoc/test_rdoc_rdoc.rb -+++ b/test/rdoc/test_rdoc_rdoc.rb -@@ -456,6 +456,18 @@ def test_remove_unparseable_tags_vim - end - end - -+ def test_remove_unparseable_CVE_2021_31799 -+ temp_dir do -+ file_list = ['| touch evil.txt && echo tags'] -+ file_list.each do |f| -+ FileUtils.touch f -+ end -+ -+ assert_equal file_list, @rdoc.remove_unparseable(file_list) -+ assert_equal file_list, Dir.children('.') -+ end -+ end -+ - def test_setup_output_dir - Dir.mktmpdir {|d| - path = File.join d, 'testdir' --- -2.17.1 - diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2021-31810.patch b/meta/recipes-devtools/ruby/ruby/CVE-2021-31810.patch deleted file mode 100644 index 69d774e0b71..00000000000 --- a/meta/recipes-devtools/ruby/ruby/CVE-2021-31810.patch +++ /dev/null @@ -1,258 +0,0 @@ -From 8cebc092cd18f4cfb669f66018ea8ffc6f408584 Mon Sep 17 00:00:00 2001 -From: Yusuke Endoh -Date: Wed, 7 Jul 2021 11:57:15 +0900 -Subject: [PATCH] Ignore IP addresses in PASV responses by default, and add new - option use_pasv_ip - -This fixes CVE-2021-31810. -Reported by Alexandr Savca. - -Co-authored-by: Shugo Maeda - -CVE: CVE-2021-31810 - -Upstream-Status: Backport -[https://github.com/ruby/ruby/commit/bf4d05173c7cf04d8892e4b64508ecf7902717cd] - -Signed-off-by: Yi Zhao ---- - lib/net/ftp.rb | 15 +++- - test/net/ftp/test_ftp.rb | 159 ++++++++++++++++++++++++++++++++++++++- - 2 files changed, 170 insertions(+), 4 deletions(-) - -diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb -index 88e8655..d6f5cc3 100644 ---- a/lib/net/ftp.rb -+++ b/lib/net/ftp.rb -@@ -98,6 +98,10 @@ module Net - # When +true+, the connection is in passive mode. Default: +true+. - attr_accessor :passive - -+ # When +true+, use the IP address in PASV responses. Otherwise, it uses -+ # the same IP address for the control connection. Default: +false+. -+ attr_accessor :use_pasv_ip -+ - # When +true+, all traffic to and from the server is written - # to +$stdout+. Default: +false+. - attr_accessor :debug_mode -@@ -206,6 +210,9 @@ module Net - # handshake. - # See Net::FTP#ssl_handshake_timeout for - # details. Default: +nil+. -+ # use_pasv_ip:: When +true+, use the IP address in PASV responses. -+ # Otherwise, it uses the same IP address for the control -+ # connection. Default: +false+. - # debug_mode:: When +true+, all traffic to and from the server is - # written to +$stdout+. Default: +false+. - # -@@ -266,6 +273,7 @@ module Net - @open_timeout = options[:open_timeout] - @ssl_handshake_timeout = options[:ssl_handshake_timeout] - @read_timeout = options[:read_timeout] || 60 -+ @use_pasv_ip = options[:use_pasv_ip] || false - if host - connect(host, options[:port] || FTP_PORT) - if options[:username] -@@ -1371,7 +1379,12 @@ module Net - raise FTPReplyError, resp - end - if m = /\((?\d+(?:,\d+){3}),(?\d+,\d+)\)/.match(resp) -- return parse_pasv_ipv4_host(m["host"]), parse_pasv_port(m["port"]) -+ if @use_pasv_ip -+ host = parse_pasv_ipv4_host(m["host"]) -+ else -+ host = @bare_sock.remote_address.ip_address -+ end -+ return host, parse_pasv_port(m["port"]) - else - raise FTPProtoError, resp - end -diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb -index 023e794..243d4ad 100644 ---- a/test/net/ftp/test_ftp.rb -+++ b/test/net/ftp/test_ftp.rb -@@ -61,7 +61,7 @@ class FTPTest < Test::Unit::TestCase - end - - def test_parse227 -- ftp = Net::FTP.new -+ ftp = Net::FTP.new(nil, use_pasv_ip: true) - host, port = ftp.send(:parse227, "227 Entering Passive Mode (192,168,0,1,12,34)") - assert_equal("192.168.0.1", host) - assert_equal(3106, port) -@@ -80,6 +80,14 @@ class FTPTest < Test::Unit::TestCase - assert_raise(Net::FTPProtoError) do - ftp.send(:parse227, "227 ) foo bar (") - end -+ -+ ftp = Net::FTP.new -+ sock = OpenStruct.new -+ sock.remote_address = OpenStruct.new -+ sock.remote_address.ip_address = "10.0.0.1" -+ ftp.instance_variable_set(:@bare_sock, sock) -+ host, port = ftp.send(:parse227, "227 Entering Passive Mode (192,168,0,1,12,34)") -+ assert_equal("10.0.0.1", host) - end - - def test_parse228 -@@ -2474,10 +2482,155 @@ EOF - end - end - -+ def test_ignore_pasv_ip -+ commands = [] -+ binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3 -+ server = create_ftp_server(nil, "127.0.0.1") { |sock| -+ sock.print("220 (test_ftp).\r\n") -+ commands.push(sock.gets) -+ sock.print("331 Please specify the password.\r\n") -+ commands.push(sock.gets) -+ sock.print("230 Login successful.\r\n") -+ commands.push(sock.gets) -+ sock.print("200 Switching to Binary mode.\r\n") -+ line = sock.gets -+ commands.push(line) -+ data_server = TCPServer.new("127.0.0.1", 0) -+ port = data_server.local_address.ip_port -+ sock.printf("227 Entering Passive Mode (999,0,0,1,%s).\r\n", -+ port.divmod(256).join(",")) -+ commands.push(sock.gets) -+ sock.print("150 Opening BINARY mode data connection for foo (#{binary_data.size} bytes)\r\n") -+ conn = data_server.accept -+ binary_data.scan(/.{1,1024}/nm) do |s| -+ conn.print(s) -+ end -+ conn.shutdown(Socket::SHUT_WR) -+ conn.read -+ conn.close -+ data_server.close -+ sock.print("226 Transfer complete.\r\n") -+ } -+ begin -+ begin -+ ftp = Net::FTP.new -+ ftp.passive = true -+ ftp.read_timeout *= 5 if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # for --jit-wait -+ ftp.connect("127.0.0.1", server.port) -+ ftp.login -+ assert_match(/\AUSER /, commands.shift) -+ assert_match(/\APASS /, commands.shift) -+ assert_equal("TYPE I\r\n", commands.shift) -+ buf = ftp.getbinaryfile("foo", nil) -+ assert_equal(binary_data, buf) -+ assert_equal(Encoding::ASCII_8BIT, buf.encoding) -+ assert_equal("PASV\r\n", commands.shift) -+ assert_equal("RETR foo\r\n", commands.shift) -+ assert_equal(nil, commands.shift) -+ ensure -+ ftp.close if ftp -+ end -+ ensure -+ server.close -+ end -+ end -+ -+ def test_use_pasv_ip -+ commands = [] -+ binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3 -+ server = create_ftp_server(nil, "127.0.0.1") { |sock| -+ sock.print("220 (test_ftp).\r\n") -+ commands.push(sock.gets) -+ sock.print("331 Please specify the password.\r\n") -+ commands.push(sock.gets) -+ sock.print("230 Login successful.\r\n") -+ commands.push(sock.gets) -+ sock.print("200 Switching to Binary mode.\r\n") -+ line = sock.gets -+ commands.push(line) -+ data_server = TCPServer.new("127.0.0.1", 0) -+ port = data_server.local_address.ip_port -+ sock.printf("227 Entering Passive Mode (127,0,0,1,%s).\r\n", -+ port.divmod(256).join(",")) -+ commands.push(sock.gets) -+ sock.print("150 Opening BINARY mode data connection for foo (#{binary_data.size} bytes)\r\n") -+ conn = data_server.accept -+ binary_data.scan(/.{1,1024}/nm) do |s| -+ conn.print(s) -+ end -+ conn.shutdown(Socket::SHUT_WR) -+ conn.read -+ conn.close -+ data_server.close -+ sock.print("226 Transfer complete.\r\n") -+ } -+ begin -+ begin -+ ftp = Net::FTP.new -+ ftp.passive = true -+ ftp.use_pasv_ip = true -+ ftp.read_timeout *= 5 if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # for --jit-wait -+ ftp.connect("127.0.0.1", server.port) -+ ftp.login -+ assert_match(/\AUSER /, commands.shift) -+ assert_match(/\APASS /, commands.shift) -+ assert_equal("TYPE I\r\n", commands.shift) -+ buf = ftp.getbinaryfile("foo", nil) -+ assert_equal(binary_data, buf) -+ assert_equal(Encoding::ASCII_8BIT, buf.encoding) -+ assert_equal("PASV\r\n", commands.shift) -+ assert_equal("RETR foo\r\n", commands.shift) -+ assert_equal(nil, commands.shift) -+ ensure -+ ftp.close if ftp -+ end -+ ensure -+ server.close -+ end -+ end -+ -+ def test_use_pasv_invalid_ip -+ commands = [] -+ binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3 -+ server = create_ftp_server(nil, "127.0.0.1") { |sock| -+ sock.print("220 (test_ftp).\r\n") -+ commands.push(sock.gets) -+ sock.print("331 Please specify the password.\r\n") -+ commands.push(sock.gets) -+ sock.print("230 Login successful.\r\n") -+ commands.push(sock.gets) -+ sock.print("200 Switching to Binary mode.\r\n") -+ line = sock.gets -+ commands.push(line) -+ sock.print("227 Entering Passive Mode (999,0,0,1,48,57).\r\n") -+ commands.push(sock.gets) -+ } -+ begin -+ begin -+ ftp = Net::FTP.new -+ ftp.passive = true -+ ftp.use_pasv_ip = true -+ ftp.read_timeout *= 5 if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # for --jit-wait -+ ftp.connect("127.0.0.1", server.port) -+ ftp.login -+ assert_match(/\AUSER /, commands.shift) -+ assert_match(/\APASS /, commands.shift) -+ assert_equal("TYPE I\r\n", commands.shift) -+ assert_raise(SocketError) do -+ ftp.getbinaryfile("foo", nil) -+ end -+ ensure -+ ftp.close if ftp -+ end -+ ensure -+ server.close -+ end -+ end -+ - private - -- def create_ftp_server(sleep_time = nil) -- server = TCPServer.new(SERVER_ADDR, 0) -+ def create_ftp_server(sleep_time = nil, addr = SERVER_ADDR) -+ server = TCPServer.new(addr, 0) - @thread = Thread.start do - if sleep_time - sleep(sleep_time) --- -2.17.1 - diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2021-32066.patch b/meta/recipes-devtools/ruby/ruby/CVE-2021-32066.patch deleted file mode 100644 index b78a74a4b59..00000000000 --- a/meta/recipes-devtools/ruby/ruby/CVE-2021-32066.patch +++ /dev/null @@ -1,102 +0,0 @@ -From e2ac25d0eb66de99f098d6669cf4f06796aa6256 Mon Sep 17 00:00:00 2001 -From: Shugo Maeda -Date: Tue, 11 May 2021 10:31:27 +0900 -Subject: [PATCH] Fix StartTLS stripping vulnerability - -This fixes CVE-2021-32066. -Reported by Alexandr Savca in . - -CVE: CVE-2021-32066 - -Upstream-Status: Backport -[https://github.com/ruby/ruby/commit/e2ac25d0eb66de99f098d6669cf4f06796aa6256] - -Signed-off-by: Yi Zhao ---- - lib/net/imap.rb | 8 +++++++- - test/net/imap/test_imap.rb | 31 +++++++++++++++++++++++++++++++ - 2 files changed, 38 insertions(+), 1 deletion(-) - -diff --git a/lib/net/imap.rb b/lib/net/imap.rb -index 505b4c8950..d45304f289 100644 ---- a/lib/net/imap.rb -+++ b/lib/net/imap.rb -@@ -1218,12 +1218,14 @@ def get_tagged_response(tag, cmd) - end - resp = @tagged_responses.delete(tag) - case resp.name -+ when /\A(?:OK)\z/ni -+ return resp - when /\A(?:NO)\z/ni - raise NoResponseError, resp - when /\A(?:BAD)\z/ni - raise BadResponseError, resp - else -- return resp -+ raise UnknownResponseError, resp - end - end - -@@ -3719,6 +3721,10 @@ class BadResponseError < ResponseError - class ByeResponseError < ResponseError - end - -+ # Error raised upon an unknown response from the server. -+ class UnknownResponseError < ResponseError -+ end -+ - RESPONSE_ERRORS = Hash.new(ResponseError) - RESPONSE_ERRORS["NO"] = NoResponseError - RESPONSE_ERRORS["BAD"] = BadResponseError -diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb -index 8b924b524e..85fb71d440 100644 ---- a/test/net/imap/test_imap.rb -+++ b/test/net/imap/test_imap.rb -@@ -127,6 +127,16 @@ def test_starttls - imap.disconnect - end - end -+ -+ def test_starttls_stripping -+ starttls_stripping_test do |port| -+ imap = Net::IMAP.new("localhost", :port => port) -+ assert_raise(Net::IMAP::UnknownResponseError) do -+ imap.starttls(:ca_file => CA_FILE) -+ end -+ imap -+ end -+ end - end - - def start_server -@@ -834,6 +844,27 @@ def starttls_test - end - end - -+ def starttls_stripping_test -+ server = create_tcp_server -+ port = server.addr[1] -+ start_server do -+ sock = server.accept -+ begin -+ sock.print("* OK test server\r\n") -+ sock.gets -+ sock.print("RUBY0001 BUG unhandled command\r\n") -+ ensure -+ sock.close -+ server.close -+ end -+ end -+ begin -+ imap = yield(port) -+ ensure -+ imap.disconnect if imap && !imap.disconnected? -+ end -+ end -+ - def create_tcp_server - return TCPServer.new(server_addr, 0) - end --- -2.25.1 - diff --git a/meta/recipes-devtools/ruby/ruby_3.0.1.bb b/meta/recipes-devtools/ruby/ruby_3.0.3.bb similarity index 90% rename from meta/recipes-devtools/ruby/ruby_3.0.1.bb rename to meta/recipes-devtools/ruby/ruby_3.0.3.bb index a3489469729..a781f69534e 100644 --- a/meta/recipes-devtools/ruby/ruby_3.0.1.bb +++ b/meta/recipes-devtools/ruby/ruby_3.0.3.bb @@ -6,16 +6,13 @@ SRC_URI += " \ file://remove_has_include_macros.patch \ file://run-ptest \ file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \ - file://CVE-2021-31810.patch \ - file://CVE-2021-32066.patch \ - file://CVE-2021-31799.patch \ file://0003-rdoc-build-reproducible-documentation.patch \ file://0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch \ file://0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch \ file://0006-Make-gemspecs-reproducible.patch \ " -SRC_URI[sha256sum] = "369825db2199f6aeef16b408df6a04ebaddb664fb9af0ec8c686b0ce7ab77727" +SRC_URI[sha256sum] = "3586861cb2df56970287f0fd83f274bd92058872d830d15570b36def7f1a92ac" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" @@ -81,8 +78,6 @@ do_install_ptest () { -i ${D}${PTEST_PATH}/test/erb/test_erb_command.rb cp -r ${S}/include ${D}/${libdir}/ruby/ - test_case_rb=`grep rubygems/test_case.rb ${B}/.installed.list` - sed -i -e 's:../../../test/:../../../ptest/test/:g' ${D}/$test_case_rb } PACKAGES =+ "${PN}-ri-docs ${PN}-rdoc" From 9b0199a1d8ec3c7bbfd2022932d524d61f2c6832 Mon Sep 17 00:00:00 2001 From: Minjae Kim Date: Mon, 28 Feb 2022 11:38:38 +0800 Subject: [PATCH 069/108] ghostscript: fix CVE-2021-45949 Ghostscript GhostPDL 9.50 through 9.54.0 has a heap-based buffer overflow in sampled_data_finish (called from sampled_data_continue and interp). To apply this CVE-2021-45959 patch, the check-stack-limits-after-function-evalution.patch should be applied first. References: https://nvd.nist.gov/vuln/detail/CVE-2021-45949 (From OE-Core rev: 5fb43ed64ae32abe4488f2eb37c1b82f97f83db0) Signed-off-by: Minjae Kim Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie Signed-off-by: Lee Chee Yang Signed-off-by: Anuj Mittal --- .../ghostscript/CVE-2021-45949.patch | 65 +++++++++++++++++++ ...tack-limits-after-function-evalution.patch | 51 +++++++++++++++ .../ghostscript/ghostscript_9.53.3.bb | 2 + 3 files changed, 118 insertions(+) create mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2021-45949.patch create mode 100644 meta/recipes-extended/ghostscript/ghostscript/check-stack-limits-after-function-evalution.patch diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2021-45949.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2021-45949.patch new file mode 100644 index 00000000000..f312f89e044 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/CVE-2021-45949.patch @@ -0,0 +1,65 @@ +From 6643ff0cb837db3eade489ffff21e3e92eee2ae0 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Fri, 28 Jan 2022 08:21:19 +0000 +Subject: [PATCH] [PATCH] Bug 703902: Fix op stack management in + sampled_data_continue() + +Replace pop() (which does no checking, and doesn't handle stack extension +blocks) with ref_stack_pop() which does do all that. + +We still use pop() in one case (it's faster), but we have to later use +ref_stack_pop() before calling sampled_data_sample() which also accesses the +op stack. + +Fixes: +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34675 + +Upstream-Status: Backported [https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=2a3129365d3bc0d4a41f107ef175920d1505d1f7] +CVE: CVE-2021-45949 +Signed-off-by: Minjae Kim +--- + psi/zfsample.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 0023fa4..f84671f 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -534,14 +534,17 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + data_ptr[bps * i + j] = (byte)(cv >> ((bps - 1 - j) * 8)); /* MSB first */ + } + pop(num_out); /* Move op to base of result values */ +- ++ /* From here on, we have to use ref_stack_pop() rather than pop() ++ so that it handles stack extension blocks properly, before calling ++ sampled_data_sample() which also uses the op stack. ++ */ + /* Check if we are done collecting data. */ + + if (increment_cube_indexes(params, penum->indexes)) { + if (stack_depth_adjust == 0) +- pop(O_STACK_PAD); /* Remove spare stack space */ ++ ref_stack_pop(&o_stack, O_STACK_PAD); /* Remove spare stack space */ + else +- pop(stack_depth_adjust - num_out); ++ ref_stack_pop(&o_stack, stack_depth_adjust - num_out); + /* Execute the closing procedure, if given */ + code = 0; + if (esp_finish_proc != 0) +@@ -554,11 +557,11 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + if ((O_STACK_PAD - stack_depth_adjust) < 0) { + stack_depth_adjust = -(O_STACK_PAD - stack_depth_adjust); + check_op(stack_depth_adjust); +- pop(stack_depth_adjust); ++ ref_stack_pop(&o_stack, stack_depth_adjust); + } + else { + check_ostack(O_STACK_PAD - stack_depth_adjust); +- push(O_STACK_PAD - stack_depth_adjust); ++ ref_stack_push(&o_stack, O_STACK_PAD - stack_depth_adjust); + for (i=0;i +Date: Fri, 12 Feb 2021 10:34:23 +0000 +Subject: [PATCH] oss-fuzz 30715: Check stack limits after function evaluation. + +During function result sampling, after the callout to the Postscript +interpreter, make sure there is enough stack space available before pushing +or popping entries. + +In thise case, the Postscript procedure for the "function" is totally invalid +(as a function), and leaves the op stack in an unrecoverable state (as far as +function evaluation is concerned). We end up popping more entries off the +stack than are available. + +To cope, add in stack limit checking to throw an appropriate error when this +happens. + +Upstream-Status: Backported [https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=7861fcad13c497728189feafb41cd57b5b50ea25] +Signed-off-by: Minjae Kim +--- + psi/zfsample.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 290809405..652ae02c6 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -551,9 +551,17 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + } else { + if (stack_depth_adjust) { + stack_depth_adjust -= num_out; +- push(O_STACK_PAD - stack_depth_adjust); +- for (i=0;i Date: Mon, 7 Mar 2022 15:44:41 +0800 Subject: [PATCH 071/108] lttng-modules: upgrade 2.12.6 -> 2.12.7 Changelog: * fix: mm: move kvmalloc-related functions to slab.h (v5.16) * fix: block: don't call blk_status_to_errno in blk_update_request (v5.16) * fix: KVM: MMU: change tracepoints arguments to kvm_page_fault (v5.16) * fix: KVM: x86: Get exit_reason as part of kvm_x86_ops.get_exit_info (v5.16) * fix: isystem: delete global -isystem compile option (v5.16) * fix: block: move block-related definitions out of fs.h (v5.16) * fix: implicit-int error in EXPORT_SYMBOL_GPL * fix: Revert "Makefile: Enable -Wimplicit-fallthrough for Clang" (v5.15) * fix: cpu/hotplug: Remove deprecated CPU-hotplug functions. (v5.15) * fix: sched: Change task_struct::state (v5.14) * fix: btrfs: pass btrfs_inode to btrfs_writepage_endio_finish_ordered() (v5.14) * fix: adjust ranges for RHEL 8.4 Signed-off-by: Anuj Mittal --- .../lttng/{lttng-modules_2.12.6.bb => lttng-modules_2.12.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/lttng/{lttng-modules_2.12.6.bb => lttng-modules_2.12.7.bb} (94%) diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb b/meta/recipes-kernel/lttng/lttng-modules_2.12.7.bb similarity index 94% rename from meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.12.7.bb index 1dff2b05f7c..5eb3902bb32 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.12.7.bb @@ -13,7 +13,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ " -SRC_URI[sha256sum] = "95ac2a2cf92d85d23ffbdaca6a1ec0d7c167211d1e0fb850ab90004a3f475eaa" +SRC_URI[sha256sum] = "32ab2d17d513cd2f458f8844c66a0d013283301fc7329b55d6503153cf8cb253" export INSTALL_MOD_DIR="kernel/lttng-modules" From 35053703a511fbd3e931740b546b863097485809 Mon Sep 17 00:00:00 2001 From: wangmy Date: Wed, 23 Feb 2022 21:41:54 +0800 Subject: [PATCH 072/108] wireless-regdb: upgrade 2021.08.28 -> 2022.02.18 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (cherry picked from commit e5c06ddfd3c0db0d0762c0241c019f59ad310e53) Signed-off-by: Anuj Mittal --- ...ireless-regdb_2021.08.28.bb => wireless-regdb_2022.02.18.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2021.08.28.bb => wireless-regdb_2022.02.18.bb} (94%) diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.08.28.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.02.18.bb similarity index 94% rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.08.28.bb rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.02.18.bb index b1cad01a25c..2d7e5dad9d8 100644 --- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.08.28.bb +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.02.18.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] = "cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446" +SRC_URI[sha256sum] = "8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f" inherit bin_package allarch From fc185aeecfd35f7a6ab86964b04f1667f3a84208 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Sun, 27 Feb 2022 19:21:33 +0100 Subject: [PATCH 073/108] selftest: recipetool: Correct the URI for socat The URI to the socat tarball used in the recipetool.RecipetoolCreateTests.test_recipetool_create_simple test has been moved to an "Archive" directory. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie (cherry picked from commit 1e8b716e1377ad49f1451cbabe7c9961cc507731) Signed-off-by: Anuj Mittal --- meta/lib/oeqa/selftest/cases/recipetool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index 36214929986..4f283cdc031 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -375,7 +375,7 @@ def test_recipetool_create_simple(self): temprecipe = os.path.join(self.tempdir, 'recipe') os.makedirs(temprecipe) pv = '1.7.3.0' - srcuri = 'http://www.dest-unreach.org/socat/download/socat-%s.tar.bz2' % pv + srcuri = 'http://www.dest-unreach.org/socat/download/Archive/socat-%s.tar.bz2' % pv result = runCmd('recipetool create %s -o %s' % (srcuri, temprecipe)) dirlist = os.listdir(temprecipe) if len(dirlist) > 1: From e5beba08c03fa773e2b4fc4a12662825ac4e2b71 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 4 Mar 2022 17:14:06 +0000 Subject: [PATCH 074/108] asciidoc: update git repository The asciidoc-py3 repository has been renamed to asciidoc-py. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit f78dd3f4c5f0cd738783e75f3796e1da2a2a2ba1) Signed-off-by: Anuj Mittal --- meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb b/meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb index 523bf33f42b..3869abee598 100644 --- a/meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb +++ b/meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb @@ -8,7 +8,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e5d1baf6f20559e3bec172226a47e4e \ file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 " -SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=9.x" +SRC_URI = "git://github.com/asciidoc/asciidoc-py;protocol=https;branch=9.x" SRCREV = "9705d428439530104ce55d0ba12e8ef9d1b57ad1" DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" From 0ce1742dd22bfd62a446bffee58c2918ef7e4a1e Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sat, 12 Feb 2022 20:23:44 -0500 Subject: [PATCH 075/108] linux-yocto/5.10: ppc/riscv: fix build with binutils 2.3.8 Integrating the following commit(s) to linux-yocto/5.10: 1bd813fe8d0e riscv: fix build with binutils 2.38 835a2d1b24c6 powerpc/lib/sstep: fix 'ptesync' build error Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 8279495332f560902a9c264939da50b8302828b6) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 2 +- .../linux/linux-yocto-tiny_5.10.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 20 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index f142da66ab2..a13f17d0924 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "53a27dc510c8d9152ffa4d2d95b888db7d3d97b6" +SRCREV_machine ?= "c8061a9f265a0d314e5b780a651662f462e4b287" SRCREV_meta ?= "a58f4e7cca3973e04d3f9a40356ef9c2c0bb10a5" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 8e33e703f79..e34f8e3cd9a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "b7823b6ac25671f8dc5ee2c4cf74af3be88207cf" -SRCREV_machine ?= "7558a33fc5b60d4327b683c3376c5352cba11ed1" +SRCREV_machine_qemuarm ?= "5e7b4957ac1a94fdaaa719f6b62b80856e8a55e6" +SRCREV_machine ?= "24a50caea8c65c2af4987c60067dc55ef737ebca" SRCREV_meta ?= "a58f4e7cca3973e04d3f9a40356ef9c2c0bb10a5" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 9c6ba1cb5e4..a71119c3f05 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,16 +13,16 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "c3a59bad41cefbe15d6bcde0ec2fe5c7ea28ba2b" -SRCREV_machine_qemuarm64 ?= "07ca3e3c85445f2c31bd081b27741c9680536168" -SRCREV_machine_qemumips ?= "10ae40d47f14b3c05dd6506c70576383c5474670" -SRCREV_machine_qemuppc ?= "bc2a7c884103143e0a4360518247fe01bf2c13d3" -SRCREV_machine_qemuriscv64 ?= "84f6a75f64961e59d61bf3d70ab17e8bb430386b" -SRCREV_machine_qemuriscv32 ?= "84f6a75f64961e59d61bf3d70ab17e8bb430386b" -SRCREV_machine_qemux86 ?= "84f6a75f64961e59d61bf3d70ab17e8bb430386b" -SRCREV_machine_qemux86-64 ?= "84f6a75f64961e59d61bf3d70ab17e8bb430386b" -SRCREV_machine_qemumips64 ?= "13998bd0244737548a21a17d1969ca65af0712b1" -SRCREV_machine ?= "84f6a75f64961e59d61bf3d70ab17e8bb430386b" +SRCREV_machine_qemuarm ?= "7f5de9bc153963749c9a566828b59d4e63796432" +SRCREV_machine_qemuarm64 ?= "c5bed4d604e64e8ce795a28576e341a2e790b4de" +SRCREV_machine_qemumips ?= "0361229f491eec312e503cf7e58931571e53503f" +SRCREV_machine_qemuppc ?= "2d7e10b0e0bab9b364e7612caf81b318f1d28b27" +SRCREV_machine_qemuriscv64 ?= "1bd813fe8d0e8e2bc4b05fdf61fb77d68ee416c5" +SRCREV_machine_qemuriscv32 ?= "1bd813fe8d0e8e2bc4b05fdf61fb77d68ee416c5" +SRCREV_machine_qemux86 ?= "1bd813fe8d0e8e2bc4b05fdf61fb77d68ee416c5" +SRCREV_machine_qemux86-64 ?= "1bd813fe8d0e8e2bc4b05fdf61fb77d68ee416c5" +SRCREV_machine_qemumips64 ?= "931424f9c84cc440e8f154465062e71e2bdc2f03" +SRCREV_machine ?= "1bd813fe8d0e8e2bc4b05fdf61fb77d68ee416c5" SRCREV_meta ?= "a58f4e7cca3973e04d3f9a40356ef9c2c0bb10a5" # remap qemuarm to qemuarma15 for the 5.8 kernel From a8d750cfa894abd9e260c5225f8ad3cd93db5194 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 15 Feb 2022 09:57:15 -0500 Subject: [PATCH 076/108] linux-yocto/5.10: fix dssall build error with binutils 2.3.8 Integrating the following commit(s) to linux-yocto/5.10: c0b313d988a1 powerpc/mm: Switch obsolete dssall to .long Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit b063ee0529c02f8b31a1034289ea1a202e496d0b) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 4 ++-- .../linux/linux-yocto-tiny_5.10.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 22 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index a13f17d0924..edc1a957bb6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "c8061a9f265a0d314e5b780a651662f462e4b287" -SRCREV_meta ?= "a58f4e7cca3973e04d3f9a40356ef9c2c0bb10a5" +SRCREV_machine ?= "e5b266bc6b15dc8852649b7d2a31395195dc7b3a" +SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" 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.10;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index e34f8e3cd9a..5380dcb0294 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "5e7b4957ac1a94fdaaa719f6b62b80856e8a55e6" -SRCREV_machine ?= "24a50caea8c65c2af4987c60067dc55ef737ebca" -SRCREV_meta ?= "a58f4e7cca3973e04d3f9a40356ef9c2c0bb10a5" +SRCREV_machine_qemuarm ?= "9a8497a8761a22b3086cab63d18698024a69a410" +SRCREV_machine ?= "317635e1feaecfd8aa29bc94d8d03ba873190414" +SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index a71119c3f05..d2d1b0bd5a4 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "7f5de9bc153963749c9a566828b59d4e63796432" -SRCREV_machine_qemuarm64 ?= "c5bed4d604e64e8ce795a28576e341a2e790b4de" -SRCREV_machine_qemumips ?= "0361229f491eec312e503cf7e58931571e53503f" -SRCREV_machine_qemuppc ?= "2d7e10b0e0bab9b364e7612caf81b318f1d28b27" -SRCREV_machine_qemuriscv64 ?= "1bd813fe8d0e8e2bc4b05fdf61fb77d68ee416c5" -SRCREV_machine_qemuriscv32 ?= "1bd813fe8d0e8e2bc4b05fdf61fb77d68ee416c5" -SRCREV_machine_qemux86 ?= "1bd813fe8d0e8e2bc4b05fdf61fb77d68ee416c5" -SRCREV_machine_qemux86-64 ?= "1bd813fe8d0e8e2bc4b05fdf61fb77d68ee416c5" -SRCREV_machine_qemumips64 ?= "931424f9c84cc440e8f154465062e71e2bdc2f03" -SRCREV_machine ?= "1bd813fe8d0e8e2bc4b05fdf61fb77d68ee416c5" -SRCREV_meta ?= "a58f4e7cca3973e04d3f9a40356ef9c2c0bb10a5" +SRCREV_machine_qemuarm ?= "5c9de82973348b40bfdcecc0623f488d9443038e" +SRCREV_machine_qemuarm64 ?= "8c841836837414c6d07fa08ef8482162760fc27a" +SRCREV_machine_qemumips ?= "d8287fdfbe460acdd62cf57e351411c992101514" +SRCREV_machine_qemuppc ?= "f436ec6dd3942a87331abf39805e791460e499ef" +SRCREV_machine_qemuriscv64 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" +SRCREV_machine_qemuriscv32 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" +SRCREV_machine_qemux86 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" +SRCREV_machine_qemux86-64 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" +SRCREV_machine_qemumips64 ?= "ae7887fe8d4da06d2d0d0a5071d09155899de26c" +SRCREV_machine ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" +SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" From 4c6189ba39823fa2db4706f3208e70ae1f5b4860 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 4 Mar 2022 20:25:10 -0500 Subject: [PATCH 077/108] linux-yocto/5.10: features/zram: remove CONFIG_ZRAM_DEF_COMP Integrating the following commit(s) to linux-yocto/.: 7a012dfacdc features/zram: remove CONFIG_ZRAM_DEF_COMP Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit a8fcece853475bede5d442120bc38f17751ed9a1) Signed-off-by: Anuj Mittal --- meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index edc1a957bb6..ca334a67cc3 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "e5b266bc6b15dc8852649b7d2a31395195dc7b3a" -SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" +SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2" 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.10;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 5380dcb0294..d3bcd594f4e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "9a8497a8761a22b3086cab63d18698024a69a410" SRCREV_machine ?= "317635e1feaecfd8aa29bc94d8d03ba873190414" -SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" +SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index d2d1b0bd5a4..8b10cfd96a7 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -23,7 +23,7 @@ SRCREV_machine_qemux86 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" SRCREV_machine_qemux86-64 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" SRCREV_machine_qemumips64 ?= "ae7887fe8d4da06d2d0d0a5071d09155899de26c" SRCREV_machine ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" -SRCREV_meta ?= "b53e11ea46f4e78ff4cb48532a11e1dbad7939b1" +SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" From 5f8c822e299154717983d17f15f079c6153222dc Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 4 Mar 2022 20:25:12 -0500 Subject: [PATCH 078/108] linux-yocto/5.10: update to v5.10.101 Updating linux-yocto/5.10 to the latest korg -stable release that comprises the following commits: 3969aba589d6 Linux 5.10.101 cb86e511e78e iommu: Fix potential use-after-free during probe f6b5d51976fc perf: Fix list corruption in perf_cgroup_switch() ce3ca12c632a arm64: dts: imx8mq: fix lcdif port node 759aeacdfe70 scsi: lpfc: Reduce log messages seen after firmware download 57c5d7d42076 scsi: lpfc: Remove NVMe support if kernel has NVME_FC disabled 199dab00f043 can: isotp: fix error path in isotp_sendmsg() to unlock wait queue 3b10ebeb95d7 Makefile.extrawarn: Move -Wunaligned-access to W=1 ad53060bdfc3 hwmon: (dell-smm) Speed up setting of fan speed 3c75d1017cb3 phy: ti: Fix missing sentinel for clk_div_table 6eabe53492c2 speakup-dectlk: Restore pitch setting 3836a5ff4bb7 USB: serial: cp210x: add CPI Bulk Coin Recycler id 51b03a9bcd99 USB: serial: cp210x: add NCR Retail IO box id a21e6b2e0864 USB: serial: ch341: add support for GW Instek USB2.0-Serial devices 7113440a36c7 USB: serial: option: add ZTE MF286D modem b7ed2f9619cc USB: serial: ftdi_sio: add support for Brainboxes US-159/235/320 e07dde31acc9 usb: raw-gadget: fix handling of dual-direction-capable endpoints e9f9b877eb0e usb: gadget: f_uac2: Define specific wTerminalType fb4ff0f96de3 usb: gadget: rndis: check size of RNDIS_MSG_SET command 22ec10047285 USB: gadget: validate interface OS descriptor requests 351159167cd8 usb: gadget: udc: renesas_usb3: Fix host to USB_ROLE_NONE transition 3bfca3891480 usb: dwc3: gadget: Prevent core from processing stale TRBs 2a17bd9f5210 usb: ulpi: Call of_node_put correctly 8b89a6916681 usb: ulpi: Move of_node_put to ulpi_dev_release 758290defe93 net: usb: ax88179_178a: Fix out-of-bounds accesses in RX fixup a66a2b17b8c8 Revert "usb: dwc2: drd: fix soft connect when gadget is unconfigured" 73961057e9dc usb: dwc2: drd: fix soft connect when gadget is unconfigured a37960df7eac eeprom: ee1004: limit i2c reads to I2C_SMBUS_BLOCK_MAX 1b99fe34e26d n_tty: wake up poll(POLLRDNORM) on receiving data f1b25737156c vt_ioctl: add array_index_nospec to VT_ACTIVATE 778302ca0949 vt_ioctl: fix array_index_nospec in vt_setactivate 22249886dc5b net: dsa: mv88e6xxx: fix use-after-free in mv88e6xxx_mdios_unregister 3a3c65c487a4 net: mscc: ocelot: fix mutex lock error during ethtool stats read 809f030745b2 ice: fix IPIP and SIT TSO offload cf11949b9163 ice: fix an error code in ice_cfg_phy_fec() f8edc6feab4d dpaa2-eth: unregister the netdev before disconnecting from the PHY ff6c9e0fcee5 net: amd-xgbe: disable interrupts during pci removal 657aea782887 tipc: rate limit warning for received illegal binding update ef5cdae8bc00 net: mdio: aspeed: Add missing MODULE_DEVICE_TABLE bf99c144360d veth: fix races around rq->rx_notify_masked 00e6d6c3bc14 net: fix a memleak when uncloning an skb dst and its metadata 2e9fd2d0f69e net: do not keep the dst cache when uncloning an skb dst and its metadata 0bae953d7ab5 nfp: flower: fix ida_idx not being released 09ac0fcb0a82 ipmr,ip6mr: acquire RTNL before calling ip[6]mr_free_table() on failure path e177d2e85ebc net: dsa: lantiq_gswip: don't use devres for mdiobus 95e5402f9430 net: dsa: felix: don't use devres for mdiobus 2770b795294e net: dsa: bcm_sf2: don't use devres for mdiobus 475ce5dcf2d8 net: dsa: ar9331: register the mdiobus under devres 8ccebe77df6e net: dsa: mv88e6xxx: don't use devres for mdiobus 4a384c1e4058 bonding: pair enable_port with slave_arr_updates 1ba45dd32667 gpio: sifive: use the correct register to read output values 48e413087de1 ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE 3b72d3f0205e drm/panel: simple: Assign data from panel_dpi_probe() correctly bf35639192ed ixgbevf: Require large buffers for build_skb on 82599VF e5a64f548a45 arm64: dts: meson-g12b-odroid-n2: fix typo 'dio2133' 04fe6569a7cf netfilter: ctnetlink: disable helper autoassign a5ce7ee5fcc0 misc: fastrpc: avoid double fput() on failed usercopy 21c890ca8eae drm/vc4: hdmi: Allow DBLCLK modes even if horz timing is odd. 70ea005626a9 gpio: aggregator: Fix calling into sleeping GPIO controllers 0042178a69eb usb: f_fs: Fix use-after-free for epfile 5a37fd9fdcce ARM: dts: imx7ulp: Fix 'assigned-clocks-parents' typo 39bf132a6ed5 phy: xilinx: zynqmp: Fix bus width setting for SGMII 108868dae2ee ARM: dts: imx6qdl-udoo: Properly describe the SD card detect 0a7b5e8d8c1e staging: fbtft: Fix error path in fbtft_driver_module_init() 74cd5cb2190f ARM: dts: meson8b: Fix the UART device-tree schema validation 566b558e9429 ARM: dts: meson8: Fix the UART device-tree schema validation 210d70f08100 ARM: dts: meson: Fix the UART compatible strings 88f0e61354f4 ARM: dts: Fix timer regression for beagleboard revision c c943a297ec3c drm/rockchip: vop: Correct RK3399 VOP register fields a941384fba3f PM: s2idle: ACPI: Fix wakeup interrupts handling fcbac51a64d3 ACPI/IORT: Check node revision for PMCG resources 57ede0ce6500 nvme-tcp: fix bogus request completion when failing to send AER 3a669d77e5b3 ARM: socfpga: fix missing RESET_CONTROLLER 435e62d5666a ARM: dts: Fix boot regression on Skomer b217b89e607c ARM: dts: imx23-evk: Remove MX23_PAD_SSP1_DETECT from hog group 3f9843f2f65e riscv: fix build with binutils 2.38 3aa5c8657292 KVM: VMX: Set vmcs.PENDING_DBG.BS on #DB in STI/MOVSS blocking shadow bd39fe29bbbb KVM: SVM: Don't kill SEV guest if SMAP erratum triggers in usermode 9efad4cb0365 KVM: nVMX: Also filter MSR_IA32_VMX_TRUE_PINBASED_CTLS when eVMCS db58a3d978b4 KVM: nVMX: eVMCS: Filter out VM_EXIT_SAVE_VMX_PREEMPTION_TIMER dc129275a7f7 KVM: eventfd: Fix false positive RCU usage warning 87bbd78a2cd1 net: stmmac: dwmac-sun8i: use return val of readl_poll_timeout() c9b8cc1046f0 nvme-pci: add the IGNORE_DEV_SUBNQN quirk for Intel P4500/P4600 SSDs d0774cf73056 perf: Always wake the parent event a117e986e9cc usb: dwc2: gadget: don't try to disable ep0 in dwc2_hsotg_suspend 4607218fde84 PM: hibernate: Remove register_nosave_region_late() 0e42c4a3d732 scsi: myrs: Fix crash in error case 3bc5b128b9a2 scsi: ufs: Treat link loss as fatal error 12cf1208035d scsi: pm8001: Fix bogus FW crash for maxcpus=1 87f187e5265b scsi: qedf: Fix refcount issue when LOGO is received during TMF aa7352aa155e scsi: qedf: Add stag_work to all the vports 150d448c663d scsi: ufs: ufshcd-pltfrm: Check the return value of devm_kstrdup() 7dbda616fc64 scsi: target: iscsi: Make sure the np under each tpg is unique 67baac10dd5a powerpc/fixmap: Fix VM debug warning on unmap 3d0eafd459b2 net: sched: Clarify error message when qdisc kind is unknown 9b569faabd22 drm: panel-orientation-quirks: Add quirk for the 1Netbook OneXPlayer 0d6b9d15ecb4 x86/perf: Avoid warning for Arch LBR without XSAVE b37dd03f2fc6 NFSv4 handle port presence in fs_location server string 6f2974b52b15 NFSv4 expose nfs_parse_server_name function 5a9c613a29e7 NFSv4 remove zero number of fs_locations entries error check 1c79aad1186b NFSv4.1: Fix uninitialised variable in devicenotify c5619c510f04 nfs: nfs4clinet: check the return value of kstrdup() db053bdece3a NFSv4 only print the label when its queried e2b4435fd340 NFS: change nfs_access_get_cached to only report the mask b4e0c9bcf142 tracing: Propagate is_signed to expression 5234de6c7975 drm/amdgpu: Set a suitable dev_info.gart_page_size 6215fb455893 NFSD: Fix offset type in I/O trace points 3a6a2d43e32a NFSD: Clamp WRITE offsets c72f7c2ec3d4 NFS: Fix initialisation of nfs_client cl_flags field f47ee3a35ffb net: phy: marvell: Fix MDI-x polarity setting in 88e1118-compatible PHYs 6a33aa711327 net: phy: marvell: Fix RGMII Tx/Rx delays setting in 88e1121-compatible PHYs 7b53d2204ce7 can: isotp: fix potential CAN frame reception race in isotp_rcv() c9cc027c55bb mmc: sdhci-of-esdhc: Check for error num after setting mask 8027ba480c00 ima: Do not print policy rule with inactive LSM labels 8171c8a99fea ima: Allow template selection with ima_template[_fmt]= after ima_hash= 0795b7100d25 ima: Remove ima_policy file before directory 7fea2e520003 integrity: check the return value of audit_log_start() d4f7d322a4ad Linux 5.10.100 3c7e59435535 tipc: improve size validations for received domain records 2951d2168976 crypto: api - Move cryptomgr soft dependency into algapi b62267b8b06e KVM: s390: Return error on SIDA memop on normal guest be93028d306d moxart: fix potential use-after-free on remove path Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit d67621e8f8b4f37e1357f19fc7da2de12de4bee5) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 6 ++--- .../linux/linux-yocto-tiny_5.10.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index ca334a67cc3..dcb447a09cb 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e5b266bc6b15dc8852649b7d2a31395195dc7b3a" -SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2" +SRCREV_machine ?= "5c627c3d0740ef68beef456aaf7ef104315a8f7f" +SRCREV_meta ?= "ff60a2ddb31e54be0f8ac63a28247e58f9c8cd23" 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.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.99" +LINUX_VERSION ?= "5.10.101" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index d3bcd594f4e..042023de33d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.99" +LINUX_VERSION ?= "5.10.101" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 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 ?= "9a8497a8761a22b3086cab63d18698024a69a410" -SRCREV_machine ?= "317635e1feaecfd8aa29bc94d8d03ba873190414" -SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2" +SRCREV_machine_qemuarm ?= "ce4e423e88244adab0deef2f9d021b2bf6d492ba" +SRCREV_machine ?= "cc09c000260f49e35e85a96853dd01404e6aa80a" +SRCREV_meta ?= "ff60a2ddb31e54be0f8ac63a28247e58f9c8cd23" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 8b10cfd96a7..83daecc4cda 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "5c9de82973348b40bfdcecc0623f488d9443038e" -SRCREV_machine_qemuarm64 ?= "8c841836837414c6d07fa08ef8482162760fc27a" -SRCREV_machine_qemumips ?= "d8287fdfbe460acdd62cf57e351411c992101514" -SRCREV_machine_qemuppc ?= "f436ec6dd3942a87331abf39805e791460e499ef" -SRCREV_machine_qemuriscv64 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" -SRCREV_machine_qemuriscv32 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" -SRCREV_machine_qemux86 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" -SRCREV_machine_qemux86-64 ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" -SRCREV_machine_qemumips64 ?= "ae7887fe8d4da06d2d0d0a5071d09155899de26c" -SRCREV_machine ?= "c0b313d988a16b25c1ee730bfe7393c462ee8a5c" -SRCREV_meta ?= "7a012dfacdc82bce2279c26af29cf40b5fdbeed2" +SRCREV_machine_qemuarm ?= "54d10cbfb44b9449f3962d962c6ec0d2e31017e8" +SRCREV_machine_qemuarm64 ?= "1048394a0538b9b282c1f36f4de7e4ab814c90bf" +SRCREV_machine_qemumips ?= "0214a416a56f01fed65e4b7818470139dc2b1286" +SRCREV_machine_qemuppc ?= "b678c6d8d47e6e67aefa985fea85fe3026f2c809" +SRCREV_machine_qemuriscv64 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" +SRCREV_machine_qemuriscv32 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" +SRCREV_machine_qemux86 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" +SRCREV_machine_qemux86-64 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" +SRCREV_machine_qemumips64 ?= "8d571427e05d1a8c7f7b0d32f291941429865ada" +SRCREV_machine ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" +SRCREV_meta ?= "ff60a2ddb31e54be0f8ac63a28247e58f9c8cd23" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -32,7 +32,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.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.99" +LINUX_VERSION ?= "5.10.101" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From 3148b11ba72ac483b26f4c4313cdf22712341c6f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 4 Mar 2022 20:25:13 -0500 Subject: [PATCH 079/108] linux-yocto/5.10: Fix ramoops/ftrace Integrating the following commit(s) to linux-yocto/5.10: 253c752ed120 pstore/ftrace: Add and use ftrace_test_recursion_trylock_safe 356e8a12bd66 pstore/ftrace: Add recursion protection to the ftrace callback 334706a1e873 ftrace: Add ftrace_test_recursion_trylock() helper function 78c260d7f60b ftrace: Move the recursion testing into global headers Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit b848a47033f492eaa0d5a02e42374b493734473e) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 4 ++-- .../linux/linux-yocto-tiny_5.10.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 22 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index dcb447a09cb..a3b2e2124e3 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "5c627c3d0740ef68beef456aaf7ef104315a8f7f" -SRCREV_meta ?= "ff60a2ddb31e54be0f8ac63a28247e58f9c8cd23" +SRCREV_machine ?= "b8dfdbe4d5a7b790bd2ecdb2889846e036469d25" +SRCREV_meta ?= "f323785b54712f92ad8cae06e2711a01d66d4fdf" 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.10;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 042023de33d..f9e061ab0a4 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "ce4e423e88244adab0deef2f9d021b2bf6d492ba" -SRCREV_machine ?= "cc09c000260f49e35e85a96853dd01404e6aa80a" -SRCREV_meta ?= "ff60a2ddb31e54be0f8ac63a28247e58f9c8cd23" +SRCREV_machine_qemuarm ?= "e6fb3720c9823cc706e8c6441cfd382b52bf7ae5" +SRCREV_machine ?= "57631093be11dd9606bbe8916b9f35bc9b6fe130" +SRCREV_meta ?= "f323785b54712f92ad8cae06e2711a01d66d4fdf" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 83daecc4cda..94c2cc9ceaf 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "54d10cbfb44b9449f3962d962c6ec0d2e31017e8" -SRCREV_machine_qemuarm64 ?= "1048394a0538b9b282c1f36f4de7e4ab814c90bf" -SRCREV_machine_qemumips ?= "0214a416a56f01fed65e4b7818470139dc2b1286" -SRCREV_machine_qemuppc ?= "b678c6d8d47e6e67aefa985fea85fe3026f2c809" -SRCREV_machine_qemuriscv64 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" -SRCREV_machine_qemuriscv32 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" -SRCREV_machine_qemux86 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" -SRCREV_machine_qemux86-64 ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" -SRCREV_machine_qemumips64 ?= "8d571427e05d1a8c7f7b0d32f291941429865ada" -SRCREV_machine ?= "bbec956b3ad71d142c590caf5a2c94cc34d224b6" -SRCREV_meta ?= "ff60a2ddb31e54be0f8ac63a28247e58f9c8cd23" +SRCREV_machine_qemuarm ?= "778c2d4c9a4798b90ed3b5609ccbc2fa8b785778" +SRCREV_machine_qemuarm64 ?= "6c6e9a984aa0a6bb2a11528c27023c588064422d" +SRCREV_machine_qemumips ?= "3bcde31e0d5e48a2fd21f7d6300a7b5d625e5760" +SRCREV_machine_qemuppc ?= "20fb5e330325ade20c8c3c2de7a64d9994298af6" +SRCREV_machine_qemuriscv64 ?= "253c752ed120276124a8463d996b30af0db6f547" +SRCREV_machine_qemuriscv32 ?= "253c752ed120276124a8463d996b30af0db6f547" +SRCREV_machine_qemux86 ?= "253c752ed120276124a8463d996b30af0db6f547" +SRCREV_machine_qemux86-64 ?= "253c752ed120276124a8463d996b30af0db6f547" +SRCREV_machine_qemumips64 ?= "89e951f3655bd59f7564bd09c106186833702f12" +SRCREV_machine ?= "253c752ed120276124a8463d996b30af0db6f547" +SRCREV_meta ?= "f323785b54712f92ad8cae06e2711a01d66d4fdf" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" From a16f2994e270ecb2844cb6b442d219a8c8e0b385 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 4 Mar 2022 20:25:16 -0500 Subject: [PATCH 080/108] linux-yocto/5.10: update to v5.10.103 Updating linux-yocto/5.10 to the latest korg -stable release that comprises the following commits: 915a747ac7f3 Linux 5.10.103 78706b051a8a memblock: use kfree() to release kmalloced memblock regions 4185b788d3ad gpio: tegra186: Fix chip_data type confusion bb2e0a77235a tty: n_gsm: fix deadlock in gsmtty_open() e4c8cb95d035 tty: n_gsm: fix wrong tty control line for flow control 1f0641dd0b6c tty: n_gsm: fix NULL pointer access due to DLCI release 1e35cb9e1271 tty: n_gsm: fix proper link termination after failed open 90b47e617fb2 tty: n_gsm: fix encoding of control signal octet bit DV 9e2dbc31e367 riscv: fix oops caused by irqsoff latency tracer e098933866f9 thermal: int340x: fix memory leak in int3400_notify() 5b1cef5798b4 RDMA/cma: Do not change route.addr.src_addr outside state checks 8fe4da55246a driver core: Free DMA range map when device is released 214824764308 xhci: Prevent futile URB re-submissions due to incorrect return value. 0b0a229da1f2 xhci: re-initialize the HC during resume if HCE was set 328faee6d409 usb: dwc3: gadget: Let the interrupt handler disable bottom halves. e57bdee8661e usb: dwc3: pci: Fix Bay Trail phy GPIO mappings 99b2425d9178 usb: dwc2: drd: fix soft connect when gadget is unconfigured c7866880377b USB: serial: option: add Telit LE910R1 compositions 220ba174f192 USB: serial: option: add support for DW5829e 3a1dd56e566f tracefs: Set the group ownership in apply_options() not parse_options() bfa8ffbaaaaf USB: gadget: validate endpoint index for xilinx udc 4ce247af3f30 usb: gadget: rndis: add spinlock for rndis response list ddc254fc8873 Revert "USB: serial: ch341: add new Product ID for CH341A" d3fce1b6bd95 ata: pata_hpt37x: disable primary channel on HPT371 18701d8afaa1 sc16is7xx: Fix for incorrect data being transmitted d5ddd7343adf iio: Fix error handling for PM eabcc609cb8a iio: imu: st_lsm6dsx: wait for settling time in st_lsm6dsx_read_oneshot b8d411a96227 iio: adc: ad7124: fix mask used for setting AIN_BUFP & AIN_BUFM bits 1aa12ecfdcba iio: adc: men_z188_adc: Fix a resource leak in an error handling path afbeee13beb5 tracing: Have traceon and traceoff trigger honor the instance 99eb8d694174 RDMA/ib_srp: Fix a deadlock a7ab53d3c27d configfs: fix a race in configfs_{,un}register_subsystem() 0ecd3e35d78e RDMA/rtrs-clt: Move free_permit from free_clt to rtrs_clt_close b0ecf9e59414 RDMA/rtrs-clt: Kill wait_for_inflight_permits 8260f1800f83 RDMA/rtrs-clt: Fix possible double free in error case dc64aa4c7dc0 regmap-irq: Update interrupt clear register for proper reset 2efece1368ae spi: spi-zynq-qspi: Fix a NULL pointer dereference in zynq_qspi_exec_mem_op() 67819b983eb3 net/mlx5e: kTLS, Use CHECKSUM_UNNECESSARY for device-offloaded packets be55d3e76c0e net/mlx5: Fix wrong limitation of metadata match on ecpf 8d617110d78e net/mlx5: Fix possible deadlock on rule deletion 1c5912895545 udp_tunnel: Fix end of loop test in udp_tunnel_nic_unregister() a184f4dd9b33 surface: surface3_power: Fix battery readings on batteries without a serial number 91f56a85278e net/smc: Use a mutex for locking "struct smc_pnettable" 7e9880e81d3f netfilter: nf_tables: fix memory leak during stateful obj update af4bc921d39d nfp: flower: Fix a potential leak in nfp_tunnel_add_shared_mac() 58a6d5f24f49 net: Force inlining of checksum functions in net/checksum.h 550d98ab3007 net: ll_temac: check the return value of devm_kmalloc() 0fc184735996 net/sched: act_ct: Fix flow table lookup after ct clear or switching zones bc8f768af342 net/mlx5e: Fix wrong return value on ioctl EEPROM query failure fd020eaaa24a drm/edid: Always set RGB444 1df9d552fe84 openvswitch: Fix setting ipv6 fields causing hw csum failure dac2490d9ee0 gso: do not skip outer ip header in case of ipip and net_failover b692d5dc6f54 tipc: Fix end of loop tests for list_for_each_entry() c5722243d0e5 net: __pskb_pull_tail() & pskb_carve_frag_list() drop_monitor friends 4a93c6594613 io_uring: add a schedule point in io_add_buffers() 7ef94bfb08fb bpf: Add schedule points in batch ops 4f5d47e6b43f selftests: bpf: Check bpf_msg_push_data return value d0caa7218d76 bpf: Do not try bpf_msg_push_data with len 0 962b2a3188bf hwmon: Handle failure to register sensor with thermal zone correctly d8b78314c5ba bnxt_en: Fix active FEC reporting to ethtool 7e1eae5d1a7c bnx2x: fix driver load from initrd 51e96061c66c perf data: Fix double free in perf_session__delete() 5419b5be883b ping: remove pr_err from ping_lookup 5da17865c7f3 optee: use driver internal tee_context for some rpc eb354613847d tee: export teedev_open() and teedev_close_context() bae7fc6f0dc6 x86/fpu: Correct pkru/xstate inconsistency 68f19845f580 netfilter: nf_tables_offload: incorrect flow offload action array size 69560efa0013 CDC-NCM: avoid overflow in sanity checking 2aeba1ea7ce8 USB: zaurus: support another broken Zaurus 4f5f5411f0c1 sr9700: sanity check for packet length 55eec5c630ea drm/i915: Correctly populate use_sagv_wm for all pipes ff9134882dfa drm/amdgpu: disable MMHUB PG for Picasso 72fdfc75d421 KVM: x86/mmu: make apf token non-zero to fix bug 646b532f32ea parisc/unaligned: Fix ldw() and stw() unalignment handlers 397b5433f742 parisc/unaligned: Fix fldd and fstd unaligned handlers on 32-bit kernel 698dc7d13c4e vhost/vsock: don't check owner in vhost_vsock_stop() while releasing 84e303b4d53f clk: jz4725b: fix mmc0 clock gating 72a5b01875b2 btrfs: tree-checker: check item_size for dev_item 5c967dd07311 btrfs: tree-checker: check item_size for inode_item fcec42dd28d6 cgroup/cpuset: Fix a race between cpuset_attach() and cpu hotplug 47667effb7d2 Linux 5.10.102 6062d1267ff3 lockdep: Correct lock_classes index mapping f333c1916fd6 i2c: brcmstb: fix support for DSL and CM variants 9fee985f9afa copy_process(): Move fd_install() out of sighand->siglock critical section e3fdbc40b750 i2c: qcom-cci: don't put a device tree node before i2c_add_adapter() b5b2a9211713 i2c: qcom-cci: don't delete an unregistered adapter 3b6d25d1b6a2 dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size 2c35c95d3640 dmaengine: stm32-dmamux: Fix PM disable depth imbalance in stm32_dmamux_probe 4f907b6eb701 dmaengine: sh: rcar-dmac: Check for error num after setting mask 797b380f0756 net: sched: limit TC_ACT_REPEAT loops 595c259f75ae EDAC: Fix calculation of returned address and next offset in edac_align_ptr() f6ce4e328939 scsi: lpfc: Fix pt2pt NVMe PRLI reject LOGO loop 3680b2b8104b kconfig: fix failing to generate auto.conf b6787e284d3d net: macb: Align the dma and coherent dma masks 439171a2917c net: usb: qmi_wwan: Add support for Dell DW5829e 15616ba17d02 tracing: Fix tp_printk option related with tp_printk_stop_on_boot 5a253a23d9f1 drm/rockchip: dw_hdmi: Do not leave clock enabled in error case 1e7433fb95cc xprtrdma: fix pointer derefs in error cases of rpcrdma_ep_create a21f472fb5cc soc: aspeed: lpc-ctrl: Block error printing on probe defer cases fecb05b1ce6b ata: libata-core: Disable TRIM on M88V29 b19ec7afa929 lib/iov_iter: initialize "flags" in new pipe_buffer 30455322787a kconfig: let 'shell' return enough output for deep path names e05dde47f52a selftests: fixup build warnings in pidfd / clone3 tests 531a56c2e0bf pidfd: fix test failure due to stack overflow on some arches 429ef36c4fc4 arm64: dts: meson-g12: drop BL32 region from SEI510/SEI610 1415f22ee541 arm64: dts: meson-g12: add ATF BL32 reserved-memory region 605080f19eb7 arm64: dts: meson-gx: add ATF BL32 reserved-memory region eefb68794f94 netfilter: conntrack: don't refresh sctp entries in closed state 1ab48248573b irqchip/sifive-plic: Add missing thead,c900-plic match string 98bc06c46d1f phy: usb: Leave some clocks running during suspend 717f2fa85822 ARM: OMAP2+: adjust the location of put_device() call in omapdss_init_of 6932353af74c ARM: OMAP2+: hwmod: Add of_node_put() before break 521dcc107e39 NFS: Don't set NFS_INO_INVALID_XATTR if there is no xattr cache fb00319afb72 KVM: x86/pmu: Use AMD64_RAW_EVENT_MASK for PERF_TYPE_RAW 0ee4bb8ce8b8 KVM: x86/pmu: Don't truncate the PerfEvtSeln MSR when creating a perf event 99cd2a043760 KVM: x86/pmu: Refactoring find_arch_event() to pmc_perf_hw_id() 91d8866ca552 Drivers: hv: vmbus: Fix memory leak in vmbus_add_channel_kobj a176d559e826 mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status 1a49b1b0b0cb mtd: rawnand: qcom: Fix clock sequencing in qcom_nandc_probe() 8c848744c11b tty: n_tty: do not look ahead for EOL character past the end of the buffer 8daa0436ce79 NFS: Do not report writeback errors in nfs_getattr() f9b7385c0f62 NFS: LOOKUP_DIRECTORY is also ok with symlinks 598dbaf74b64 block/wbt: fix negative inflight counter when remove scsi device dc6faa0ede4d ASoC: tas2770: Insert post reset delay 9dcedbe943be KVM: SVM: Never reject emulation due to SMAP errata for !SEV guests a4eeeaca5019 mtd: rawnand: gpmi: don't leak PM reference in error path fb26219b4046 powerpc/lib/sstep: fix 'ptesync' build error 54f76366cd01 ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_range() 0df1badfdfcd ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw() 1ef76832fef3 ALSA: hda: Fix missing codec probe on Shenker Dock 15 c72c3b597a79 ALSA: hda: Fix regression on forced probe mask option 63b1602c2fd5 ALSA: hda/realtek: Fix deadlock by COEF mutex b6a5e8f45f89 ALSA: hda/realtek: Add quirk for Legion Y9000X 2019 67de71b94331 selftests/exec: Add non-regular to TEST_GEN_PROGS d3018a196221 perf bpf: Defer freeing string after possible strlen() on it 016e3ca9c588 dpaa2-eth: Initialize mutex used in one step timestamping path 50f3b00d4c7b libsubcmd: Fix use-after-free for realloc(..., 0) ffa8df4f0e8f bonding: fix data-races around agg_select_timer d9bd9d4c60c3 net_sched: add __rcu annotation to netdev->qdisc 877a05672f95 drop_monitor: fix data-race in dropmon_net_event / trace_napi_poll_hit a0e004e6206e bonding: force carrier update when releasing slave 8dec3c4e7350 ping: fix the dif and sdif check in ping_lookup 6793a9b028ce net: ieee802154: ca8210: Fix lifs/sifs periods f48bd3413771 net: dsa: lantiq_gswip: fix use after free in gswip_remove() d9b2203e5a30 net: dsa: lan9303: fix reset on probe 4f523f15e5d7 ipv6: per-netns exclusive flowlabel checks 100344200a0c netfilter: nft_synproxy: unregister hooks on init error path 26931971db5f selftests: netfilter: fix exit value for nft_concat_range b26ea3f6b7b0 iwlwifi: pcie: gen2: fix locking when "HW not ready" 8867f993790d iwlwifi: pcie: fix locking when "HW not ready" f3c1910257c8 drm/i915/gvt: Make DRM_I915_GVT depend on X86 87cd1bbd6677 vsock: remove vsock from connected table when connect is interrupted by a signal eb7bf11e8ef1 drm/i915/opregion: check port number bounds for SWSCI display power state 5564d83ebc1b drm/radeon: Fix backlight control on iMac 12,1 008508c16af0 iwlwifi: fix use-after-free 44b81136e868 kbuild: lto: Merge module sections if and only if CONFIG_LTO_CLANG is enabled 8b53e5f737bc kbuild: lto: merge module sections 45102b538a9e random: wake up /dev/random writers after zap 143aaf79bafa gcc-plugins/stackleak: Use noinstr in favor of notrace de55891e162c Revert "module, async: async_synchronize_full() on module init iff async is used" 3c958dbcba18 x86/Xen: streamline (and fix) PV CPU enumeration e76d0a9692c5 drm/amdgpu: fix logic inversion in check 324f5bdc52ec nvme-rdma: fix possible use-after-free in transport error_recovery work e192184cf8bc nvme-tcp: fix possible use-after-free in transport error_recovery work 0ead57ceb21b nvme: fix a possible use-after-free in controller reset during load fe9ac3eaa2e3 scsi: pm8001: Fix use-after-free for aborted SSP/STP sas_task d872e7b5fe38 scsi: pm8001: Fix use-after-free for aborted TMF sas_task 1e73f5cfc160 quota: make dquot_quota_sync return errors from ->sync_fs c405640aad56 vfs: make freeze_super abort when sync_filesystem returns error b9a229fd48bf ax25: improve the incomplete fix to avoid UAF and NPD bugs 139fce2992ee selftests: skip mincore.check_file_mmap when fs lacks needed support 204a2390da42 selftests: openat2: Skip testcases that fail with EOPNOTSUPP 2be48bfac713 selftests: openat2: Add missing dependency in Makefile 74a30666b4b5 selftests: openat2: Print also errno in failure messages bfc84cfd909b selftests/zram: Adapt the situation that /dev/zram0 is being used f0eba714c11d selftests/zram01.sh: Fix compression ratio calculation 7bb704b69fb1 selftests/zram: Skip max_comp_streams interface on newer kernel 0fd484644c68 net: ieee802154: at86rf230: Stop leaking skb's 0c18a751930c kselftest: signal all child processes 1136141f19ab selftests: rtc: Increase test timeout so that all tests run 79175b6ee658 platform/x86: ISST: Fix possible circular locking dependency detected 066c905ed06c platform/x86: touchscreen_dmi: Add info for the RWC NANOTE P8 AY07J 2-in-1 0b17d4b51c63 btrfs: send: in case of IO error log it 78a68bbebdcc parisc: Add ioread64_lo_hi() and iowrite64_lo_hi() ade1077c7fc0 PCI: hv: Fix NUMA node assignment when kernel boots with custom NUMA topology 254090925e16 mm: don't try to NUMA-migrate COW pages that have other uses ab2b4e65a130 mmc: block: fix read single on recovery logic 775671687299 parisc: Fix sglist access in ccio-dma.c f8f519d7df66 parisc: Fix data TLB miss in sba_unmap_sg 4d569b959e54 parisc: Drop __init from map_pages declaration 8e3f9a098eca serial: parisc: GSC: fix build when IOSAPIC is not set fe383750d40d Revert "svm: Add warning message for AVIC IPI invalid target" 126382b5565f HID:Add support for UGTABLET WP5540 f100e758cef5 scsi: lpfc: Fix mailbox command failure during driver initialization 4578b979ef61 can: isotp: add SF_BROADCAST support for functional addressing 5d42865fc311 can: isotp: prevent race between isotp_bind() and isotp_setsockopt() db3f3636e4ae fs/proc: task_mmu.c: don't read mapcount for migration entry 0849f83e4782 fget: clarify and improve __fget_files() implementation 657991fb06a4 rcu: Do not report strict GPs for outgoing CPUs 8c8385972ea9 mm: memcg: synchronize objcg lists with a dedicated spinlock d0f4aa2d978f drm/nouveau/pmu/gm200-: use alternate falcon reset sequence Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 1e234210aa40655d14cf6c5b12cd5d39b460b1e9) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 6 ++--- .../linux/linux-yocto-tiny_5.10.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index a3b2e2124e3..8b10988438f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "b8dfdbe4d5a7b790bd2ecdb2889846e036469d25" -SRCREV_meta ?= "f323785b54712f92ad8cae06e2711a01d66d4fdf" +SRCREV_machine ?= "abd24ddc62072fcc5ecf12cf8feadd2e6fda59bd" +SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" 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.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.101" +LINUX_VERSION ?= "5.10.103" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index f9e061ab0a4..8564b5becf6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.101" +LINUX_VERSION ?= "5.10.103" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 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 ?= "e6fb3720c9823cc706e8c6441cfd382b52bf7ae5" -SRCREV_machine ?= "57631093be11dd9606bbe8916b9f35bc9b6fe130" -SRCREV_meta ?= "f323785b54712f92ad8cae06e2711a01d66d4fdf" +SRCREV_machine_qemuarm ?= "682b9a24accb1e3a305957dec28f7f565db95369" +SRCREV_machine ?= "5e844e753c3e1f153af9dfee6b88e5dc1e57f30f" +SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 94c2cc9ceaf..2e12654feca 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "778c2d4c9a4798b90ed3b5609ccbc2fa8b785778" -SRCREV_machine_qemuarm64 ?= "6c6e9a984aa0a6bb2a11528c27023c588064422d" -SRCREV_machine_qemumips ?= "3bcde31e0d5e48a2fd21f7d6300a7b5d625e5760" -SRCREV_machine_qemuppc ?= "20fb5e330325ade20c8c3c2de7a64d9994298af6" -SRCREV_machine_qemuriscv64 ?= "253c752ed120276124a8463d996b30af0db6f547" -SRCREV_machine_qemuriscv32 ?= "253c752ed120276124a8463d996b30af0db6f547" -SRCREV_machine_qemux86 ?= "253c752ed120276124a8463d996b30af0db6f547" -SRCREV_machine_qemux86-64 ?= "253c752ed120276124a8463d996b30af0db6f547" -SRCREV_machine_qemumips64 ?= "89e951f3655bd59f7564bd09c106186833702f12" -SRCREV_machine ?= "253c752ed120276124a8463d996b30af0db6f547" -SRCREV_meta ?= "f323785b54712f92ad8cae06e2711a01d66d4fdf" +SRCREV_machine_qemuarm ?= "56cfcfb12870782355bacaf8bcde9e268f422140" +SRCREV_machine_qemuarm64 ?= "3aab5bb12bc180d582a6f82e4a085f45a7b0c283" +SRCREV_machine_qemumips ?= "d76ec4c19a876a3235567ab2cee2e33f2875f79a" +SRCREV_machine_qemuppc ?= "513a8885de593e8b1f3c24595c015bb9b1d55563" +SRCREV_machine_qemuriscv64 ?= "de1b3b1aef1a5c3dec0676e152f6801e1cc309e5" +SRCREV_machine_qemuriscv32 ?= "de1b3b1aef1a5c3dec0676e152f6801e1cc309e5" +SRCREV_machine_qemux86 ?= "de1b3b1aef1a5c3dec0676e152f6801e1cc309e5" +SRCREV_machine_qemux86-64 ?= "de1b3b1aef1a5c3dec0676e152f6801e1cc309e5" +SRCREV_machine_qemumips64 ?= "b63b87635569c07343f25194abf008f1e27c0bca" +SRCREV_machine ?= "de1b3b1aef1a5c3dec0676e152f6801e1cc309e5" +SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -32,7 +32,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.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.101" +LINUX_VERSION ?= "5.10.103" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From d0b1807edc10835beff9a55a105ac191b6ac2fe7 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 24 May 2021 11:43:41 +0800 Subject: [PATCH 081/108] unfs3: correct configure option On some new distro like ubuntu21.04, unfs3-native compile failed with error: undefined reference to `xdr_uint32', since new distro has new glibc. >From glibc 2.27 rpc support is dropped, so unfs3 need to link to libtirpc. Here is defination of ac_link: ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' Depended library should be added into LIBS, not LDFLAGS, otherwise, gcc may not load the lib since it is before conftest.$ac_ext during configure. Finally, it results in compile failed. Signed-off-by: Changqing Li Signed-off-by: Richard Purdie (cherry picked from commit 27867862c1fee6c0e649286500fa1ab015d57faf) Signed-off-by: Anuj Mittal --- meta/recipes-devtools/unfs3/unfs3_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/unfs3/unfs3_git.bb b/meta/recipes-devtools/unfs3/unfs3_git.bb index bcaa4e2822e..06148005cf1 100644 --- a/meta/recipes-devtools/unfs3/unfs3_git.bb +++ b/meta/recipes-devtools/unfs3/unfs3_git.bb @@ -37,7 +37,7 @@ BBCLASSEXTEND = "native nativesdk" inherit autotools EXTRA_OECONF_append_class-native = " --sbindir=${bindir}" CFLAGS_append = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append = " -ltirpc" +EXTRA_OECONF_append = " LIBS=-ltirpc" # Turn off these header detects else the inode search # will walk entire file systems and this is a real problem From 29d86bcad4fc43e09d7499c3f6fba8c499170b9b Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Mon, 7 Mar 2022 11:30:26 +0100 Subject: [PATCH 082/108] patch.py: Prevent git repo reinitialization There were few bugs in the _isInitialized() function which might trigger git repo to be reinitialized and patches failing to apply. Signed-off-by: Pavel Zhukov Signed-off-by: Richard Purdie Signed-off-by: Anuj Mittal --- .../recipes-test/gitrepotest/gitrepotest.bb | 16 ++++++++++++++++ .../gitrepotest/0001-testpatch.patch | 9 +++++++++ meta/lib/oe/patch.py | 11 ++++++++--- meta/lib/oeqa/selftest/cases/bbtests.py | 18 ++++++++++++++++-- 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 meta-selftest/recipes-test/gitrepotest/gitrepotest.bb create mode 100644 meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch diff --git a/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb b/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb new file mode 100644 index 00000000000..f1b6c55833b --- /dev/null +++ b/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb @@ -0,0 +1,16 @@ +SUMMARY = "Test recipe for git repo initialization" +HOMEPAGE = "https://git.yoctoproject.org/git/matchbox-panel-2" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +INHIBIT_DEFAULT_DEPS = "1" + +PATCHTOOL="git" + +SRC_URI = "git://git.yoctoproject.org/git/matchbox-panel-2;branch=master;protocol=https \ + file://0001-testpatch.patch \ + " + +SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" + +S = "${WORKDIR}/git" diff --git a/meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch b/meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch new file mode 100644 index 00000000000..bccda17ee9c --- /dev/null +++ b/meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch @@ -0,0 +1,9 @@ +diff --git a/Makefile.am b/Makefile.am +index 432a9b4..bbf7c74 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,3 +1,4 @@ ++## This is useless comment to test if patch works + ACLOCAL_AMFLAGS = -I m4 + + SUBDIRS = matchbox-panel applets data po diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 950fe723dcf..9034fcae034 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -304,14 +304,19 @@ def __init__(self, dir, d): def _isInitialized(self): cmd = "git rev-parse --show-toplevel" - (status, output) = subprocess.getstatusoutput(cmd.split()) + try: + output = runcmd(cmd.split(), self.dir).strip() + except CmdError as err: + ## runcmd returned non-zero which most likely means 128 + ## Not a git directory + return False ## Make sure repo is in builddir to not break top-level git repos - return status == 0 and os.path.samedir(output, self.dir) + return os.path.samefile(output, self.dir) def _initRepo(self): runcmd("git init".split(), self.dir) runcmd("git add .".split(), self.dir) - runcmd("git commit -a --allow-empty -m Patching_started".split(), self.dir) + runcmd("git commit -a --allow-empty -m bitbake_patching_started".split(), self.dir) @staticmethod def extractPatchHeader(patchfile): diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py index 0a618bb9a6c..4187cb840a3 100644 --- a/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/meta/lib/oeqa/selftest/cases/bbtests.py @@ -310,8 +310,22 @@ def test_git_patchtool(self): src = get_bb_var("SRC_URI",test_recipe) gitscm = re.search("git://", src) self.assertFalse(gitscm, "test_git_patchtool pre-condition failed: {} test recipe contains git repo!".format(test_recipe)) - result = bitbake('man-db -c patch', ignore_status=False) + result = bitbake('{} -c patch'.format(test_recipe), ignore_status=False) fatal = re.search("fatal: not a git repository (or any of the parent directories)", result.output) self.assertFalse(fatal, "Failed to patch using PATCHTOOL=\"git\"") self.delete_recipeinc(test_recipe) - bitbake('-cclean man-db') + bitbake('-cclean {}'.format(test_recipe)) + + def test_git_patchtool2(self): + """ Test if PATCHTOOL=git works with git repo and doesn't reinitialize it + """ + test_recipe = "gitrepotest" + src = get_bb_var("SRC_URI",test_recipe) + gitscm = re.search("git://", src) + self.assertTrue(gitscm, "test_git_patchtool pre-condition failed: {} test recipe doesn't contains git repo!".format(test_recipe)) + result = bitbake('{} -c patch'.format(test_recipe), ignore_status=False) + srcdir = get_bb_var('S', test_recipe) + result = runCmd("git log", cwd = srcdir) + self.assertFalse("bitbake_patching_started" in result.output, msg = "Repository has been reinitialized. {}".format(srcdir)) + self.delete_recipeinc(test_recipe) + bitbake('-cclean {}'.format(test_recipe)) From 60dd7d2deeda838346f30b6f8de28dfac7efac0d Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Fri, 11 Mar 2022 21:58:34 +0800 Subject: [PATCH 083/108] expat: fix CVE-2022-25235 Backport patch to fix CVE-2022-25235 for expat. CVE: CVE-2022-25235 Signed-off-by: Kai Kang Signed-off-by: Anuj Mittal --- .../expat/expat/CVE-2022-25235.patch | 261 ++++++++++++++++++ meta/recipes-core/expat/expat_2.2.10.bb | 1 + 2 files changed, 262 insertions(+) create mode 100644 meta/recipes-core/expat/expat/CVE-2022-25235.patch diff --git a/meta/recipes-core/expat/expat/CVE-2022-25235.patch b/meta/recipes-core/expat/expat/CVE-2022-25235.patch new file mode 100644 index 00000000000..9febeae6096 --- /dev/null +++ b/meta/recipes-core/expat/expat/CVE-2022-25235.patch @@ -0,0 +1,261 @@ +Upstream-Status: Backport [https://github.com/libexpat/libexpat/commit/306b721] +CVE: CVE-2022-25235 + +The commit is a merge commit, and this patch is created by: + +$ git show -m -p --stat 306b72134f157bbfd1637b20a22cabf4acfa136a + +Remove modification for expat/Changes which fails to be applied. + +Signed-off-by: Kai Kang + +commit 306b72134f157bbfd1637b20a22cabf4acfa136a (from 2cc97e875ef84da4bcf55156c83599116f7523b4) +Merge: 2cc97e87 c16300f0 +Author: Sebastian Pipping +Date: Fri Feb 18 20:12:32 2022 +0100 + + Merge pull request #562 from libexpat/utf8-security + + [CVE-2022-25235] lib: Protect against malformed encoding (e.g. malformed UTF-8) +--- + expat/Changes | 7 ++++ + expat/lib/xmltok.c | 5 --- + expat/lib/xmltok_impl.c | 18 ++++---- + expat/tests/runtests.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 127 insertions(+), 12 deletions(-) + +diff --git a/lib/xmltok.c b/lib/xmltok.c +index a72200e8..3bddf125 100644 +--- a/lib/xmltok.c ++++ b/lib/xmltok.c +@@ -98,11 +98,6 @@ + + ((((byte)[1]) & 3) << 1) + ((((byte)[2]) >> 5) & 1)] \ + & (1u << (((byte)[2]) & 0x1F))) + +-#define UTF8_GET_NAMING(pages, p, n) \ +- ((n) == 2 \ +- ? UTF8_GET_NAMING2(pages, (const unsigned char *)(p)) \ +- : ((n) == 3 ? UTF8_GET_NAMING3(pages, (const unsigned char *)(p)) : 0)) +- + /* Detection of invalid UTF-8 sequences is based on Table 3.1B + of Unicode 3.2: http://www.unicode.org/unicode/reports/tr28/ + with the additional restriction of not allowing the Unicode +diff --git a/lib/xmltok_impl.c b/lib/xmltok_impl.c +index 0430591b..84ff35f9 100644 +--- a/lib/xmltok_impl.c ++++ b/lib/xmltok_impl.c +@@ -69,7 +69,7 @@ + case BT_LEAD##n: \ + if (end - ptr < n) \ + return XML_TOK_PARTIAL_CHAR; \ +- if (! IS_NAME_CHAR(enc, ptr, n)) { \ ++ if (IS_INVALID_CHAR(enc, ptr, n) || ! IS_NAME_CHAR(enc, ptr, n)) { \ + *nextTokPtr = ptr; \ + return XML_TOK_INVALID; \ + } \ +@@ -98,7 +98,7 @@ + case BT_LEAD##n: \ + if (end - ptr < n) \ + return XML_TOK_PARTIAL_CHAR; \ +- if (! IS_NMSTRT_CHAR(enc, ptr, n)) { \ ++ if (IS_INVALID_CHAR(enc, ptr, n) || ! IS_NMSTRT_CHAR(enc, ptr, n)) { \ + *nextTokPtr = ptr; \ + return XML_TOK_INVALID; \ + } \ +@@ -1142,6 +1142,10 @@ PREFIX(prologTok)(const ENCODING *enc, const char *ptr, const char *end, + case BT_LEAD##n: \ + if (end - ptr < n) \ + return XML_TOK_PARTIAL_CHAR; \ ++ if (IS_INVALID_CHAR(enc, ptr, n)) { \ ++ *nextTokPtr = ptr; \ ++ return XML_TOK_INVALID; \ ++ } \ + if (IS_NMSTRT_CHAR(enc, ptr, n)) { \ + ptr += n; \ + tok = XML_TOK_NAME; \ +@@ -1270,7 +1274,7 @@ PREFIX(attributeValueTok)(const ENCODING *enc, const char *ptr, const char *end, + switch (BYTE_TYPE(enc, ptr)) { + # define LEAD_CASE(n) \ + case BT_LEAD##n: \ +- ptr += n; \ ++ ptr += n; /* NOTE: The encoding has already been validated. */ \ + break; + LEAD_CASE(2) + LEAD_CASE(3) +@@ -1339,7 +1343,7 @@ PREFIX(entityValueTok)(const ENCODING *enc, const char *ptr, const char *end, + switch (BYTE_TYPE(enc, ptr)) { + # define LEAD_CASE(n) \ + case BT_LEAD##n: \ +- ptr += n; \ ++ ptr += n; /* NOTE: The encoding has already been validated. */ \ + break; + LEAD_CASE(2) + LEAD_CASE(3) +@@ -1518,7 +1522,7 @@ PREFIX(getAtts)(const ENCODING *enc, const char *ptr, int attsMax, + state = inName; \ + } + # define LEAD_CASE(n) \ +- case BT_LEAD##n: \ ++ case BT_LEAD##n: /* NOTE: The encoding has already been validated. */ \ + START_NAME ptr += (n - MINBPC(enc)); \ + break; + LEAD_CASE(2) +@@ -1730,7 +1734,7 @@ PREFIX(nameLength)(const ENCODING *enc, const char *ptr) { + switch (BYTE_TYPE(enc, ptr)) { + # define LEAD_CASE(n) \ + case BT_LEAD##n: \ +- ptr += n; \ ++ ptr += n; /* NOTE: The encoding has already been validated. */ \ + break; + LEAD_CASE(2) + LEAD_CASE(3) +@@ -1775,7 +1779,7 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *ptr, const char *end, + switch (BYTE_TYPE(enc, ptr)) { + # define LEAD_CASE(n) \ + case BT_LEAD##n: \ +- ptr += n; \ ++ ptr += n; /* NOTE: The encoding has already been validated. */ \ + pos->columnNumber++; \ + break; + LEAD_CASE(2) +diff --git a/tests/runtests.c b/tests/runtests.c +index bc5344b1..9b155b82 100644 +--- a/tests/runtests.c ++++ b/tests/runtests.c +@@ -5998,6 +5998,105 @@ START_TEST(test_utf8_in_cdata_section_2) { + } + END_TEST + ++START_TEST(test_utf8_in_start_tags) { ++ struct test_case { ++ bool goodName; ++ bool goodNameStart; ++ const char *tagName; ++ }; ++ ++ // The idea with the tests below is this: ++ // We want to cover 1-, 2- and 3-byte sequences, 4-byte sequences ++ // go to isNever and are hence not a concern. ++ // ++ // We start with a character that is a valid name character ++ // (or even name-start character, see XML 1.0r4 spec) and then we flip ++ // single bits at places where (1) the result leaves the UTF-8 encoding space ++ // and (2) we stay in the same n-byte sequence family. ++ // ++ // The flipped bits are highlighted in angle brackets in comments, ++ // e.g. "[<1>011 1001]" means we had [0011 1001] but we now flipped ++ // the most significant bit to 1 to leave UTF-8 encoding space. ++ struct test_case cases[] = { ++ // 1-byte UTF-8: [0xxx xxxx] ++ {true, true, "\x3A"}, // [0011 1010] = ASCII colon ':' ++ {false, false, "\xBA"}, // [<1>011 1010] ++ {true, false, "\x39"}, // [0011 1001] = ASCII nine '9' ++ {false, false, "\xB9"}, // [<1>011 1001] ++ ++ // 2-byte UTF-8: [110x xxxx] [10xx xxxx] ++ {true, true, "\xDB\xA5"}, // [1101 1011] [1010 0101] = ++ // Arabic small waw U+06E5 ++ {false, false, "\x9B\xA5"}, // [1<0>01 1011] [1010 0101] ++ {false, false, "\xDB\x25"}, // [1101 1011] [<0>010 0101] ++ {false, false, "\xDB\xE5"}, // [1101 1011] [1<1>10 0101] ++ {true, false, "\xCC\x81"}, // [1100 1100] [1000 0001] = ++ // combining char U+0301 ++ {false, false, "\x8C\x81"}, // [1<0>00 1100] [1000 0001] ++ {false, false, "\xCC\x01"}, // [1100 1100] [<0>000 0001] ++ {false, false, "\xCC\xC1"}, // [1100 1100] [1<1>00 0001] ++ ++ // 3-byte UTF-8: [1110 xxxx] [10xx xxxx] [10xxxxxx] ++ {true, true, "\xE0\xA4\x85"}, // [1110 0000] [1010 0100] [1000 0101] = ++ // Devanagari Letter A U+0905 ++ {false, false, "\xA0\xA4\x85"}, // [1<0>10 0000] [1010 0100] [1000 0101] ++ {false, false, "\xE0\x24\x85"}, // [1110 0000] [<0>010 0100] [1000 0101] ++ {false, false, "\xE0\xE4\x85"}, // [1110 0000] [1<1>10 0100] [1000 0101] ++ {false, false, "\xE0\xA4\x05"}, // [1110 0000] [1010 0100] [<0>000 0101] ++ {false, false, "\xE0\xA4\xC5"}, // [1110 0000] [1010 0100] [1<1>00 0101] ++ {true, false, "\xE0\xA4\x81"}, // [1110 0000] [1010 0100] [1000 0001] = ++ // combining char U+0901 ++ {false, false, "\xA0\xA4\x81"}, // [1<0>10 0000] [1010 0100] [1000 0001] ++ {false, false, "\xE0\x24\x81"}, // [1110 0000] [<0>010 0100] [1000 0001] ++ {false, false, "\xE0\xE4\x81"}, // [1110 0000] [1<1>10 0100] [1000 0001] ++ {false, false, "\xE0\xA4\x01"}, // [1110 0000] [1010 0100] [<0>000 0001] ++ {false, false, "\xE0\xA4\xC1"}, // [1110 0000] [1010 0100] [1<1>00 0001] ++ }; ++ const bool atNameStart[] = {true, false}; ++ ++ size_t i = 0; ++ char doc[1024]; ++ size_t failCount = 0; ++ ++ for (; i < sizeof(cases) / sizeof(cases[0]); i++) { ++ size_t j = 0; ++ for (; j < sizeof(atNameStart) / sizeof(atNameStart[0]); j++) { ++ const bool expectedSuccess ++ = atNameStart[j] ? cases[i].goodNameStart : cases[i].goodName; ++ sprintf(doc, "<%s%s> WARN_ON_ONCE to prevent console saturation 97c963889222 sched/isolation: really align nohz_full with rcu_nocbs Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni (cherry picked from commit 11de5ad0cfee5bf8bcdd28da6b27447280add2cf) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 2 +- .../linux/linux-yocto-tiny_5.10.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 20 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 8b10988438f..4d75cf1b211 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "abd24ddc62072fcc5ecf12cf8feadd2e6fda59bd" +SRCREV_machine ?= "e0d87d9831a6e0df20a370adc9aba0d032d91661" SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 8564b5becf6..8227d5d8cc4 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "682b9a24accb1e3a305957dec28f7f565db95369" -SRCREV_machine ?= "5e844e753c3e1f153af9dfee6b88e5dc1e57f30f" +SRCREV_machine_qemuarm ?= "38f8b1b5b87959e6cb9367151e233d27befe015d" +SRCREV_machine ?= "cc70f051e56005acda2e6ea994cadfb2538e66f6" SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 2e12654feca..5a4939cf363 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,16 +13,16 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "56cfcfb12870782355bacaf8bcde9e268f422140" -SRCREV_machine_qemuarm64 ?= "3aab5bb12bc180d582a6f82e4a085f45a7b0c283" -SRCREV_machine_qemumips ?= "d76ec4c19a876a3235567ab2cee2e33f2875f79a" -SRCREV_machine_qemuppc ?= "513a8885de593e8b1f3c24595c015bb9b1d55563" -SRCREV_machine_qemuriscv64 ?= "de1b3b1aef1a5c3dec0676e152f6801e1cc309e5" -SRCREV_machine_qemuriscv32 ?= "de1b3b1aef1a5c3dec0676e152f6801e1cc309e5" -SRCREV_machine_qemux86 ?= "de1b3b1aef1a5c3dec0676e152f6801e1cc309e5" -SRCREV_machine_qemux86-64 ?= "de1b3b1aef1a5c3dec0676e152f6801e1cc309e5" -SRCREV_machine_qemumips64 ?= "b63b87635569c07343f25194abf008f1e27c0bca" -SRCREV_machine ?= "de1b3b1aef1a5c3dec0676e152f6801e1cc309e5" +SRCREV_machine_qemuarm ?= "74469c4b03f62e4b4da066e52785ed74b1d121ae" +SRCREV_machine_qemuarm64 ?= "69f185342f516efa8a9233e31d2c3f8356b3a388" +SRCREV_machine_qemumips ?= "d97607700b2fba19af10b2110b99c448ed9a88e9" +SRCREV_machine_qemuppc ?= "090085d4bb6181c3b972d82c9f8f7ed88c90ad6b" +SRCREV_machine_qemuriscv64 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" +SRCREV_machine_qemuriscv32 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" +SRCREV_machine_qemux86 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" +SRCREV_machine_qemux86-64 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" +SRCREV_machine_qemumips64 ?= "a1b43f69bce61143dd4d6d637f619eadd3fabb6e" +SRCREV_machine ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" # remap qemuarm to qemuarma15 for the 5.8 kernel From c8bfdc0ac6a5bb26adb59949be5cd0f00a67cb79 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 22 Mar 2022 13:19:51 -0400 Subject: [PATCH 099/108] linux-yocto/5.10: split vtpm for more granular inclusion Integrating the following commit(s) to linux-yocto/.: 6ca1d510a03 features/tpm: split into tpm-1.2, tpm-2.0, tpm-2.0-crb and vtpm feature Signed-off-by: Stefan Herbrechtsmeier Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni (cherry picked from commit b61be908468b1057a9d2baf40c1ebfbbd74732b8) Signed-off-by: Anuj Mittal --- meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 4d75cf1b211..a35e80940e5 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "e0d87d9831a6e0df20a370adc9aba0d032d91661" -SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" +SRCREV_meta ?= "b814c7ebf2a92fc361bcbeaf6efdd40b8cd0816a" 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.10;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 8227d5d8cc4..45cfd90e0a5 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "38f8b1b5b87959e6cb9367151e233d27befe015d" SRCREV_machine ?= "cc70f051e56005acda2e6ea994cadfb2538e66f6" -SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" +SRCREV_meta ?= "b814c7ebf2a92fc361bcbeaf6efdd40b8cd0816a" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 5a4939cf363..fdc985af13c 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -23,7 +23,7 @@ SRCREV_machine_qemux86 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" SRCREV_machine_qemux86-64 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" SRCREV_machine_qemumips64 ?= "a1b43f69bce61143dd4d6d637f619eadd3fabb6e" SRCREV_machine ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" -SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" +SRCREV_meta ?= "b814c7ebf2a92fc361bcbeaf6efdd40b8cd0816a" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" From 547e7837d0938f417f8264c716c6d6449c43514a Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 22 Mar 2022 13:19:53 -0400 Subject: [PATCH 100/108] linux-yocto/5.10: cfg/debug: add configs for kcsan Integrating the following commit(s) to linux-yocto/.: b56db30a7c5 cfg/debug: add scc for syzkaller fuzzing c4494ad7f23 features/tun: add configs for Universal TUN/TAP device driver support 148948c3829 features/bluetooth: add configs for Bluetooth Virtual HCI device driver 824a7ba4dda features/usb: add configs for USB raw gadget 0bd038864a5 features/usb: add configs for dummy HCD e8c765f559f features/ieee802154: add configs for mac802154 hwsim 99aea8bc07b features/mac80211: add configs for mac80211 hwsim c7bf42227e3 cfg/debug: add configs for fault injection debugfs ae48b977f61 cfg/debug: add configs for kcsan Signed-off-by: Ovidiu Panait Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni (cherry picked from commit 88a761c98d3a4dbf5a8b2b623248b53077717662) Signed-off-by: Anuj Mittal --- meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index a35e80940e5..804773b0ec8 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "e0d87d9831a6e0df20a370adc9aba0d032d91661" -SRCREV_meta ?= "b814c7ebf2a92fc361bcbeaf6efdd40b8cd0816a" +SRCREV_meta ?= "b56db30a7c5a0d86ccc853ee68be925086318f88" 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.10;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 45cfd90e0a5..3b1741322d2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "38f8b1b5b87959e6cb9367151e233d27befe015d" SRCREV_machine ?= "cc70f051e56005acda2e6ea994cadfb2538e66f6" -SRCREV_meta ?= "b814c7ebf2a92fc361bcbeaf6efdd40b8cd0816a" +SRCREV_meta ?= "b56db30a7c5a0d86ccc853ee68be925086318f88" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index fdc985af13c..2b30a92b961 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -23,7 +23,7 @@ SRCREV_machine_qemux86 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" SRCREV_machine_qemux86-64 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" SRCREV_machine_qemumips64 ?= "a1b43f69bce61143dd4d6d637f619eadd3fabb6e" SRCREV_machine ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" -SRCREV_meta ?= "b814c7ebf2a92fc361bcbeaf6efdd40b8cd0816a" +SRCREV_meta ?= "b56db30a7c5a0d86ccc853ee68be925086318f88" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" From 9e677a84af0af55157b6689ca7be44dee35f0f91 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 22 Mar 2022 13:19:57 -0400 Subject: [PATCH 101/108] linux-yocto-rt/5.10: update to -rt61 Integrating the following commit(s) to linux-yocto-rt/5.10: 48b12b48c110 Linux 5.10.90-rt61 2367f287812f aio: Fix incorrect usage of eventfd_signal_allowed() 640f56f85c08 stop_machine: Remove this_cpu_ptr() from print_stop_info(). 38c47ed56da8 eventfd: Make signal recursion protection a task bit 45f3f3c787e3 Linux 5.10.90-rt60 257f82607c82 Linux 5.10.87-rt59 7ff031bb6566 Linux 5.10.83-rt58 03cfb1aadc5e Linux 5.10.80-rt57 Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni (cherry picked from commit a201b82e999d2216fc58bd8db405bb06c9f22ff5) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 4 ++-- .../linux/linux-yocto-tiny_5.10.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 22 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 804773b0ec8..a11d0515e30 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e0d87d9831a6e0df20a370adc9aba0d032d91661" -SRCREV_meta ?= "b56db30a7c5a0d86ccc853ee68be925086318f88" +SRCREV_machine ?= "48b12b48c1103b811263aaed4d81bfb8b24fdfc4" +SRCREV_meta ?= "cec5f94cd2090d98b2dcfeee7a4258ae6adce506" 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.10;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 3b1741322d2..53653010455 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "38f8b1b5b87959e6cb9367151e233d27befe015d" -SRCREV_machine ?= "cc70f051e56005acda2e6ea994cadfb2538e66f6" -SRCREV_meta ?= "b56db30a7c5a0d86ccc853ee68be925086318f88" +SRCREV_machine_qemuarm ?= "3c9683e7166044d91c0ef900491f2f881a8bd6b7" +SRCREV_machine ?= "7f3e78220d6510de21d74e3f330f1f93cb635745" +SRCREV_meta ?= "cec5f94cd2090d98b2dcfeee7a4258ae6adce506" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 2b30a92b961..64dbdc826ab 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "74469c4b03f62e4b4da066e52785ed74b1d121ae" -SRCREV_machine_qemuarm64 ?= "69f185342f516efa8a9233e31d2c3f8356b3a388" -SRCREV_machine_qemumips ?= "d97607700b2fba19af10b2110b99c448ed9a88e9" -SRCREV_machine_qemuppc ?= "090085d4bb6181c3b972d82c9f8f7ed88c90ad6b" -SRCREV_machine_qemuriscv64 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" -SRCREV_machine_qemuriscv32 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" -SRCREV_machine_qemux86 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" -SRCREV_machine_qemux86-64 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" -SRCREV_machine_qemumips64 ?= "a1b43f69bce61143dd4d6d637f619eadd3fabb6e" -SRCREV_machine ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" -SRCREV_meta ?= "b56db30a7c5a0d86ccc853ee68be925086318f88" +SRCREV_machine_qemuarm ?= "ed7ac660431f6eb29add763876d7a10b6a6e539e" +SRCREV_machine_qemuarm64 ?= "9ca22664eb7cd86b7c91770bdaa1c5581a081938" +SRCREV_machine_qemumips ?= "4d5c2b576ee19c6ede626f2ffdb6a96d06ddd065" +SRCREV_machine_qemuppc ?= "54e5ceedcce6039a0479eaeea000e3c42cf4e4bc" +SRCREV_machine_qemuriscv64 ?= "0370165abaa08fa66808c54ed345eb70a558268b" +SRCREV_machine_qemuriscv32 ?= "0370165abaa08fa66808c54ed345eb70a558268b" +SRCREV_machine_qemux86 ?= "0370165abaa08fa66808c54ed345eb70a558268b" +SRCREV_machine_qemux86-64 ?= "0370165abaa08fa66808c54ed345eb70a558268b" +SRCREV_machine_qemumips64 ?= "012ce81097a4d2d94a7d5cb596fb4ad7d8f438f1" +SRCREV_machine ?= "0370165abaa08fa66808c54ed345eb70a558268b" +SRCREV_meta ?= "cec5f94cd2090d98b2dcfeee7a4258ae6adce506" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" From 03c3af8bcd0a7059ae37e6e633d9c94310ebdc16 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 22 Mar 2022 13:19:59 -0400 Subject: [PATCH 102/108] linux-yocto/5.10: update to v5.10.107 Updating linux-yocto/5.10 to the latest korg -stable release that comprises the following commits: 4c8814277b5d Linux 5.10.107 7a0d13ef67a1 arm64: kvm: Fix copy-and-paste error in bhb templates for v5.10 stable dc1163203ae6 io_uring: return back safer resurrect 8fdaab341bad kselftest/vm: fix tests build with old libc 2490695ffdba sfc: extend the locking on mcdi->seqno 2fad5b694896 tcp: make tcp_read_sock() more robust 3f9a8f8a952c nl80211: Update bss channel on channel switch for P2P_CLIENT 0ba557d33094 drm/vrr: Set VRR capable prop only if it is attached to connector 9a8e4a5c5b73 iwlwifi: don't advertise TWT support c5ea0221c816 atm: firestream: check the return value of ioremap() in fs_init() efdd92c18ed4 can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready ebe106eac686 ARM: 9178/1: fix unmet dependency on BITREVERSE for HAVE_ARCH_BITREVERSE e8ad9ecc4069 MIPS: smp: fill in sibling and core maps earlier 8c70b9b47004 mac80211: refuse aggregations sessions before authorized d687d7559e24 ARM: dts: rockchip: fix a typo on rk3288 crypto-controller 6f0a94931c47 ARM: dts: rockchip: reorder rk322x hmdi clocks 6493c6aa8b44 arm64: dts: agilex: use the compatible "intel,socfpga-agilex-hsotg" c5c8c649fee0 arm64: dts: rockchip: reorder rk3399 hdmi clocks f7f062919f41 arm64: dts: rockchip: fix rk3399-puma eMMC HS400 signal integrity ca142038a54f xfrm: Fix xfrm migrate issues when address family changes d8889a445b53 xfrm: Check if_id in xfrm_migrate 6056abc99b58 sctp: fix the processing for INIT chunk bdf0316982f0 Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0" 327f1e7d813c Linux 5.10.106 648895da69ce watch_queue: Fix filter limit check 8bb5b72dbd9a ARM: fix Thumb2 regression with Spectre BHB 6b1249db9e1c ext4: add check to prevent attempting to resize an fs with sparse_super2 b297cf764d8c x86/traps: Mark do_int3() NOKPROBE_SYMBOL 29f6f3500127 x86/boot: Add setup_indirect support in early_memremap_is_setup_data() b3444e5b640a x86/boot: Fix memremap of setup_indirect structures 24d268130e3c watch_queue: Make comment about setting ->defunct more accurate ec03510e0a77 watch_queue: Fix lack of barrier/sync/lock between post and read 06ab8444392a watch_queue: Free the alloc bitmap when the watch_queue is torn down 880acbb718e1 watch_queue: Fix the alloc bitmap size to reflect notes allocated e2b52ca4988e watch_queue: Fix to always request a pow-of-2 pipe ring size 2039900aadba watch_queue: Fix to release page in ->release() d729d4e99fb8 watch_queue, pipe: Free watchqueue state after clearing pipe ring 573a3228ca32 virtio: acknowledge all features before access bf52b627cf47 virtio: unexport virtio_finalize_features 8bfb959ea28d arm64: dts: marvell: armada-37xx: Remap IO space to bus address 0x0 1ef5fe3dba2a riscv: Fix auipc+jalr relocation range checks a69aa422b478 mmc: meson: Fix usage of meson_mmc_post_req() 0c6eeaf8c168 net: macb: Fix lost RX packet wakeup race in NAPI receive 6d9700b44509 staging: gdm724x: fix use after free in gdm_lte_rx() 8c1bc04c8c82 staging: rtl8723bs: Fix access-point mode deadlock ab5595b45f73 fuse: fix pipe buffer lifetime for direct_io f2c52a4baf56 ARM: Spectre-BHB: provide empty stub for non-config f1f5d089fcc6 selftests/memfd: clean up mapping in mfd_fail_write 71013d071b50 selftest/vm: fix map_fixed_noreplace test failure 8d276f10e84a tracing: Ensure trace buffer is at least 4096 bytes large ae7597b47dda ipv6: prevent a possible race condition with lifetimes 8c0c50e9fcff Revert "xen-netback: Check for hotplug-status existence before watching" 625c04b523ca Revert "xen-netback: remove 'hotplug-status' once it has served its purpose" a0e2768fb901 gpio: Return EPROBE_DEFER if gc->to_irq is NULL 65d4e9d130fb hwmon: (pmbus) Clear pmbus fault/warning bits after read d15c9f6e3335 net-sysfs: add check for netdevice being present to speed_show 8c023c303978 spi: rockchip: terminate dma transmission when slave abort 889254f98e99 spi: rockchip: Fix error in getting num-cs property 4fb9be675be8 selftests/bpf: Add test for bpf_timer overwriting crash dc1c2b47b539 net: bcmgenet: Don't claim WOL when its not available b7e4d9ba2ddb sctp: fix kernel-infoleak for SCTP sockets 3cf533f12001 net: phy: DP83822: clear MISR2 register to disable interrupts 21044e679ed5 gianfar: ethtool: Fix refcount leak in gfar_get_ts_info 3a4cd1c51eea gpio: ts4900: Do not set DAT and OE together 7702e7e9e396 selftests: pmtu.sh: Kill tcpdump processes launched by subshell. 2b1c85f56512 NFC: port100: fix use-after-free in port100_send_complete 1fdabf2cf42b net/mlx5e: Lag, Only handle events from highest priority multipath entry f3331bc17449 net/mlx5: Fix a race on command flush flow 5f1340963b11 net/mlx5: Fix size field in bufferx_reg struct e2201ef32f93 ax25: Fix NULL pointer dereference in ax25_kill_by_device cc7679079c7e net: ethernet: lpc_eth: Handle error for clk_enable b3e4fcb53921 net: ethernet: ti: cpts: Handle error for clk_enable 5e42f90d7220 tipc: fix incorrect order of state message data sanity check 979b418b96e3 ethernet: Fix error handling in xemaclite_of_probe 506d61bc1b50 ice: Fix curr_link_speed advertised speed 852a9e97d396 ice: Rename a couple of variables b21ffd5469a9 ice: Remove unnecessary checker loop 875967aff5a6 ice: Align macro names to the specification 8c613f7cd3ca ice: stop disabling VFs due to PF error responses d9ee2cbff2e9 i40e: stop disabling VFs due to PF error responses 965070a2b71d ARM: dts: aspeed: Fix AST2600 quad spi group 96b01b854151 net: dsa: mt7530: fix incorrect test in mt753x_phylink_validate() ed5bb00d8604 drm/sun4i: mixer: Fix P010 and P210 format numbers 93223495bce5 qed: return status of qed_iov_get_link 5bee2ed0508b esp: Fix BEET mode inter address family tunneling on GSO 16386479ef59 net: qlogic: check the return value of dma_alloc_coherent() in qed_vf_hw_prepare() 33c74f808596 isdn: hfcpci: check the return value of dma_set_mask() in setup_hw() cca9d5035bd0 virtio-blk: Don't use MAX_DISCARD_SEGMENTS if max_discard_seg is zero a3d5fcc6cf2e mISDN: Fix memory leak in dsp_pipeline_build() f97ad179d12f mISDN: Remove obsolete PIPELINE_DEBUG debugging information 2de76d37d4a6 tipc: fix kernel panic when enabling bearer ea3a5e6df512 arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias 2c6a75ea32f9 HID: vivaldi: fix sysfs attributes leak 2a18a38cbc3b clk: qcom: gdsc: Add support to update GDSC transition delay 0d6882dd158e ARM: boot: dts: bcm2711: Fix HVS register range 67c781d938b8 Linux 5.10.105 561e91e5fee8 Revert "ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE" 206c8e271ba2 xen/netfront: react properly to failing gnttab_end_foreign_access_ref() 39c00d09286c xen/gnttab: fix gnttab_end_foreign_access() without page specified c4b16486d602 xen/pvcalls: use alloc/free_pages_exact() 8357d75bfdb8 xen/9p: use alloc/free_pages_exact() 17f01b7206af xen: remove gnttab_query_foreign_access() 5f36ae75b847 xen/gntalloc: don't use gnttab_query_foreign_access() 304725518277 xen/scsifront: don't use gnttab_query_foreign_access() for mapped status f6690dd9446a xen/netfront: don't use gnttab_query_foreign_access() for mapped status 96219af4e504 xen/blkfront: don't use gnttab_query_foreign_access() for mapped status 3d81e85f30a8 xen/grant-table: add gnttab_try_end_foreign_access() 5c600371b8fd xen/xenbus: don't let xenbus_grant_ring() remove grants in error case 90f59cc2f2cc ARM: fix build warning in proc-v7-bugs.c 8c4192d126ba ARM: Do not use NOCROSSREFS directive with ld.lld 1749b553d73b ARM: fix co-processor register typo a330601c637b ARM: fix build error when BPF_SYSCALL is disabled b65b87e718c3 arm64: proton-pack: Include unprivileged eBPF status in Spectre v2 mitigation reporting 551717cf3b58 arm64: Use the clearbhb instruction in mitigations 38c26bdb3cc5 KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated e192c8baa69a arm64: Mitigate spectre style branch history side channels 192023e6baf7 KVM: arm64: Allow indirect vectors to be used without SPECTRE_V3A 13a807a0a080 arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2 1f63326a5211 arm64: Add percpu vectors for EL1 56cf5326bdf9 arm64: entry: Add macro for reading symbol addresses from the trampoline 3f21b7e35523 arm64: entry: Add vectors that have the bhb mitigation sequences 49379552969a arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations 26211252c1c1 arm64: entry: Allow the trampoline text to occupy multiple pages 73ee716a1f63 arm64: entry: Make the kpti trampoline's kpti sequence optional 8c691e5308c5 arm64: entry: Move trampoline macros out of ifdef'd section e55025063276 arm64: entry: Don't assume tramp_vectors is the start of the vectors 5275fb5ea5f5 arm64: entry: Allow tramp_alias to access symbols after the 4K boundary bda89602814c arm64: entry: Move the trampoline data page before the text page d93b25a66548 arm64: entry: Free up another register on kpti's tramp_exit path 5242d6971e10 arm64: entry: Make the trampoline cleanup optional 7048a21086fb arm64: spectre: Rename spectre_v4_patch_fw_mitigation_conduit dc5b630c0d53 arm64: entry.S: Add ventry overflow sanity checks 97d8bdf33182 arm64: cpufeature: add HWCAP for FEAT_RPRES 162aa002ec1a arm64: cpufeature: add HWCAP for FEAT_AFP dbcfa9853953 arm64: add ID_AA64ISAR2_EL1 sys register 7ae8127e4123 arm64: Add HWCAP for self-synchronising virtual counter b19eaa004f2e arm64: Add Cortex-A510 CPU part definition 86171569312b arm64: Add Cortex-X2 CPU part definition fc8070a9c5ad arm64: Add Neoverse-N2, Cortex-A710 CPU part definition f3c12fc53e0a arm64: cputype: Add CPU implementor & types for the Apple M1 cores 302754d023a0 ARM: include unprivileged BPF status in Spectre V2 reporting 3f9c958e3572 ARM: Spectre-BHB workaround 29d9b56df1e1 ARM: use LOADADDR() to get load address of sections 46deb224680b ARM: early traps initialisation b7f1e73c4ddf ARM: report Spectre v2 status through sysfs d04937ae9490 x86/speculation: Warn about eIBRS + LFENCE + Unprivileged eBPF + SMT cc9e3e55bde7 x86/speculation: Warn about Spectre v2 LFENCE mitigation e335384560d1 x86/speculation: Update link to AMD speculation whitepaper 2fdf67a1d215 x86/speculation: Use generic retpoline by default on AMD afc2d635b5e1 x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting 071e8b69d780 Documentation/hw-vuln: Update spectre doc a6a119d647ad x86/speculation: Add eIBRS + Retpoline options f38774bb6e23 x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE 206cfe2dac3e x86,bugs: Unconditionally allow spectre_v2=retpoline,amd 97581b56b59f Linux 5.10.104 dbbe09d95377 hamradio: fix macro redefine warning dcd03efd7e8d Revert "xfrm: xfrm_state_mtu should return at least 1280 for ipv6" 292e1c88b8a5 btrfs: add missing run of delayed items after unlink during log replay 41712c5fa518 btrfs: qgroup: fix deadlock between rescan worker and remove qgroup 6e0319e77083 btrfs: fix lost prealloc extents beyond eof after full fsync 827172ffa999 tracing: Fix return value of __setup handlers 78059b1cfcd9 tracing/histogram: Fix sorting on old "cpu" value 0e188fde82d7 HID: add mapping for KEY_ALL_APPLICATIONS f276ea5035aa HID: add mapping for KEY_DICTATE 3b8f2a7aed80 Input: samsung-keypad - properly state IOMEM dependency a621ae6394ce Input: elan_i2c - fix regulator enable count imbalance after suspend/resume 1397bbcd817f Input: elan_i2c - move regulator_[en|dis]able() out of elan_[en|dis]able_power() 988f4f29cc44 net: dcb: disable softirqs in dcbnl_flush_dev() 6828da5dea53 drm/amdgpu: fix suspend/resume hang regression f5e496ef73f3 nl80211: Handle nla_memdup failures in handle_nan_filter 64e4305a03d0 iavf: Refactor iavf state machine tracking e6bc597fbcb2 net: chelsio: cxgb3: check the return value of pci_find_capability() 320980b2496d ibmvnic: complete init_done on transport events 86027004bb9d ARM: tegra: Move panels to AUX bus fbb810825aff soc: fsl: qe: Check of ioremap return value 2824f6939e26 soc: fsl: guts: Add a missing memory allocation failure check 3afe488d5c9c soc: fsl: guts: Revert commit 3c0d64e867ed 44709130793b ARM: dts: Use 32KiHz oscillator on devkit8000 298f6fae544f ARM: dts: switch timer config to common devkit8000 devicetree 8b20c1999d3a s390/extable: fix exception table sorting 49aa9c9c7fa7 memfd: fix F_SEAL_WRITE after shmem huge page allocated 6acbc8875282 ibmvnic: free reset-work-item when flushing 9d8a11d74de5 igc: igc_write_phy_reg_gpy: drop premature return 223744f52133 pinctrl: sunxi: Use unique lockdep classes for IRQs 2851b76e5fd0 selftests: mlxsw: tc_police_scale: Make test more robust 85bf489c5c01 ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions 6b6341049086 ARM: Fix kgdb breakpoint for Thumb2 fefe4cb4a640 igc: igc_read_phy_reg_gpy: drop premature return 0632854fb171 arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output 43eaf1b17845 can: gs_usb: change active_channels's type from atomic_t to u8 daaed6ced88c ASoC: cs4265: Fix the duplicated control name 8b8ac465bf52 firmware: arm_scmi: Remove space in MODULE_ALIAS name 667df6fe3ece efivars: Respect "block" flag in efivar_entry_set_safe() 283c37e5429e ixgbe: xsk: change !netif_carrier_ok() handling in ixgbe_xmit_zc() 5f394102ee27 net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe() 92b791771abd ibmvnic: register netdev after init of adapter 6e0f986032c5 net: sxgbe: fix return value of __setup handler e1a82db1ebaf iavf: Fix missing check for running netdev c9a066fe4593 mac80211: treat some SAE auth steps as final e6d7f57f919f net: stmmac: fix return value of __setup handler fa65989a4867 mac80211: fix forwarded mesh frames AC & queue selection dcc3423c1dca ia64: ensure proper NUMA distance and possible map initialization 1312ef5ad0a5 sched/topology: Fix sched_domain_topology_level alloc in sched_init_numa() d753aecb3d4b sched/topology: Make sched_init_numa() use a set for the deduplicating sort 05ae1f0fe9c6 ice: fix concurrent reset and removal of VFs 41edeeaae51a ice: Fix race conditions between virtchnl handling and VF ndo ops 0c145262ac99 rcu/nocb: Fix missed nocb_timer requeue 9bb7237cc740 net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error cause by server d7eb662625eb net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error generated by client 2e8d465b83db net/smc: fix connection leak 6a8a4dc2a279 net: dcb: flush lingering app table entries for unregistered devices f4c63b24dea9 net: ipv6: ensure we call ipv6_mc_down() at most once a9c4a74ad5ae batman-adv: Don't expect inter-netns unique iflink indices 3dae11d21fc8 batman-adv: Request iflink once in batadv_get_real_netdevice dcf10d78ff2c batman-adv: Request iflink once in batadv-on-batadv check 81f817f3e559 netfilter: nf_queue: handle socket prefetch 4d05239203fa netfilter: nf_queue: fix possible use-after-free 3b9ba964f77c netfilter: nf_queue: don't assume sk is full socket 4e178ed14bda net: fix up skbs delta_truesize in UDP GRO frag_list eb5e444fe37d e1000e: Correct NVM checksum verification flow b53d4bfd1a68 xfrm: enforce validity of offload input flags 2f0e6d80e8b5 xfrm: fix the if_id check in changelink 24efaae03b0d bpf, sockmap: Do not ignore orig_len parameter 8b0142c4143c netfilter: fix use-after-free in __nf_register_net_hook() 4952faa77d8d xfrm: fix MTU regression e93f2be33d4f mm: Consider __GFP_NOWARN flag for oversized kvmalloc() calls 912186db092c ntb: intel: fix port config status offset for SPR 1c0b51e62a50 thermal: core: Fix TZ_GET_TRIP NULL pointer dereference a1753d5c29a6 xen/netfront: destroy queues before real_num_tx_queues is zeroed ce41d8039196 drm/i915: s/JSP2/ICP2/ PCH 61a895da4844 iommu/amd: Recover from event log overflow 6951a5888165 ASoC: ops: Shift tested values in snd_soc_put_volsw() by +min dd9dd24fd7cb riscv: Fix config KASAN && DEBUG_VIRTUAL 7211aab2881b riscv: Fix config KASAN && SPARSEMEM && !SPARSE_VMEMMAP 00fb385f0ac4 riscv/efi_stub: Fix get_boot_hartid_from_fdt() return value 336872601cb8 ALSA: intel_hdmi: Fix reference to PCM buffer address e57dfaf66f2b tracing: Add ustring operation to filtering string pointers 4a9d2390f3e2 drm/amdgpu: check vm ready by amdgpu_vm->evicting flag 67e25eb1b474 ata: pata_hpt37x: fix PCI clock detection 335f11ff74f2 serial: stm32: prevent TDR register overwrite when sending x_char c999c5927e96 tracing: Add test for user space strings when filtering on string pointers db36a94ed66b exfat: fix i_blocks for files truncated over 4 GiB 1b810d5cb6ce exfat: reuse exfat_inode_info variable instead of calling EXFAT_I() fdd64084e405 usb: gadget: clear related members when goto fail c13159a58881 usb: gadget: don't release an existing dev->buf 00d5ac05af3a net: usb: cdc_mbim: avoid altsetting toggling for Telit FN990 16f903afbafb i2c: qup: allow COMPILE_TEST 57c333ad8c28 i2c: cadence: allow COMPILE_TEST 9d6285e63241 dmaengine: shdma: Fix runtime PM imbalance on error 37b06d5ebf5c selftests/seccomp: Fix seccomp failure by adding missing headers df9db1a2af37 cifs: fix double free race when mount fails in cifs_get_root() e3850e211df6 tipc: fix a bit overflow in tipc_crypto_key_rcv() 6d4985b8a0bf KVM: arm64: vgic: Read HW interrupt pending state from the HW 5d4b00e053fc Input: clear BTN_RIGHT/MIDDLE on buttonpads 6e7015d982ee regulator: core: fix false positive in regulator_late_cleanup() 467d664e5fff ASoC: rt5682: do not block workqueue if card is unbound 0b050b7a0d73 ASoC: rt5668: do not block workqueue if card is unbound 11956c6eeb5a i2c: bcm2835: Avoid clock stretching timeouts 13f0ea8d1193 mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work 46f6d66219b5 mac80211_hwsim: report NOACK frames in tx_status Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni (cherry picked from commit 1e600731a459c1dfe14032e5242806a25f091b41) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 6 ++--- .../linux/linux-yocto-tiny_5.10.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index a11d0515e30..50e6a9f1e2c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "48b12b48c1103b811263aaed4d81bfb8b24fdfc4" -SRCREV_meta ?= "cec5f94cd2090d98b2dcfeee7a4258ae6adce506" +SRCREV_machine ?= "7f96d3fd60eea0ab38afdf07b3fc7c8c9f501802" +SRCREV_meta ?= "24ab54209a8822aad92afe2c51ea5b95f5175394" 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.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.103" +LINUX_VERSION ?= "5.10.107" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 53653010455..8f22c891652 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.103" +LINUX_VERSION ?= "5.10.107" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 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 ?= "3c9683e7166044d91c0ef900491f2f881a8bd6b7" -SRCREV_machine ?= "7f3e78220d6510de21d74e3f330f1f93cb635745" -SRCREV_meta ?= "cec5f94cd2090d98b2dcfeee7a4258ae6adce506" +SRCREV_machine_qemuarm ?= "d47f1b40f2f77d0c810defd853c69eb39cb84bf5" +SRCREV_machine ?= "1ae0844c6a36151066744e43fd30db3a946bc21d" +SRCREV_meta ?= "24ab54209a8822aad92afe2c51ea5b95f5175394" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 64dbdc826ab..5ce504812fb 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ed7ac660431f6eb29add763876d7a10b6a6e539e" -SRCREV_machine_qemuarm64 ?= "9ca22664eb7cd86b7c91770bdaa1c5581a081938" -SRCREV_machine_qemumips ?= "4d5c2b576ee19c6ede626f2ffdb6a96d06ddd065" -SRCREV_machine_qemuppc ?= "54e5ceedcce6039a0479eaeea000e3c42cf4e4bc" -SRCREV_machine_qemuriscv64 ?= "0370165abaa08fa66808c54ed345eb70a558268b" -SRCREV_machine_qemuriscv32 ?= "0370165abaa08fa66808c54ed345eb70a558268b" -SRCREV_machine_qemux86 ?= "0370165abaa08fa66808c54ed345eb70a558268b" -SRCREV_machine_qemux86-64 ?= "0370165abaa08fa66808c54ed345eb70a558268b" -SRCREV_machine_qemumips64 ?= "012ce81097a4d2d94a7d5cb596fb4ad7d8f438f1" -SRCREV_machine ?= "0370165abaa08fa66808c54ed345eb70a558268b" -SRCREV_meta ?= "cec5f94cd2090d98b2dcfeee7a4258ae6adce506" +SRCREV_machine_qemuarm ?= "2ef8231651bb6a4c79b307f59a794b92238546ec" +SRCREV_machine_qemuarm64 ?= "00684b441f15d202c5849eed164a9b3b94a5c1e8" +SRCREV_machine_qemumips ?= "661a4f517906253e074fe301d68ff1e6b6968e9f" +SRCREV_machine_qemuppc ?= "bff933cb7a11019c64e6034c48ab79453f75b99e" +SRCREV_machine_qemuriscv64 ?= "763c0dbc0458ebcb1d06afe2f324925f0f61bd27" +SRCREV_machine_qemuriscv32 ?= "763c0dbc0458ebcb1d06afe2f324925f0f61bd27" +SRCREV_machine_qemux86 ?= "763c0dbc0458ebcb1d06afe2f324925f0f61bd27" +SRCREV_machine_qemux86-64 ?= "763c0dbc0458ebcb1d06afe2f324925f0f61bd27" +SRCREV_machine_qemumips64 ?= "7a89b456542ff1fa0ab71fa4a2ae6f04281f3a2d" +SRCREV_machine ?= "763c0dbc0458ebcb1d06afe2f324925f0f61bd27" +SRCREV_meta ?= "24ab54209a8822aad92afe2c51ea5b95f5175394" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -32,7 +32,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.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.103" +LINUX_VERSION ?= "5.10.107" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From 76d5c8d876f78d86e755c12360d41e40154eca0b Mon Sep 17 00:00:00 2001 From: Li Wang Date: Fri, 25 Mar 2022 13:48:41 -0700 Subject: [PATCH 103/108] flac: fix CVE-2021-0561 In append_to_verify_fifo_interleaved_ of stream_encoder.c, there is a possible out of bounds write due to a missing bounds check. This could lead to local information disclosure with no additional execution privileges needed. User interaction is not needed for exploitation.Product: AndroidVersions: Android-11Android ID: A-174302683 References: https://nvd.nist.gov/vuln/detail/CVE-2021-0561 Upstream patches: https://github.com/xiph/flac/commit/e1575e4a7c5157cbf4e4a16dbd39b74f7174c7be Signed-off-by: Li Wang Signed-off-by: Joe Slater Signed-off-by: Anuj Mittal --- .../flac/flac/CVE-2021-0561.patch | 41 +++++++++++++++++++ meta/recipes-multimedia/flac/flac_1.3.3.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-multimedia/flac/flac/CVE-2021-0561.patch diff --git a/meta/recipes-multimedia/flac/flac/CVE-2021-0561.patch b/meta/recipes-multimedia/flac/flac/CVE-2021-0561.patch new file mode 100644 index 00000000000..b48663ae42c --- /dev/null +++ b/meta/recipes-multimedia/flac/flac/CVE-2021-0561.patch @@ -0,0 +1,41 @@ +From e1575e4a7c5157cbf4e4a16dbd39b74f7174c7be Mon Sep 17 00:00:00 2001 +From: Neelkamal Semwal +Date: Fri, 18 Dec 2020 22:28:36 +0530 +Subject: [PATCH] libFlac: Exit at EOS in verify mode + +When verify mode is enabled, once decoder flags end of stream, +encode processing is considered complete. + +CVE-2021-0561 + +Signed-off-by: Ralph Giles + +Upstream-Status: Backport +CVE: CVE-2021-0561 + +Reference to upstream patch: +https://github.com/xiph/flac/commit/e1575e4a7c5157cbf4e4a16dbd39b74f7174c7be + +Signed-off-by: Li Wang +--- + src/libFLAC/stream_encoder.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c +index 74387ec..8bb0ef3 100644 +--- a/src/libFLAC/stream_encoder.c ++++ b/src/libFLAC/stream_encoder.c +@@ -2610,7 +2610,9 @@ FLAC__bool write_bitbuffer_(FLAC__StreamEncoder *encoder, uint32_t samples, FLAC + encoder->private_->verify.needs_magic_hack = true; + } + else { +- if(!FLAC__stream_decoder_process_single(encoder->private_->verify.decoder)) { ++ if(!FLAC__stream_decoder_process_single(encoder->private_->verify.decoder) ++ || (!is_last_block ++ && (FLAC__stream_encoder_get_verify_decoder_state(encoder) == FLAC__STREAM_DECODER_END_OF_STREAM))) { + FLAC__bitwriter_release_buffer(encoder->private_->frame); + FLAC__bitwriter_clear(encoder->private_->frame); + if(encoder->protected_->state != FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) +-- +2.23.0 + diff --git a/meta/recipes-multimedia/flac/flac_1.3.3.bb b/meta/recipes-multimedia/flac/flac_1.3.3.bb index cb6692aedf5..d3c352cc44a 100644 --- a/meta/recipes-multimedia/flac/flac_1.3.3.bb +++ b/meta/recipes-multimedia/flac/flac_1.3.3.bb @@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \ DEPENDS = "libogg" SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz \ + file://CVE-2021-0561.patch \ " SRC_URI[md5sum] = "26703ed2858c1fc9ffc05136d13daa69" From 125c6f5770542c3b509336b92d6c45c0c955027e Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Tue, 29 Mar 2022 14:13:44 +0800 Subject: [PATCH 104/108] epiphany: fix CVEs Backport patch [1] to fix below CVEs: - CVE-2021-45085 - CVE-2021-45086 - CVE-2021-45087 - CVE-2021-45088 [1] https://sources.debian.org/data/main/e/epiphany-browser/3.38.2-1+deb11u2/debian/patches/encode-untrusted-data.patch Signed-off-by: Mingli Yu Signed-off-by: Anuj Mittal --- .../recipes-gnome/epiphany/epiphany_3.38.2.bb | 1 + .../files/encode-untrusted-data.patch | 707 ++++++++++++++++++ 2 files changed, 708 insertions(+) create mode 100644 meta/recipes-gnome/epiphany/files/encode-untrusted-data.patch diff --git a/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb b/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb index 04f340f133f..72d116da694 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb @@ -18,6 +18,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV} file://0002-help-meson.build-disable-the-use-of-yelp.patch \ file://migrator.patch \ file://distributor.patch \ + file://encode-untrusted-data.patch \ " SRC_URI[archive.sha256sum] = "8b05f2bcc1e80ecf4a10f6f01b3285087eb4cbdf5741dffb8c0355715ef5116d" diff --git a/meta/recipes-gnome/epiphany/files/encode-untrusted-data.patch b/meta/recipes-gnome/epiphany/files/encode-untrusted-data.patch new file mode 100644 index 00000000000..4805ee4e6b0 --- /dev/null +++ b/meta/recipes-gnome/epiphany/files/encode-untrusted-data.patch @@ -0,0 +1,707 @@ +From: Michael Catanzaro +Subject: Properly encode untrusted data when injecting into trusted pages + +CVE: CVE-2021-45085 CVE-2021-45086 CVE-2021-45087 CVE-2021-45088 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/epiphany/-/compare/c27a8180e12e6ec92292dcf53b9243815ad9aa2e...abac58c5191b7d653fbefa8d44e5c2bd4d002825?from_project_id=1906] + +Signed-off-by: Mingli Yu +Index: epiphany-browser/embed/ephy-about-handler.c +=================================================================== +--- epiphany-browser.orig/embed/ephy-about-handler.c ++++ epiphany-browser/embed/ephy-about-handler.c +@@ -27,6 +27,7 @@ + #include "ephy-file-helpers.h" + #include "ephy-flatpak-utils.h" + #include "ephy-history-service.h" ++#include "ephy-output-encoding.h" + #include "ephy-prefs.h" + #include "ephy-settings.h" + #include "ephy-smaps.h" +@@ -263,16 +264,34 @@ handle_applications_finished_cb (EphyAbo + + for (p = applications; p; p = p->next) { + EphyWebApplication *app = (EphyWebApplication *)p->data; +- ++ g_autofree char *html_encoded_id = NULL; ++ g_autofree char *encoded_icon_url = NULL; ++ g_autofree char *encoded_name = NULL; ++ g_autofree char *encoded_url = NULL; ++ g_autofree char *js_encoded_id = NULL; ++ g_autofree char *encoded_install_date = NULL; ++ ++ /* Most of these fields are untrusted. The web app suggests its own title, ++ * which gets used in the app ID and icon URL. The main URL could contain ++ * anything. Install date is the only trusted field here in that it's ++ * constructed by Epiphany, but it's a freeform string and we're encoding ++ * everything else here anyway, so might as well encode this too. ++ */ ++ html_encoded_id = ephy_encode_for_html_attribute (app->id); ++ encoded_icon_url = ephy_encode_for_html_attribute (app->icon_url); ++ encoded_name = ephy_encode_for_html_entity (app->name); ++ encoded_url = ephy_encode_for_html_entity (app->url); ++ js_encoded_id = ephy_encode_for_javascript (app->id); ++ encoded_install_date = ephy_encode_for_html_entity (app->install_date); + g_string_append_printf (data_str, + "" + "" + "
%s
%s
" + "" + "%s
%s", +- app->id, app->icon_url, app->name, app->url, _("Delete"), app->id, ++ html_encoded_id, encoded_icon_url, encoded_name, encoded_url, _("Delete"), js_encoded_id, + /* Note for translators: this refers to the installation date. */ +- _("Installed on:"), app->install_date); ++ _("Installed on:"), encoded_install_date); + } + + g_string_append (data_str, ""); +@@ -407,7 +426,9 @@ history_service_query_urls_cb (EphyHisto + EphyHistoryURL *url = (EphyHistoryURL *)l->data; + const char *snapshot; + g_autofree char *thumbnail_style = NULL; +- g_autofree char *markup = NULL; ++ g_autofree char *entity_encoded_title = NULL; ++ g_autofree char *attribute_encoded_title = NULL; ++ g_autofree char *encoded_url = NULL; + + snapshot = ephy_snapshot_service_lookup_cached_snapshot_path (snapshot_service, url->url); + if (snapshot) +@@ -415,15 +436,19 @@ history_service_query_urls_cb (EphyHisto + else + ephy_embed_shell_schedule_thumbnail_update (shell, url); + +- markup = g_markup_escape_text (url->title, -1); ++ /* Title and URL are controlled by web content and could be malicious. */ ++ entity_encoded_title = ephy_encode_for_html_entity (url->title); ++ attribute_encoded_title = ephy_encode_for_html_attribute (url->title); ++ encoded_url = ephy_encode_for_html_attribute (url->url); + g_string_append_printf (data_str, + "" + "
" + " " + " %s" + "", +- markup, url->url, _("Remove from overview"), +- thumbnail_style ? thumbnail_style : "", url->title); ++ attribute_encoded_title, encoded_url, _("Remove from overview"), ++ thumbnail_style ? thumbnail_style : "", ++ entity_encoded_title); + } + + data_str = g_string_append (data_str, +Index: epiphany-browser/embed/ephy-pdf-handler.c +=================================================================== +--- epiphany-browser.orig/embed/ephy-pdf-handler.c ++++ epiphany-browser/embed/ephy-pdf-handler.c +@@ -23,6 +23,7 @@ + + #include "ephy-embed-container.h" + #include "ephy-embed-shell.h" ++#include "ephy-output-encoding.h" + #include "ephy-web-view.h" + + #include +@@ -124,8 +125,9 @@ pdf_file_loaded (GObject *source, + GBytes *html_file; + g_autoptr (GError) error = NULL; + g_autoptr (GString) html = NULL; +- g_autofree gchar *b64 = NULL; + g_autofree char *file_data = NULL; ++ g_autofree char *encoded_file_data = NULL; ++ g_autofree char *encoded_filename = NULL; + gsize len = 0; + + if (!g_file_load_contents_finish (G_FILE (source), res, &file_data, &len, NULL, &error)) { +@@ -134,13 +136,13 @@ pdf_file_loaded (GObject *source, + return; + } + +- html_file = g_resources_lookup_data ("/org/gnome/epiphany/pdfjs/web/viewer.html", 0, NULL); +- +- b64 = g_base64_encode ((const guchar *)file_data, len); + g_file_delete_async (G_FILE (source), G_PRIORITY_DEFAULT, NULL, pdf_file_deleted, NULL); + +- html = g_string_new (""); +- g_string_printf (html, g_bytes_get_data (html_file, NULL), b64, self->file_name ? self->file_name : ""); ++ html = g_string_new (NULL); ++ html_file = g_resources_lookup_data ("/org/gnome/epiphany/pdfjs/web/viewer.html", 0, NULL); ++ encoded_file_data = g_base64_encode ((const guchar *)file_data, len); ++ encoded_filename = self->file_name ? ephy_encode_for_html_attribute (self->file_name) : g_strdup (""); ++ g_string_printf (html, g_bytes_get_data (html_file, NULL), encoded_file_data, encoded_filename); + + finish_uri_scheme_request (self, g_strdup (html->str), NULL); + } +Index: epiphany-browser/embed/ephy-reader-handler.c +=================================================================== +--- epiphany-browser.orig/embed/ephy-reader-handler.c ++++ epiphany-browser/embed/ephy-reader-handler.c +@@ -24,6 +24,7 @@ + #include "ephy-embed-container.h" + #include "ephy-embed-shell.h" + #include "ephy-lib-type-builtins.h" ++#include "ephy-output-encoding.h" + #include "ephy-settings.h" + #include "ephy-web-view.h" + +@@ -156,7 +157,9 @@ readability_js_finish_cb (GObject * + g_autoptr (WebKitJavascriptResult) js_result = NULL; + g_autoptr (GError) error = NULL; + g_autofree gchar *byline = NULL; ++ g_autofree gchar *encoded_byline = NULL; + g_autofree gchar *content = NULL; ++ g_autofree gchar *encoded_title = NULL; + g_autoptr (GString) html = NULL; + g_autoptr (GBytes) style_css = NULL; + const gchar *title; +@@ -173,10 +176,14 @@ readability_js_finish_cb (GObject * + + byline = readability_get_property_string (js_result, "byline"); + content = readability_get_property_string (js_result, "content"); ++ title = webkit_web_view_get_title (web_view); ++ ++ encoded_byline = byline ? ephy_encode_for_html_entity (byline) : g_strdup (""); ++ encoded_title = ephy_encode_for_html_entity (title); + +- html = g_string_new (""); ++ html = g_string_new (NULL); + style_css = g_resources_lookup_data ("/org/gnome/epiphany/readability/reader.css", G_RESOURCE_LOOKUP_FLAGS_NONE, NULL); +- title = webkit_web_view_get_title (web_view); ++ + font_style = enum_nick (EPHY_TYPE_PREFS_READER_FONT_STYLE, + g_settings_get_enum (EPHY_SETTINGS_READER, + EPHY_PREFS_READER_FONT_STYLE)); +@@ -186,7 +193,8 @@ readability_js_finish_cb (GObject * + + g_string_append_printf (html, "" + "%s" +- "" \ ++ "" \ ++ "" \ + "" + "
" + "

" +@@ -197,13 +205,27 @@ readability_js_finish_cb (GObject * + "" + "
", + (gchar *)g_bytes_get_data (style_css, NULL), +- title, ++ encoded_title, + font_style, + color_scheme, +- title, +- byline != NULL ? byline : ""); ++ encoded_title, ++ encoded_byline); ++ ++ /* We cannot encode the page content because it contains HTML tags inserted by ++ * Readability.js. Upstream recommends that we use an XSS sanitizer like ++ * DOMPurify plus Content-Security-Policy, but I'm not keen on adding more ++ * bundled JS dependencies, and we have an advantage over Firefox in that we ++ * don't need scripts to work at this point. So instead the above CSP ++ * completely blocks all scripts, which should hopefully obviate the need for ++ * a DOM purifier. ++ * ++ * Note the encoding for page title and byline is still required, as they're ++ * not supposed to contain markup, and Readability.js unescapes them before ++ * returning them to us. ++ */ + g_string_append (html, content); + g_string_append (html, "

"); ++ g_string_append (html, ""); + + finish_uri_scheme_request (request, g_strdup (html->str), NULL); + } +Index: epiphany-browser/embed/ephy-view-source-handler.c +=================================================================== +--- epiphany-browser.orig/embed/ephy-view-source-handler.c ++++ epiphany-browser/embed/ephy-view-source-handler.c +@@ -23,6 +23,7 @@ + + #include "ephy-embed-container.h" + #include "ephy-embed-shell.h" ++#include "ephy-output-encoding.h" + #include "ephy-web-view.h" + + #include +@@ -109,7 +110,9 @@ web_resource_data_cb (WebKitWebResource + EphyViewSourceRequest *request) + { + g_autofree guchar *data = NULL; +- g_autofree char *escaped_str = NULL; ++ g_autofree char *data_str = NULL; ++ g_autofree char *encoded_str = NULL; ++ g_autofree char *encoded_uri = NULL; + g_autoptr (GError) error = NULL; + g_autofree char *html = NULL; + gsize length; +@@ -120,8 +123,13 @@ web_resource_data_cb (WebKitWebResource + return; + } + +- /* Warning: data is not a string, so we pass length here because it's not NUL-terminated. */ +- escaped_str = g_markup_escape_text ((const char *)data, length); ++ /* Convert data to a string */ ++ data_str = g_malloc (length + 1); ++ memcpy (data_str, data, length); ++ data_str[length] = '\0'; ++ ++ encoded_str = ephy_encode_for_html_entity (data_str); ++ encoded_uri = ephy_encode_for_html_entity (webkit_web_resource_get_uri (resource)); + + html = g_strdup_printf ("" + " " +@@ -136,8 +144,8 @@ web_resource_data_cb (WebKitWebResource + " hljs.initLineNumbersOnLoad();" + " 
%s
" + "", +- webkit_web_resource_get_uri (resource), +- escaped_str); ++ encoded_uri, ++ encoded_str); + + finish_uri_scheme_request (request, g_steal_pointer (&html), NULL); + } +Index: epiphany-browser/embed/ephy-web-view.c +=================================================================== +--- epiphany-browser.orig/embed/ephy-web-view.c ++++ epiphany-browser/embed/ephy-web-view.c +@@ -38,6 +38,7 @@ + #include "ephy-gsb-utils.h" + #include "ephy-history-service.h" + #include "ephy-lib-type-builtins.h" ++#include "ephy-output-encoding.h" + #include "ephy-permissions-manager.h" + #include "ephy-prefs.h" + #include "ephy-reader-handler.h" +@@ -1772,9 +1773,11 @@ format_network_error_page (const char * + const char **icon_name, + const char **style) + { +- char *formatted_origin; +- char *formatted_reason; +- char *first_paragraph; ++ g_autofree char *encoded_uri = NULL; ++ g_autofree char *encoded_origin = NULL; ++ g_autofree char *formatted_origin = NULL; ++ g_autofree char *formatted_reason = NULL; ++ g_autofree char *first_paragraph = NULL; + const char *second_paragraph; + + /* Page title when a site cannot be loaded due to a network error. */ +@@ -1783,7 +1786,8 @@ format_network_error_page (const char * + /* Message title when a site cannot be loaded due to a network error. */ + *message_title = g_strdup (_("Unable to display this website")); + +- formatted_origin = g_strdup_printf ("%s", origin); ++ encoded_origin = ephy_encode_for_html_entity (origin); ++ formatted_origin = g_strdup_printf ("%s", encoded_origin); + /* Error details when a site cannot be loaded due to a network error. */ + first_paragraph = g_strdup_printf (_("The site at %s seems to be " + "unavailable."), +@@ -1805,16 +1809,13 @@ format_network_error_page (const char * + + /* The button on the network error page. DO NOT ADD MNEMONICS HERE. */ + *button_label = g_strdup (_("Reload")); +- *button_action = g_strdup_printf ("window.location = '%s';", uri); ++ encoded_uri = ephy_encode_for_javascript (uri); ++ *button_action = g_strdup_printf ("window.location = '%s';", encoded_uri); + /* Mnemonic for the Reload button on browser error pages. */ + *button_accesskey = C_("reload-access-key", "R"); + + *icon_name = "network-error-symbolic.svg"; + *style = "default"; +- +- g_free (formatted_origin); +- g_free (formatted_reason); +- g_free (first_paragraph); + } + + static void +@@ -1828,10 +1829,12 @@ format_crash_error_page (const char *ur + const char **icon_name, + const char **style) + { +- char *formatted_uri; +- char *formatted_distributor; +- char *first_paragraph; +- char *second_paragraph; ++ g_autofree char *html_encoded_uri = NULL; ++ g_autofree char *js_encoded_uri = NULL; ++ g_autofree char *formatted_uri = NULL; ++ g_autofree char *formatted_distributor = NULL; ++ g_autofree char *first_paragraph = NULL; ++ g_autofree char *second_paragraph = NULL; + + /* Page title when a site cannot be loaded due to a page crash error. */ + *page_title = g_strdup_printf (_("Problem Loading Page")); +@@ -1839,7 +1842,8 @@ format_crash_error_page (const char *ur + /* Message title when a site cannot be loaded due to a page crash error. */ + *message_title = g_strdup (_("Oops! There may be a problem")); + +- formatted_uri = g_strdup_printf ("%s", uri); ++ html_encoded_uri = ephy_encode_for_html_entity (uri); ++ formatted_uri = g_strdup_printf ("%s", html_encoded_uri); + /* Error details when a site cannot be loaded due to a page crash error. */ + first_paragraph = g_strdup_printf (_("The page %s may have caused Web to " + "close unexpectedly."), +@@ -1858,17 +1862,13 @@ format_crash_error_page (const char *ur + + /* The button on the page crash error page. DO NOT ADD MNEMONICS HERE. */ + *button_label = g_strdup (_("Reload")); +- *button_action = g_strdup_printf ("window.location = '%s';", uri); ++ js_encoded_uri = ephy_encode_for_javascript (uri); ++ *button_action = g_strdup_printf ("window.location = '%s';", js_encoded_uri); + /* Mnemonic for the Reload button on browser error pages. */ + *button_accesskey = C_("reload-access-key", "R"); + + *icon_name = "computer-fail-symbolic.svg"; + *style = "default"; +- +- g_free (formatted_uri); +- g_free (formatted_distributor); +- g_free (first_paragraph); +- g_free (second_paragraph); + } + + static void +@@ -1882,6 +1882,7 @@ format_process_crash_error_page (const c + const char **icon_name, + const char **style) + { ++ g_autofree char *encoded_uri = NULL; + const char *first_paragraph; + + /* Page title when a site cannot be loaded due to a process crash error. */ +@@ -1897,7 +1898,8 @@ format_process_crash_error_page (const c + + /* The button on the process crash error page. DO NOT ADD MNEMONICS HERE. */ + *button_label = g_strdup (_("Reload")); +- *button_action = g_strdup_printf ("window.location = '%s';", uri); ++ encoded_uri = ephy_encode_for_javascript (uri); ++ *button_action = g_strdup_printf ("window.location = '%s';", encoded_uri); + /* Mnemonic for the Reload button on browser error pages. */ + *button_accesskey = C_("reload-access-key", "R"); + +@@ -1921,8 +1923,9 @@ format_tls_error_page (EphyWebView *vie + const char **icon_name, + const char **style) + { +- char *formatted_origin; +- char *first_paragraph; ++ g_autofree char *encoded_origin = NULL; ++ g_autofree char *formatted_origin = NULL; ++ g_autofree char *first_paragraph = NULL; + + /* Page title when a site is not loaded due to an invalid TLS certificate. */ + *page_title = g_strdup_printf (_("Security Violation")); +@@ -1930,7 +1933,8 @@ format_tls_error_page (EphyWebView *vie + /* Message title when a site is not loaded due to an invalid TLS certificate. */ + *message_title = g_strdup (_("This Connection is Not Secure")); + +- formatted_origin = g_strdup_printf ("%s", origin); ++ encoded_origin = ephy_encode_for_html_entity (origin); ++ formatted_origin = g_strdup_printf ("%s", encoded_origin); + /* Error details when a site is not loaded due to an invalid TLS certificate. */ + first_paragraph = g_strdup_printf (_("This does not look like the real %s. " + "Attackers might be trying to steal or " +@@ -1956,9 +1960,6 @@ format_tls_error_page (EphyWebView *vie + + *icon_name = "channel-insecure-symbolic.svg"; + *style = "danger"; +- +- g_free (formatted_origin); +- g_free (first_paragraph); + } + + static void +@@ -1978,8 +1979,9 @@ format_unsafe_browsing_error_page (EphyW + const char **icon_name, + const char **style) + { +- char *formatted_origin; +- char *first_paragraph; ++ g_autofree char *encoded_origin = NULL; ++ g_autofree char *formatted_origin = NULL; ++ g_autofree char *first_paragraph = NULL; + + /* Page title when a site is flagged by Google Safe Browsing verification. */ + *page_title = g_strdup_printf (_("Security Warning")); +@@ -1987,7 +1989,8 @@ format_unsafe_browsing_error_page (EphyW + /* Message title on the unsafe browsing error page. */ + *message_title = g_strdup (_("Unsafe website detected!")); + +- formatted_origin = g_strdup_printf ("%s", origin); ++ encoded_origin = ephy_encode_for_html_entity (origin); ++ formatted_origin = g_strdup_printf ("%s", encoded_origin); + /* Error details on the unsafe browsing error page. + * https://developers.google.com/safe-browsing/v4/usage-limits#UserWarnings + */ +@@ -2045,9 +2048,6 @@ format_unsafe_browsing_error_page (EphyW + + *icon_name = "security-high-symbolic.svg"; + *style = "danger"; +- +- g_free (formatted_origin); +- g_free (first_paragraph); + } + + static void +@@ -2061,7 +2061,8 @@ format_no_such_file_error_page (EphyWebV + const char **icon_name, + const char **style) + { +- g_autofree gchar *formatted_origin = NULL; ++ g_autofree gchar *encoded_address = NULL; ++ g_autofree gchar *formatted_address = NULL; + g_autofree gchar *first_paragraph = NULL; + g_autofree gchar *second_paragraph = NULL; + +@@ -2071,10 +2072,11 @@ format_no_such_file_error_page (EphyWebV + /* Message title on the no such file error page. */ + *message_title = g_strdup (_("File not found")); + +- formatted_origin = g_strdup_printf ("%s", view->address); ++ encoded_address = ephy_encode_for_html_entity (view->address); ++ formatted_address = g_strdup_printf ("%s", encoded_address); + + first_paragraph = g_strdup_printf (_("%s could not be found."), +- formatted_origin); ++ formatted_address); + second_paragraph = g_strdup_printf (_("Please check the file name for " + "capitalization or other typing errors. Also check if " + "it has been moved, renamed, or deleted.")); +@@ -2109,19 +2111,19 @@ ephy_web_view_load_error_page (EphyWebVi + GError *error, + gpointer user_data) + { +- GBytes *html_file; +- GString *html = g_string_new (""); +- char *origin = NULL; +- char *lang = NULL; +- char *page_title = NULL; +- char *msg_title = NULL; +- char *msg_body = NULL; +- char *msg_details = NULL; +- char *button_label = NULL; +- char *hidden_button_label = NULL; +- char *button_action = NULL; +- char *hidden_button_action = NULL; +- char *style_sheet = NULL; ++ g_autoptr (GBytes) html_file = NULL; ++ g_autoptr (GString) html = g_string_new (NULL); ++ g_autofree char *origin = NULL; ++ g_autofree char *lang = NULL; ++ g_autofree char *page_title = NULL; ++ g_autofree char *msg_title = NULL; ++ g_autofree char *msg_body = NULL; ++ g_autofree char *msg_details = NULL; ++ g_autofree char *button_label = NULL; ++ g_autofree char *hidden_button_label = NULL; ++ g_autofree char *button_action = NULL; ++ g_autofree char *hidden_button_action = NULL; ++ g_autofree char *style_sheet = NULL; + const char *button_accesskey = NULL; + const char *hidden_button_accesskey = NULL; + const char *icon_name = NULL; +@@ -2261,23 +2263,9 @@ ephy_web_view_load_error_page (EphyWebVi + button_accesskey, button_label); + #pragma GCC diagnostic pop + +- g_bytes_unref (html_file); +- g_free (origin); +- g_free (lang); +- g_free (page_title); +- g_free (msg_title); +- g_free (msg_body); +- g_free (msg_details); +- g_free (button_label); +- g_free (button_action); +- g_free (hidden_button_label); +- g_free (hidden_button_action); +- g_free (style_sheet); +- + /* Make our history backend ignore the next page load, since it will be an error page. */ + ephy_web_view_freeze_history (view); + webkit_web_view_load_alternate_html (WEBKIT_WEB_VIEW (view), html->str, uri, 0); +- g_string_free (html, TRUE); + } + + static gboolean +Index: epiphany-browser/lib/ephy-output-encoding.c +=================================================================== +--- /dev/null ++++ epiphany-browser/lib/ephy-output-encoding.c +@@ -0,0 +1,117 @@ ++/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* ++ * Copyright © Red Hat Inc. ++ * ++ * This file is part of Epiphany. ++ * ++ * Epiphany is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * Epiphany is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with Epiphany. If not, see . ++ */ ++ ++#include "config.h" ++#include "ephy-output-encoding.h" ++ ++#include ++ ++#if !GLIB_CHECK_VERSION(2, 68, 0) ++static guint ++g_string_replace (GString *string, ++ const gchar *find, ++ const gchar *replace, ++ guint limit) ++{ ++ gsize f_len, r_len, pos; ++ gchar *cur, *next; ++ guint n = 0; ++ ++ g_return_val_if_fail (string != NULL, 0); ++ g_return_val_if_fail (find != NULL, 0); ++ g_return_val_if_fail (replace != NULL, 0); ++ ++ f_len = strlen (find); ++ r_len = strlen (replace); ++ cur = string->str; ++ ++ while ((next = strstr (cur, find)) != NULL) ++ { ++ pos = next - string->str; ++ g_string_erase (string, pos, f_len); ++ g_string_insert (string, pos, replace); ++ cur = string->str + pos + r_len; ++ n++; ++ /* Only match the empty string once at any given position, to ++ * avoid infinite loops */ ++ if (f_len == 0) ++ { ++ if (cur[0] == '\0') ++ break; ++ else ++ cur++; ++ } ++ if (n == limit) ++ break; ++ } ++ ++ return n; ++} ++#endif ++ ++char * ++ephy_encode_for_html_entity (const char *input) ++{ ++ GString *str = g_string_new (input); ++ ++ g_string_replace (str, "&", "&", 0); ++ g_string_replace (str, "<", "<", 0); ++ g_string_replace (str, ">", ">", 0); ++ g_string_replace (str, "\"", """, 0); ++ g_string_replace (str, "'", "'", 0); ++ g_string_replace (str, "/", "/", 0); ++ ++ return g_string_free (str, FALSE); ++} ++ ++static char * ++encode_all_except_alnum (const char *input, ++ const char *format) ++{ ++ GString *str; ++ const char *c = input; ++ ++ if (!g_utf8_validate (input, -1, NULL)) ++ return g_strdup (""); ++ ++ str = g_string_new (NULL); ++ do { ++ gunichar u = g_utf8_get_char (c); ++ if (g_unichar_isalnum (u)) ++ g_string_append_unichar (str, u); ++ else ++ g_string_append_printf (str, format, u); ++ c = g_utf8_next_char (c); ++ } while (*c); ++ ++ return g_string_free (str, FALSE); ++} ++ ++char * ++ephy_encode_for_html_attribute (const char *input) ++{ ++ return encode_all_except_alnum (input, "&#x%02x;"); ++} ++ ++char * ++ephy_encode_for_javascript (const char *input) ++{ ++ return encode_all_except_alnum (input, "\\u%04u;"); ++} +Index: epiphany-browser/lib/ephy-output-encoding.h +=================================================================== +--- /dev/null ++++ epiphany-browser/lib/ephy-output-encoding.h +@@ -0,0 +1,38 @@ ++/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* ++ * Copyright © 2021 Red Hat Inc. ++ * ++ * This file is part of Epiphany. ++ * ++ * Epiphany is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * Epiphany is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with Epiphany. If not, see . ++ */ ++ ++#pragma once ++ ++#include ++ ++G_BEGIN_DECLS ++ ++/* These functions implement the OWASP XSS prevention output encoding rules: ++ * https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html#output-encoding-rules-summary ++ * ++ * You must *carefully* read that document to safely inject untrusted data into ++ * web content. Here be dragons. ++ */ ++ ++char *ephy_encode_for_html_entity (const char *input); ++char *ephy_encode_for_html_attribute (const char *input); ++char *ephy_encode_for_javascript (const char *input); ++ ++G_END_DECLS +Index: epiphany-browser/lib/meson.build +=================================================================== +--- epiphany-browser.orig/lib/meson.build ++++ epiphany-browser/lib/meson.build +@@ -21,6 +21,7 @@ libephymisc_sources = [ + 'ephy-langs.c', + 'ephy-notification.c', + 'ephy-notification-container.c', ++ 'ephy-output-encoding.c', + 'ephy-permissions-manager.c', + 'ephy-profile-utils.c', + 'ephy-search-engine-manager.c', From 9a69897f464432e0b6ef9b8ad5d8110d78a1162a Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Tue, 29 Mar 2022 16:37:25 +0800 Subject: [PATCH 105/108] python3-numpy: fix CVE-2021-41496 Backport patch [1] to fix CVE-2021-41496. [1] https://github.com/numpy/numpy/commit/271010f1037150e95017f803f4214b8861e528f2 Signed-off-by: Mingli Yu Signed-off-by: Anuj Mittal --- .../python-numpy/files/CVE-2021-41496.patch | 64 +++++++++++++++++++ .../python-numpy/python3-numpy_1.20.1.bb | 1 + 2 files changed, 65 insertions(+) create mode 100644 meta/recipes-devtools/python-numpy/files/CVE-2021-41496.patch diff --git a/meta/recipes-devtools/python-numpy/files/CVE-2021-41496.patch b/meta/recipes-devtools/python-numpy/files/CVE-2021-41496.patch new file mode 100644 index 00000000000..0afc79ae0da --- /dev/null +++ b/meta/recipes-devtools/python-numpy/files/CVE-2021-41496.patch @@ -0,0 +1,64 @@ +From 86d81322c5c0ab67f89d64f56f6e77d4fe185910 Mon Sep 17 00:00:00 2001 +From: Warren Weckesser +Date: Tue, 29 Mar 2022 15:58:00 +0800 +Subject: [PATCH] BUG: f2py: Simplify creation of an exception message. Closes + gh-19000. + +CVE: CVE-2021-41496 + +Upstream-Status: Backport [https://github.com/numpy/numpy/commit/271010f1037150e95017f803f4214b8861e528f2] + +Signed-off-by: Mingli Yu +--- + numpy/f2py/src/fortranobject.c | 26 ++++++++++++-------------- + 1 file changed, 12 insertions(+), 14 deletions(-) + +diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c +index 3275f90..85c9c7f 100644 +--- a/numpy/f2py/src/fortranobject.c ++++ b/numpy/f2py/src/fortranobject.c +@@ -637,14 +637,14 @@ static int check_and_fix_dimensions(const PyArrayObject* arr, + npy_intp *dims); + + static int +-count_negative_dimensions(const int rank, ++find_first_negative_dimension(const int rank, + const npy_intp *dims) { +- int i=0,r=0; +- while (i 0) { +- int i; +- strcpy(mess, "failed to create intent(cache|hide)|optional array" +- "-- must have defined dimensions but got ("); +- for(i=0;i= 0) { ++ PyErr_Format(PyExc_ValueError, ++ "failed to create intent(cache|hide)|optional array" ++ " -- must have defined dimensions, but dims[%d] = %" ++ NPY_INTP_FMT, i, dims[i]); + return NULL; + } + arr = (PyArrayObject *) +-- +2.25.1 + diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.20.1.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.20.1.bb index 6c3b8867826..9e55e74d2c4 100644 --- a/meta/recipes-devtools/python-numpy/python3-numpy_1.20.1.bb +++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.20.1.bb @@ -10,6 +10,7 @@ SRCNAME = "numpy" SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ file://0001-numpy-core-Define-RISCV-32-support.patch \ + file://CVE-2021-41496.patch \ file://run-ptest \ " SRC_URI[sha256sum] = "9bf51d69ebb4ca9239e55bedc2185fe2c0ec222da0adee7ece4125414676846d" From 90b9356e4b87d8ce08b3456ec0e0185e521335a4 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 29 Mar 2022 14:06:15 +0100 Subject: [PATCH 106/108] zlib: backport the fix for CVE-2018-25032 Signed-off-by: Ross Burton Signed-off-by: Anuj Mittal --- .../zlib/zlib/CVE-2018-25032.patch | 347 ++++++++++++++++++ meta/recipes-core/zlib/zlib_1.2.11.bb | 1 + 2 files changed, 348 insertions(+) create mode 100644 meta/recipes-core/zlib/zlib/CVE-2018-25032.patch diff --git a/meta/recipes-core/zlib/zlib/CVE-2018-25032.patch b/meta/recipes-core/zlib/zlib/CVE-2018-25032.patch new file mode 100644 index 00000000000..5cb61836419 --- /dev/null +++ b/meta/recipes-core/zlib/zlib/CVE-2018-25032.patch @@ -0,0 +1,347 @@ +CVE: CVE-2018-25032 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Tue, 17 Apr 2018 22:09:22 -0700 +Subject: [PATCH] Fix a bug that can crash deflate on some input when using + Z_FIXED. + +This bug was reported by Danilo Ramos of Eideticom, Inc. It has +lain in wait 13 years before being found! The bug was introduced +in zlib 1.2.2.2, with the addition of the Z_FIXED option. That +option forces the use of fixed Huffman codes. For rare inputs with +a large number of distant matches, the pending buffer into which +the compressed data is written can overwrite the distance symbol +table which it overlays. That results in corrupted output due to +invalid distances, and can result in out-of-bound accesses, +crashing the application. + +The fix here combines the distance buffer and literal/length +buffers into a single symbol buffer. Now three bytes of pending +buffer space are opened up for each literal or length/distance +pair consumed, instead of the previous two bytes. This assures +that the pending buffer cannot overwrite the symbol table, since +the maximum fixed code compressed length/distance is 31 bits, and +since there are four bytes of pending space for every three bytes +of symbol space. +--- + deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++--------------- + deflate.h | 25 +++++++++---------- + trees.c | 50 +++++++++++-------------------------- + 3 files changed, 79 insertions(+), 70 deletions(-) + +diff --git a/deflate.c b/deflate.c +index 425babc00..19cba873a 100644 +--- a/deflate.c ++++ b/deflate.c +@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + int wrap = 1; + static const char my_version[] = ZLIB_VERSION; + +- ushf *overlay; +- /* We overlay pending_buf and d_buf+l_buf. This works since the average +- * output size for (length,distance) codes is <= 24 bits. +- */ +- + if (version == Z_NULL || version[0] != my_version[0] || + stream_size != sizeof(z_stream)) { + return Z_VERSION_ERROR; +@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + +- overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); +- s->pending_buf = (uchf *) overlay; +- s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); ++ /* We overlay pending_buf and sym_buf. This works since the average size ++ * for length/distance pairs over any compressed block is assured to be 31 ++ * bits or less. ++ * ++ * Analysis: The longest fixed codes are a length code of 8 bits plus 5 ++ * extra bits, for lengths 131 to 257. The longest fixed distance codes are ++ * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest ++ * possible fixed-codes length/distance pair is then 31 bits total. ++ * ++ * sym_buf starts one-fourth of the way into pending_buf. So there are ++ * three bytes in sym_buf for every four bytes in pending_buf. Each symbol ++ * in sym_buf is three bytes -- two for the distance and one for the ++ * literal/length. As each symbol is consumed, the pointer to the next ++ * sym_buf value to read moves forward three bytes. From that symbol, up to ++ * 31 bits are written to pending_buf. The closest the written pending_buf ++ * bits gets to the next sym_buf symbol to read is just before the last ++ * code is written. At that time, 31*(n-2) bits have been written, just ++ * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at ++ * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1 ++ * symbols are written.) The closest the writing gets to what is unread is ++ * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and ++ * can range from 128 to 32768. ++ * ++ * Therefore, at a minimum, there are 142 bits of space between what is ++ * written and what is read in the overlain buffers, so the symbols cannot ++ * be overwritten by the compressed data. That space is actually 139 bits, ++ * due to the three-bit fixed-code block header. ++ * ++ * That covers the case where either Z_FIXED is specified, forcing fixed ++ * codes, or when the use of fixed codes is chosen, because that choice ++ * results in a smaller compressed block than dynamic codes. That latter ++ * condition then assures that the above analysis also covers all dynamic ++ * blocks. A dynamic-code block will only be chosen to be emitted if it has ++ * fewer bits than a fixed-code block would for the same set of symbols. ++ * Therefore its average symbol length is assured to be less than 31. So ++ * the compressed data for a dynamic block also cannot overwrite the ++ * symbols from which it is being constructed. ++ */ ++ ++ s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4); ++ s->pending_buf_size = (ulg)s->lit_bufsize * 4; + + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { +@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + deflateEnd (strm); + return Z_MEM_ERROR; + } +- s->d_buf = overlay + s->lit_bufsize/sizeof(ush); +- s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; ++ s->sym_buf = s->pending_buf + s->lit_bufsize; ++ s->sym_end = (s->lit_bufsize - 1) * 3; ++ /* We avoid equality with lit_bufsize*3 because of wraparound at 64K ++ * on 16 bit machines and because stored blocks are restricted to ++ * 64K-1 bytes. ++ */ + + s->level = level; + s->strategy = strategy; +@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value) + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; +- if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) ++ if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) + return Z_BUF_ERROR; + do { + put = Buf_size - s->bi_valid; +@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source) + #else + deflate_state *ds; + deflate_state *ss; +- ushf *overlay; + + + if (deflateStateCheck(source) || dest == Z_NULL) { +@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source) + ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); + ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); + ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); +- overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); +- ds->pending_buf = (uchf *) overlay; ++ ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4); + + if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || + ds->pending_buf == Z_NULL) { +@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source) + zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); + + ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); +- ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); +- ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; ++ ds->sym_buf = ds->pending_buf + ds->lit_bufsize; + + ds->l_desc.dyn_tree = ds->dyn_ltree; + ds->d_desc.dyn_tree = ds->dyn_dtree; +@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +diff --git a/deflate.h b/deflate.h +index 23ecdd312..d4cf1a98b 100644 +--- a/deflate.h ++++ b/deflate.h +@@ -217,7 +217,7 @@ typedef struct internal_state { + /* Depth of each subtree used as tie breaker for trees of equal frequency + */ + +- uchf *l_buf; /* buffer for literals or lengths */ ++ uchf *sym_buf; /* buffer for distances and literals/lengths */ + + uInt lit_bufsize; + /* Size of match buffer for literals/lengths. There are 4 reasons for +@@ -239,13 +239,8 @@ typedef struct internal_state { + * - I can't count above 4 + */ + +- uInt last_lit; /* running index in l_buf */ +- +- ushf *d_buf; +- /* Buffer for distances. To simplify the code, d_buf and l_buf have +- * the same number of elements. To use different lengths, an extra flag +- * array would be necessary. +- */ ++ uInt sym_next; /* running index in sym_buf */ ++ uInt sym_end; /* symbol table full when sym_next reaches this */ + + ulg opt_len; /* bit length of current block with optimal trees */ + ulg static_len; /* bit length of current block with static trees */ +@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, + + # define _tr_tally_lit(s, c, flush) \ + { uch cc = (c); \ +- s->d_buf[s->last_lit] = 0; \ +- s->l_buf[s->last_lit++] = cc; \ ++ s->sym_buf[s->sym_next++] = 0; \ ++ s->sym_buf[s->sym_next++] = 0; \ ++ s->sym_buf[s->sym_next++] = cc; \ + s->dyn_ltree[cc].Freq++; \ +- flush = (s->last_lit == s->lit_bufsize-1); \ ++ flush = (s->sym_next == s->sym_end); \ + } + # define _tr_tally_dist(s, distance, length, flush) \ + { uch len = (uch)(length); \ + ush dist = (ush)(distance); \ +- s->d_buf[s->last_lit] = dist; \ +- s->l_buf[s->last_lit++] = len; \ ++ s->sym_buf[s->sym_next++] = dist; \ ++ s->sym_buf[s->sym_next++] = dist >> 8; \ ++ s->sym_buf[s->sym_next++] = len; \ + dist--; \ + s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ + s->dyn_dtree[d_code(dist)].Freq++; \ +- flush = (s->last_lit == s->lit_bufsize-1); \ ++ flush = (s->sym_next == s->sym_end); \ + } + #else + # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) +diff --git a/trees.c b/trees.c +index 4f4a65011..decaeb7c3 100644 +--- a/trees.c ++++ b/trees.c +@@ -416,7 +416,7 @@ local void init_block(s) + + s->dyn_ltree[END_BLOCK].Freq = 1; + s->opt_len = s->static_len = 0L; +- s->last_lit = s->matches = 0; ++ s->sym_next = s->matches = 0; + } + + #define SMALLEST 1 +@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) + + Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", + opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, +- s->last_lit)); ++ s->sym_next / 3)); + + if (static_lenb <= opt_lenb) opt_lenb = static_lenb; + +@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) + unsigned dist; /* distance of matched string */ + unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ + { +- s->d_buf[s->last_lit] = (ush)dist; +- s->l_buf[s->last_lit++] = (uch)lc; ++ s->sym_buf[s->sym_next++] = dist; ++ s->sym_buf[s->sym_next++] = dist >> 8; ++ s->sym_buf[s->sym_next++] = lc; + if (dist == 0) { + /* lc is the unmatched char */ + s->dyn_ltree[lc].Freq++; +@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) + s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; + s->dyn_dtree[d_code(dist)].Freq++; + } +- +-#ifdef TRUNCATE_BLOCK +- /* Try to guess if it is profitable to stop the current block here */ +- if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { +- /* Compute an upper bound for the compressed length */ +- ulg out_length = (ulg)s->last_lit*8L; +- ulg in_length = (ulg)((long)s->strstart - s->block_start); +- int dcode; +- for (dcode = 0; dcode < D_CODES; dcode++) { +- out_length += (ulg)s->dyn_dtree[dcode].Freq * +- (5L+extra_dbits[dcode]); +- } +- out_length >>= 3; +- Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", +- s->last_lit, in_length, out_length, +- 100L - out_length*100L/in_length)); +- if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; +- } +-#endif +- return (s->last_lit == s->lit_bufsize-1); +- /* We avoid equality with lit_bufsize because of wraparound at 64K +- * on 16 bit machines and because stored blocks are restricted to +- * 64K-1 bytes. +- */ ++ return (s->sym_next == s->sym_end); + } + + /* =========================================================================== +@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree) + { + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ +- unsigned lx = 0; /* running index in l_buf */ ++ unsigned sx = 0; /* running index in sym_buf */ + unsigned code; /* the code to send */ + int extra; /* number of extra bits to send */ + +- if (s->last_lit != 0) do { +- dist = s->d_buf[lx]; +- lc = s->l_buf[lx++]; ++ if (s->sym_next != 0) do { ++ dist = s->sym_buf[sx++] & 0xff; ++ dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8; ++ lc = s->sym_buf[sx++]; + if (dist == 0) { + send_code(s, lc, ltree); /* send a literal byte */ + Tracecv(isgraph(lc), (stderr," '%c' ", lc)); +@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree) + } + } /* literal or match pair ? */ + +- /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ +- Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, +- "pendingBuf overflow"); ++ /* Check that the overlay between pending_buf and sym_buf is ok: */ ++ Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow"); + +- } while (lx < s->last_lit); ++ } while (sx < s->sym_next); + + send_code(s, END_BLOCK, ltree); + } diff --git a/meta/recipes-core/zlib/zlib_1.2.11.bb b/meta/recipes-core/zlib/zlib_1.2.11.bb index ef9431ae475..bc42cd64e9d 100644 --- a/meta/recipes-core/zlib/zlib_1.2.11.bb +++ b/meta/recipes-core/zlib/zlib_1.2.11.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef6 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ file://ldflags-tests.patch \ + file://CVE-2018-25032.patch \ file://run-ptest \ " UPSTREAM_CHECK_URI = "http://zlib.net/" From 4011526ad7b2c8711038c1729c7fd046cf852ffb Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 31 Mar 2022 16:30:24 +0800 Subject: [PATCH 107/108] lttng-modules: upgrade 2.12.7 -> 2.12.8 Signed-off-by: Anuj Mittal --- .../lttng/{lttng-modules_2.12.7.bb => lttng-modules_2.12.8.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/lttng/{lttng-modules_2.12.7.bb => lttng-modules_2.12.8.bb} (94%) diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.12.7.bb b/meta/recipes-kernel/lttng/lttng-modules_2.12.8.bb similarity index 94% rename from meta/recipes-kernel/lttng/lttng-modules_2.12.7.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.12.8.bb index 5eb3902bb32..eff97f27af2 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.12.7.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.12.8.bb @@ -13,7 +13,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ " -SRC_URI[sha256sum] = "32ab2d17d513cd2f458f8844c66a0d013283301fc7329b55d6503153cf8cb253" +SRC_URI[sha256sum] = "1302005a982fd4a15cc4843866971008546939f65660023d7762aa046d4b9213" export INSTALL_MOD_DIR="kernel/lttng-modules" From fbbb689c8df7f82644b8a9bc5bb6884bc6516660 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 19 Mar 2022 23:00:15 +0000 Subject: [PATCH 108/108] toaster: Fix broken overrides usage This fixes data corruption issues with toaster where image data wasn't being processed correct. Signed-off-by: Richard Purdie --- meta/classes/toaster.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 9518ddf7a4e..f365c091420 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -101,12 +101,12 @@ def _toaster_load_pkgdatafile(dirpath, filepath): for line in fin: try: kn, kv = line.strip().split(": ", 1) - m = re.match(r"^PKG_([^A-Z:]*)", kn) + m = re.match(r"^PKG:([^A-Z:]*)", kn) if m: pkgdata['OPKGN'] = m.group(1) - kn = "_".join([x for x in kn.split("_") if x.isupper()]) - pkgdata[kn] = kv.strip() - if kn == 'FILES_INFO': + kn = kn.split(":")[0] + pkgdata[kn] = kv + if kn.startswith('FILES_INFO'): pkgdata[kn] = json.loads(kv) except ValueError: