diff --git a/SOURCE b/SOURCE index 4b248704b90c4ae589e2a32235d958e6b301f0a3..44d3dfa3d129781103010ea9c6a265ec1fbd712b 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -4.19.90-2409.4.0 +4.19.90-2409.5.0 diff --git a/kernel.spec b/kernel.spec index 256b01410a49a4720a972555b146be774dd31f16..48257184d01d00081c7c613623ce0f3b9413f027 100644 --- a/kernel.spec +++ b/kernel.spec @@ -12,7 +12,7 @@ %global KernelVer %{version}-%{release}.%{_target_cpu} -%global hulkrelease 2409.4.0 +%global hulkrelease 2409.5.0 %define with_patch 1 @@ -32,7 +32,7 @@ Name: kernel Version: 4.19.90 -Release: %{hulkrelease}.0296 +Release: %{hulkrelease}.0297 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ @@ -850,6 +850,46 @@ fi %changelog +* Wed Sep 25 2024 chenyi - 4.19.90-2409.5.0.0297 +- !11734 Input: MT - limit max slots +- !11722 Squashfs: sanity check symbolic link size +- !11697 Fix iBMA bug and change version +- !11700 x86/mm: Fix pti_clone_pgtable() alignment assumption +- Input: MT - limit max slots +- Squashfs: sanity check symbolic link size +- x86/mm: Fix pti_clone_pgtable() alignment assumption +- BMA: Fix edma driver initialization problem and change the version number. +- !11671 v4 HID: cougar: fix slab-out-of-bounds Read in cougar_report_fixup +- HID: cougar: fix slab-out-of-bounds Read in cougar_report_fixup +- !11645 block: backport debugfs patches +- !11544 Fix CVE-2024-45025 +- !11560 mm/ksm: fix possible UAF of stable_node +- !11652 media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()" +- media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()" +- block: fix kabi broken in struct request_queue +- block: protect blk_mq_debugfs_register/unregister_hctx() with 'debugfs_mutex' +- block: shutdown blktrace in blk_release_queue() +- block: remove per-disk debugfs files in blk_unregister_queue +- block: serialize all debugfs operations using q->debugfs_mutex +- blk-mq: Fix spurious debugfs directory creation during initialization +- block: create the request_queue debugfs_dir on registration +- blk-mq: don't create hctx debugfs dir until q->debugfs_dir is created +- blk-mq: fix up placement of debugfs directory of queue files +- blk-mq: no need to check return value of debugfs_create functions +- blktrace: annotate required lock on do_blk_trace_setup() +- blktrace: Avoid sparse warnings when assigning q->blk_trace +- blktrace: break out of blktrace setup on concurrent calls +- !11616 mmc: mmc_test: Fix NULL dereference on allocation failure +- !11610 Input: uinput - reject requests with unreasonable number of slots +- mmc: mmc_test: Fix NULL dereference on allocation failure +- Input: uinput - reject requests with unreasonable number of slots +- !11596 gtp: pull network headers in gtp_dev_xmit() +- gtp: pull network headers in gtp_dev_xmit() +- mm/ksm: fix possible UAF of stable_node +- fix bitmap corruption on close_range() with CLOSE_RANGE_UNSHARE +- s390/cio: rename bitmap_size() -> idset_bitmap_size() +- bitmap: introduce generic optimized bitmap_size() + * Tue Sep 23 2024 yushi - 4.19.90-2409.4.0.0296 - net/core: Replace driver version to be kernel version diff --git a/patches/0117-tools.patch b/patches/0117-tools.patch new file mode 100644 index 0000000000000000000000000000000000000000..c8b6e1563b3a651e12d8b3ad53821bb9eb0782dc --- /dev/null +++ b/patches/0117-tools.patch @@ -0,0 +1,64 @@ +From 587aa96d691eee7dd2eab8b5f8e926074759aa7c Mon Sep 17 00:00:00 2001 +From: Long Li +Date: Wed, 25 Sep 2024 19:14:05 +0800 +Subject: [PATCH] tools: fix implicit declaration of function __ALIGN_KERNEL +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +hulk inclusion +category: bugfix +bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAQOJ9 +CVE: NA + +---------------------------------------- + +After mergerd commit "bitmap: introduce generic optimizedbitmap_size()", +When compiling tools/perf, I encountered the following error. I reverted +the changes that added bitmap_size() in tools/include/linux/bitmap.h. +There are no functional changes. + + error: implicit declaration of function \ + ‘__ALIGN_KERNEL’ [-Werror=implicit-function-declaration] + #define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) + +Fixes: 9e8111c56a25 ("bitmap: introduce generic optimized bitmap_size()") +Signed-off-by: Long Li +--- + tools/include/linux/bitmap.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h +index 3aeeb60f19882..3517972c259ed 100644 +--- a/tools/include/linux/bitmap.h ++++ b/tools/include/linux/bitmap.h +@@ -27,14 +27,14 @@ int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, + #define small_const_nbits(nbits) \ + (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG) + +-#define bitmap_size(nbits) (ALIGN(nbits, BITS_PER_LONG) / BITS_PER_BYTE) +- + static inline void bitmap_zero(unsigned long *dst, int nbits) + { + if (small_const_nbits(nbits)) + *dst = 0UL; + else { +- memset(dst, 0, bitmap_size(nbits)); ++ int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long); ++ ++ memset(dst, 0, len); + } + } + +@@ -120,7 +120,7 @@ static inline int test_and_clear_bit(int nr, unsigned long *addr) + */ + static inline unsigned long *bitmap_alloc(int nbits) + { +- return calloc(1, bitmap_size(nbits)); ++ return calloc(1, BITS_TO_LONGS(nbits) * sizeof(unsigned long)); + } + + /* +-- +Gitee + diff --git a/series.conf b/series.conf index c629a7d387386c440f0932a0d53baeac816ca2ac..b364f81a69d23575bc841b31bcf5316e495240a6 100644 --- a/series.conf +++ b/series.conf @@ -117,6 +117,7 @@ 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-tools.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