Skip to content

[rocky8_10] History Rebuild through kernel-4.18.0-553.155.1.el8_10 - #1525

Merged
PlaidCat merged 4 commits into
rocky8_10from
rocky8_10_rebuild
Aug 14, 2026
Merged

[rocky8_10] History Rebuild through kernel-4.18.0-553.155.1.el8_10#1525
PlaidCat merged 4 commits into
rocky8_10from
rocky8_10_rebuild

Conversation

@PlaidCat

@PlaidCat PlaidCat commented Aug 11, 2026

Copy link
Copy Markdown
Collaborator

This is an automated kernel history rebuild using cron and internal tooling. It follows the same process used for previous history rebuilds:

  • Download all unprocessed src.rpm packages
  • For each src.rpm:
    • Identify all commits in the changelog up to the last known tag (4.18.0-553)
    • Replay commits in chronological order (oldest to newest in the changelog) using git cherry-pick
    • Replace the code in the branch with the output of rpmbuild -bp for the corresponding src.rpm
    • Tag the rebuild branch

JIRA Tickets

Rebuild Splat Inspection

kernel-4.18.0-553.155.1.el8_10

$ cat ciq/ciq_backports/kernel-4.18.0-553.155.1.el8_10/rebuild.details.txt
Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v4.18~1..kernel-mainline: 625874
Number of commits in rpm: 8
Number of commits matched with upstream: 2 (25.00%)
Number of commits in upstream but not in rpm: 625872
Number of commits NOT found in upstream: 6 (75.00%)

Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.155.1.el8_10 for kernel-4.18.0-553.155.1.el8_10
Clean Cherry Picks: 1 (50.00%)
Empty Cherry Picks: 1 (50.00%)
_______________________________

__EMPTY COMMITS__________________________
08841b06fa64d8edbd1a21ca6e613420c90cc4b8 udf: fix partition descriptor append bookkeeping

__CHANGES NOT IN UPSTREAM________________
Adding prod certs and changed cert date to 20210620
Adding Rocky secure boot certs
Fixing vmlinuz removal
Fixing UEFI CA path
Porting to 8.10, debranding and Rocky branding
Fixing pesign_key_name values

kernel-4.18.0-553.154.1.el8_10

$ cat ciq/ciq_backports/kernel-4.18.0-553.154.1.el8_10/rebuild.details.txt
Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v4.18~1..kernel-mainline: 625874
Number of commits in rpm: 8
Number of commits matched with upstream: 0 (0.00%)
Number of commits in upstream but not in rpm: 625874
Number of commits NOT found in upstream: 8 (100.00%)

Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.154.1.el8_10 for kernel-4.18.0-553.154.1.el8_10
Clean Cherry Picks: 0 (0.00%)
Empty Cherry Picks: 0 (0.00%)
_______________________________

__EMPTY COMMITS__________________________

__CHANGES NOT IN UPSTREAM________________
Adding prod certs and changed cert date to 20210620
Adding Rocky secure boot certs
Fixing vmlinuz removal
Fixing UEFI CA path
Porting to 8.10, debranding and Rocky branding
Fixing pesign_key_name values
iio: event: Fix event FIFO reset race
redhat: add kmap.py tool and kernel-kmap-internal package

BUILD

$ grep -E -B 5 -A 5 "\[TIMER\]|^Starting Build" $(ls -t kbuild* | head -n1)
/mnt/code/kernel-src-tree-build
Running make mrproper...
  CLEAN   scripts/basic
  CLEAN   scripts/kconfig
[TIMER]{MRPROPER}: 5s
x86_64 architecture detected, copying config
'configs/kernel-x86_64.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-rocky8_10_rebuild-61735e8b3944"
Making olddefconfig
--
  HOSTLD  scripts/kconfig/conf
scripts/kconfig/conf  --olddefconfig Kconfig
#
# configuration written to .config
#
Starting Build
scripts/kconfig/conf  --syncconfig Kconfig
  SYSTBL  arch/x86/include/generated/asm/syscalls_32.h
  SYSHDR  arch/x86/include/generated/asm/unistd_32_ia32.h
  SYSHDR  arch/x86/include/generated/asm/unistd_64_x32.h
  SYSTBL  arch/x86/include/generated/asm/syscalls_64.h
--
  LD [M]  sound/usb/usx2y/snd-usb-usx2y.ko
  LD [M]  sound/virtio/virtio_snd.ko
  LD [M]  sound/x86/snd-hdmi-lpe-audio.ko
  LD [M]  sound/xen/snd_xen_front.ko
  LD [M]  virt/lib/irqbypass.ko
[TIMER]{BUILD}: 1552s
Making Modules
  INSTALL arch/x86/crypto/blowfish-x86_64.ko
  INSTALL arch/x86/crypto/camellia-aesni-avx-x86_64.ko
  INSTALL arch/x86/crypto/camellia-aesni-avx2.ko
  INSTALL arch/x86/crypto/camellia-x86_64.ko
--
  INSTALL sound/virtio/virtio_snd.ko
  INSTALL sound/x86/snd-hdmi-lpe-audio.ko
  INSTALL sound/xen/snd_xen_front.ko
  INSTALL virt/lib/irqbypass.ko
  DEPMOD  4.18.0-rocky8_10_rebuild-61735e8b3944+
[TIMER]{MODULES}: 12s
Making Install
sh ./arch/x86/boot/install.sh 4.18.0-rocky8_10_rebuild-61735e8b3944+ arch/x86/boot/bzImage \
	System.map "/boot"
[TIMER]{INSTALL}: 21s
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-4.18.0-rocky8_10_rebuild-61735e8b3944+ and Index to 0
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 5s
[TIMER]{BUILD}: 1552s
[TIMER]{MODULES}: 12s
[TIMER]{INSTALL}: 21s
[TIMER]{TOTAL} 1595s
Rebooting in 10 seconds

KSelfTests

$ get_kselftest_diff.sh
ls: cannot access 'selftest-*': No such file or directory
kselftest.4.18.0-rocky8_10_rebuild-38a54b766f84+.log
206
kselftest.4.18.0-rocky8_10_rebuild-0abcbab2ac76+.log
206
kselftest.4.18.0-rocky8_10_rebuild-b435f20084c8+.log
206
kselftest.4.18.0-rocky8_10_rebuild-61735e8b3944+.log
206
Before: kselftest.4.18.0-rocky8_10_rebuild-b435f20084c8+.log
After: kselftest.4.18.0-rocky8_10_rebuild-61735e8b3944+.log
Diff:
No differences found.

Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v4.18~1..kernel-mainline: 625874
Number of commits in rpm: 8
Number of commits matched with upstream: 0 (0.00%)
Number of commits in upstream but not in rpm: 625874
Number of commits NOT found in upstream: 8 (100.00%)

Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.154.1.el8_10 for kernel-4.18.0-553.154.1.el8_10
Clean Cherry Picks: 0 (0.00%)
Empty Cherry Picks: 0 (0.00%)
_______________________________

Full Details Located here:
ciq/ciq_backports/kernel-4.18.0-553.154.1.el8_10/rebuild.details.txt

Includes:
* git commit header above
* Empty Commits with upstream SHA
* RPM ChangeLog Entries that could not be matched

Individual Empty Commit failures contained in the same containing directory.
The git message for empty commits will have the path for the failed commit.
File names are the first 8 characters of the upstream SHA
@PlaidCat PlaidCat self-assigned this Aug 11, 2026
@PlaidCat
PlaidCat requested review from a team August 11, 2026 10:47
bmastbergen
bmastbergen previously approved these changes Aug 11, 2026

@bmastbergen bmastbergen left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥌

jira KERNEL-1484
cve CVE-2026-53009
Rebuild_History Non-Buildable kernel-4.18.0-553.155.1.el8_10
commit-author Michal Schmidt <mschmidt@redhat.com>
commit 1a303ba

If ice_tso() or ice_tx_csum() fail, the error path in
ice_xmit_frame_ring() frees the skb, but the 'first' tx_buf still points
to it and is marked as valid (ICE_TX_BUF_SKB).
'next_to_use' remains unchanged, so the potential problem will
likely fix itself when the next packet is transmitted and the tx_buf
gets overwritten. But if there is no next packet and the interface is
brought down instead, ice_clean_tx_ring() -> ice_unmap_and_free_tx_buf()
will find the tx_buf and free the skb for the second time.

The fix is to reset the tx_buf type to ICE_TX_BUF_EMPTY in the error
path, so that ice_unmap_and_free_tx_buf().
Move the initialization of 'first' up, to ensure it's already valid in
case we hit the linearization error path.

The bug was spotted by AI while I had it looking for something else.
It also proposed an initial version of the patch.

I reproduced the bug and tested the fix by adding code to inject
failures, on a build with KASAN.

I looked for similar bugs in related Intel drivers and did not find any.

Fixes: d76a60b ("ice: Add support for VLANs and offloads")
Assisted-by: Claude:claude-4.6-opus-high Cursor
	Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
	Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/20260416-iwl-net-submission-2026-04-14-v2-4-686c33c9828d@intel.com
	Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit 1a303ba)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
jira KERNEL-1484
cve CVE-2026-45991
Rebuild_History Non-Buildable kernel-4.18.0-553.155.1.el8_10
commit-author Seohyeon Maeng <bioloidgp@gmail.com>
commit 08841b0
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
Will be included in final tarball splat. Ref for failed cherry-pick at:
ciq/ciq_backports/kernel-4.18.0-553.155.1.el8_10/08841b06.failed

Mounting a crafted UDF image with repeated partition descriptors can
trigger a heap out-of-bounds write in part_descs_loc[].

handle_partition_descriptor() deduplicates entries by partition number,
but appended slots never record partnum. As a result duplicate
Partition Descriptors are appended repeatedly and num_part_descs keeps
growing.

Once the table is full, the growth path still sizes the allocation from
partnum even though inserts are indexed by num_part_descs. If partnum is
already aligned to PART_DESC_ALLOC_STEP, ALIGN(partnum, step) can keep
the old capacity and the next append writes past the end of the table.

Store partnum in the appended slot and size growth from the next append
count so deduplication and capacity tracking follow the same model.

Fixes: ee4af50 ("udf: Fix mounting of Win7 created UDF filesystems")
	Cc: stable@vger.kernel.org
	Signed-off-by: Seohyeon Maeng <bioloidgp@gmail.com>
Link: https://patch.msgid.link/20260310081652.21220-1-bioloidgp@gmail.com
	Signed-off-by: Jan Kara <jack@suse.cz>
(cherry picked from commit 08841b0)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>

# Conflicts:
#	fs/udf/super.c
Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v4.18~1..kernel-mainline: 625874
Number of commits in rpm: 8
Number of commits matched with upstream: 2 (25.00%)
Number of commits in upstream but not in rpm: 625872
Number of commits NOT found in upstream: 6 (75.00%)

Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.155.1.el8_10 for kernel-4.18.0-553.155.1.el8_10
Clean Cherry Picks: 1 (50.00%)
Empty Cherry Picks: 1 (50.00%)
_______________________________

Full Details Located here:
ciq/ciq_backports/kernel-4.18.0-553.155.1.el8_10/rebuild.details.txt

Includes:
* git commit header above
* Empty Commits with upstream SHA
* RPM ChangeLog Entries that could not be matched

Individual Empty Commit failures contained in the same containing directory.
The git message for empty commits will have the path for the failed commit.
File names are the first 8 characters of the upstream SHA

@bmastbergen bmastbergen left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥌

@PlaidCat PlaidCat changed the title [rocky8_10] History Rebuild through kernel-4.18.0-553.154.1.el8_10 [rocky8_10] History Rebuild through kernel-4.18.0-553.155.1.el8_10 Aug 14, 2026
@PlaidCat
PlaidCat requested a review from a team August 14, 2026 17:32
@PlaidCat
PlaidCat merged commit 6b14565 into rocky8_10 Aug 14, 2026
2 checks passed
@PlaidCat
PlaidCat deleted the rocky8_10_rebuild branch August 14, 2026 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants