From 6a4478ccea790a9b51d5630a4469f4337e72009b Mon Sep 17 00:00:00 2001 From: chenyi Date: Tue, 2 Jul 2024 22:07:37 -0400 Subject: [PATCH] release 4.19.90-2407.1.0 --- SOURCE | 2 +- kernel.spec | 94 ++++++++++++++++++- ...-limit-number-of-hw-queues-by-nr_cpu.patch | 52 ---------- ...-Collection-table-support-muti-pages.patch | 40 -------- series.conf | 2 - 5 files changed, 93 insertions(+), 97 deletions(-) delete mode 100644 patches/0117-scsi-virtio_scsi-limit-number-of-hw-queues-by-nr_cpu.patch delete mode 100644 patches/0645-irqchip-gic-v3-Collection-table-support-muti-pages.patch diff --git a/SOURCE b/SOURCE index 4672833..b9730d4 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -4.19.90-2406.4.0 +4.19.90-2407.1.0 diff --git a/kernel.spec b/kernel.spec index 14cbd5d..7a73c8e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -12,7 +12,7 @@ %global KernelVer %{version}-%{release}.%{_target_cpu} -%global hulkrelease 2406.4.0 +%global hulkrelease 2407.1.0 %define with_patch 1 @@ -32,7 +32,7 @@ Name: kernel Version: 4.19.90 -Release: %{hulkrelease}.0283 +Release: %{hulkrelease}.0284 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ @@ -850,6 +850,96 @@ fi %changelog +* Tue Jul 02 2024 chenyi - 4.19.90-2407.1.0.0284 +- !9629 stm class: Fix a double free in stm_register_device() +- !9646 phonet: fix rtm_phonet_notify() skb allocation +- !9628 m68k: Fix spinlock race in kernel thread creation +- !9623 v2 net/nfc/rawsock.c: fix a permission check bug +- !9648 backport two patches from 5.10 to fix some bugs for GuestOS +- !9617 mac80211: track only QoS data frames for admission control +- !9637 ipv6: sr: fix invalid unregister error path +- !9607 enic: Validate length of nl attributes in enic_set_vf_port +- !9606 drm/nouveau: fix off by one in BIOS boundary checking +- !9605 scsi: bfa: Ensure the copied buf is NUL terminated +- irqchip: gic-v3: Collection table support muti pages +- scsi: virtio_scsi: limit number of hw queues by nr_cpu_ids +- phonet: fix rtm_phonet_notify() skb allocation +- ipv6: sr: fix invalid unregister error path +- stm class: Fix a double free in stm_register_device() +- m68k: Fix spinlock race in kernel thread creation +- !9076 RDMA/cma: Ensure rdma_addr_cancel() happens before issuing more requests +- net/nfc/rawsock.c: fix a permission check bug +- mac80211: track only QoS data frames for admission control +- enic: Validate length of nl attributes in enic_set_vf_port +- drm/nouveau: fix off by one in BIOS boundary checking +- !9600 CVE-2024-38597 +- scsi: bfa: Ensure the copied buf is NUL terminated +- !9409 drm/mediatek: Add 0 size check to mtk_drm_gem_obj +- !9452 jffs2: prevent xattr node from overflowing the eraseblock +- eth: sungem: remove .ndo_poll_controller to avoid deadlocks +- net: fec: remove .ndo_poll_controller to avoid deadlocks +- !8163 v2 mmc: sdio: fix possible resource leaks in some error paths +- !9535 igbvf: fix double free in `igbvf_probe` +- !9590 s390/ap: Fix crash in AP internal function modify_bitmap() +- !9584 ipvlan: Dont Use skb->sk in ipvlan_process_v{4,6}_outbound +- !9537 virtio: delete vq in vp_find_vqs_msix() when request_irq() fails +- !9585 net/mlx5e: Avoid field-overflowing memcpy() +- s390/ap: Fix crash in AP internal function modify_bitmap() +- net/mlx5e: Avoid field-overflowing memcpy() +- ipvlan: Dont Use skb->sk in ipvlan_process_v{4,6}_outbound +- !9534 rpmsg: char: Fix race between the release of rpmsg_ctrldev and cdev +- !9419 mm/migrate: set swap entry values of THP tail pages properly. +- !9560 net: systemport: Add global locking for descriptor lifecycle +- !9526 media: lgdt3306a: Add a check against null-pointer-def +- !9539 ext4: fix mb_cache_entry's e_refcnt leak in ext4_xattr_block_cache_find() +- net: systemport: Add global locking for descriptor lifecycle +- !9340 serial: max3100: Lock port->lock when calling uart_handle_cts_change() +- !9330 ASoC: ops: Reject out of bounds values in snd_soc_put_xr_sx() +- !9382 serial: max3100: Update uart_driver_registered on driver removal +- !9503 v2 watchdog: cpu5wdt.c: Fix use-after-free bug caused by cpu5wdt_trigger +- !9464 quota: Fix rcu annotations of inode dquot pointers +- !9530 v2 Backport LTS patches +- ext4: fix mb_cache_entry's e_refcnt leak in ext4_xattr_block_cache_find() +- virtio: delete vq in vp_find_vqs_msix() when request_irq() fails +- !9435 fix CVE-2024-38621 +- igbvf: fix double free in `igbvf_probe` +- rpmsg: char: Fix race between the release of rpmsg_ctrldev and cdev +- !9381 vfio/pci: fix potential memory leak in vfio_intx_enable() +- !9497 netrom: fix possible dead-lock in nr_rt_ioctl() +- pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map() +- pinctrl: devicetree: fix null pointer dereferencing in pinctrl_dt_to_map +- media: lgdt3306a: Add a check against null-pointer-def +- !9505 CVE-2024-38587 +- !9473 um: Add winch to winch_handlers before registering winch IRQ +- !9407 drm/arm/malidp: fix a possible null pointer dereference +- !9400 Fix CVE-2024-31076 +- speakup: Fix sizeof() vs ARRAY_SIZE() bug +- !9439 CVE-2022-48715 +- !9133 net: ethernet: fix potential use-after-free in ec_bhf_remove +- watchdog: cpu5wdt.c: Fix use-after-free bug caused by cpu5wdt_trigger +- netrom: fix possible dead-lock in nr_rt_ioctl() +- !9265 ring-buffer: Fix a race between readers and resize checks +- !9390 NFS: Fix an off by one in root_nfs_cat() +- um: Add winch to winch_handlers before registering winch IRQ +- quota: Fix rcu annotations of inode dquot pointers +- fs/quota: erase unused but set variable warning +- jffs2: prevent xattr node from overflowing the eraseblock +- scsi: bnx2fc: Make bnx2fc_recv_frame() mp safe +- media: stk1160: fix bounds checking in stk1160_copy_video() +- mm/migrate: set swap entry values of THP tail pages properly. +- drm/mediatek: Add 0 size check to mtk_drm_gem_obj +- drm/arm/malidp: fix a possible null pointer dereference +- genirq/cpuhotplug, x86/vector: Prevent vector leak during CPU offline +- NFS: Fix an off by one in root_nfs_cat() +- serial: max3100: Update uart_driver_registered on driver removal +- vfio/pci: fix potential memory leak in vfio_intx_enable() +- serial: max3100: Lock port->lock when calling uart_handle_cts_change() +- ASoC: ops: Reject out of bounds values in snd_soc_put_xr_sx() +- ring-buffer: Fix a race between readers and resize checks +- net: ethernet: fix potential use-after-free in ec_bhf_remove +- RDMA/cma: Ensure rdma_addr_cancel() happens before issuing more requests +- mmc: sdio: fix possible resource leaks in some error paths + * Wed Jun 26 2024 chenyi - 4.19.90-2406.4.0.0283 - !9471 CVE-2021-47434 - xhci: Fix commad ring abort, write all 64 bits to CRCR register. diff --git a/patches/0117-scsi-virtio_scsi-limit-number-of-hw-queues-by-nr_cpu.patch b/patches/0117-scsi-virtio_scsi-limit-number-of-hw-queues-by-nr_cpu.patch deleted file mode 100644 index 1e3ba27..0000000 --- a/patches/0117-scsi-virtio_scsi-limit-number-of-hw-queues-by-nr_cpu.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0e50e0bfb9bef1d26243038f0714db65a2c0e9a5 Mon Sep 17 00:00:00 2001 -From: Dongli Zhang -Date: Wed, 27 Mar 2019 18:36:35 +0800 -Subject: [PATCH] scsi: virtio_scsi: limit number of hw queues by nr_cpu_ids - -mainline inclusion -from mainline-v5.1-rc2 -commit 1978f30a87732d4d9072a20abeded9fe17884f1b -category: bugfix -bugzilla: https://gitee.com/openeuler/kernel/issues/I8F6P4 -CVE: NA - -Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1978f30a87732d4d9072a20abeded9fe17884f1b - ------------------------------------ - -When tag_set->nr_maps is 1, the block layer limits the number of hw queues -by nr_cpu_ids. No matter how many hw queues are used by virtio-scsi, as it -has (tag_set->nr_maps == 1), it can use at most nr_cpu_ids hw queues. - -In addition, specifically for pci scenario, when the 'num_queues' specified -by qemu is more than maxcpus, virtio-scsi would not be able to allocate -more than maxcpus vectors in order to have a vector for each queue. As a -result, it falls back into MSI-X with one vector for config and one shared -for queues. - -Considering above reasons, this patch limits the number of hw queues used -by virtio-scsi by nr_cpu_ids. - -Reviewed-by: Stefan Hajnoczi -Signed-off-by: Dongli Zhang -Signed-off-by: Jens Axboe -Signed-off-by: Kunkun Jiang ---- - drivers/scsi/virtio_scsi.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c -index 8118c06f491b..ba84514b662a 100644 ---- a/drivers/scsi/virtio_scsi.c -+++ b/drivers/scsi/virtio_scsi.c -@@ -858,6 +858,7 @@ static int virtscsi_probe(struct virtio_device *vdev) - - /* We need to know how many queues before we allocate. */ - num_queues = virtscsi_config_get(vdev, num_queues) ? : 1; -+ num_queues = min_t(unsigned int, nr_cpu_ids, num_queues); - - num_targets = virtscsi_config_get(vdev, max_target) + 1; - --- -2.27.0 - diff --git a/patches/0645-irqchip-gic-v3-Collection-table-support-muti-pages.patch b/patches/0645-irqchip-gic-v3-Collection-table-support-muti-pages.patch deleted file mode 100644 index b61cfc7..0000000 --- a/patches/0645-irqchip-gic-v3-Collection-table-support-muti-pages.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 182c9a59569b2f7adcd0473a1871a9899224d95d Mon Sep 17 00:00:00 2001 -From: wangwudi -Date: Mon, 12 Jun 2023 22:51:24 +0800 -Subject: [PATCH 1/2] irqchip: gic-v3: Collection table support muti pages - -driver inclusion -category: bugfix -bugzilla: https://gitee.com/openeuler/kernel/issues/I7CX6S -CVE: NA - --------------------------------------------------------------------------- - -Only one page is allocated to the collection table. -Recalculate the page number of collection table based on the number of -CPUs. - -Signed-off-by: wangwudi -Signed-off-by: Shengwei Luo ---- - drivers/irqchip/irq-gic-v3-its.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c -index 73ce248da42c..46012ad327e7 100644 ---- a/drivers/irqchip/irq-gic-v3-its.c -+++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -2180,6 +2180,10 @@ static int its_alloc_tables(struct its_node *its) - indirect = its_parse_indirect_baser(its, baser, &order, - ITS_MAX_VPEID_BITS); - break; -+ case GITS_BASER_TYPE_COLLECTION: -+ indirect = its_parse_indirect_baser(its, baser, &order, -+ order_base_2(num_possible_cpus())); -+ break; - } - - err = its_setup_baser(its, baser, cache, shr, order, indirect); --- -2.27.0 - diff --git a/series.conf b/series.conf index 5dddf12..1343b9b 100644 --- a/series.conf +++ b/series.conf @@ -117,7 +117,6 @@ patches/0113-perf-auxtrace-arm-Refactor-event-list-iteration-in-a.patch patches/0114-perf-auxtrace-arm64-Add-support-for-HiSilicon-PCIe-T.patch patches/0115-perf-auxtrace-arm64-Add-support-for-parsing-HiSilico.patch patches/0116-Fix-the-header-file-location-error-and-adjust-the-fu.patch -patches/0117-scsi-virtio_scsi-limit-number-of-hw-queues-by-nr_cpu.patch patches/0118-perf-stat-Introduce-perf_evlist__print_counters.patch patches/0119-perf-stat-Move-STAT_RECORD-out-of-perf_evlist__print.patch patches/0120-perf-stat-Add-struct-perf_stat_config-argument-to-pe.patch @@ -645,7 +644,6 @@ patches/0641-Fallback-ethtool-about-nla_-Modification-of-kabi-cha.patch patches/0642-net-hns3-Fix-Kabi-issue-caused-by-ptp-introducing-ge.patch patches/0643-net-hns3-Fix-ethtool_-Ops-gen_-Improper-modification.patch patches/0644-net-hns3-Fix-unreasonable-modifications-caused-by-ro.patch -patches/0645-irqchip-gic-v3-Collection-table-support-muti-pages.patch patches/0646-genirq-Increase-the-number-of-IRQ-descriptors.patch patches/0647-cpufreq-change-.set_boost-to-act-on-one-policy.patch patches/0648-cpufreq-CPPC-add-SW-BOOST-support.patch