Skip to content

Conversation

PlaidCat
Copy link
Collaborator

@PlaidCat PlaidCat commented Jun 2, 2025

General Process:

Checking Rebuild Commits for Potentially missing commits:

kernel-4.18.0-553.54.1

commit 7cca5c1483986eb8fe0b81b7b407dca362895192
Author: Jonathan Maple <[email protected]>
Date:   Mon Jun 2 17:25:16 2025 -0400

    wifi: rtw89: Fix array index mistake in rtw89_sta_info_get_iter()

    jira NONE_AUTOMATION
    cve CVE-2024-43842
    Rebuild_History Non-Buildable kernel-4.18.0-553.54.1.el8_10
    commit-author Aleksandr Mishin <[email protected]>
    commit 85099c7ce4f9e64c66aa397cd9a37473637ab891

    In rtw89_sta_info_get_iter() 'status->he_gi' is compared to array size.
    But then 'rate->he_gi' is used as array index instead of 'status->he_gi'.
    This can lead to go beyond array boundaries in case of 'rate->he_gi' is
    not equal to 'status->he_gi' and is bigger than array size. Looks like
    "copy-paste" mistake.
[jmaple@devbox kernel-src-tree]$ cat ciq/ciq_backports/kernel-4.18.0-553.54.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: 540031
Number of commits in rpm: 9
Number of commits matched with upstream: 2 (22.22%)
Number of commits in upstream but not in rpm: 540029
Number of commits NOT found in upstream: 7 (77.78%)

Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.54.1.el8_10 for kernel-4.18.0-553.54.1.el8_10
Clean Cherry Picks: 2 (100.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
sched/rt: Fix race in push_rt_task

Build

[jmaple@devbox code]$ egrep -B 5 -A 5 "\[TIMER\]|^Starting Build" kbuild.resf_kernel-4.18.0-553.54.1.el8_10.log
/mnt/code/kernel-src-tree-build
no .config file found, moving on
[TIMER]{MRPROPER}: 0s
x86_64 architecture detected, copying config
'configs/kernel-x86_64.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-rocky8_10_rebuild-6f9106f46020"
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}: 1971s
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/xen/snd_xen_front.ko
  INSTALL sound/x86/snd-hdmi-lpe-audio.ko
  INSTALL virt/lib/irqbypass.ko
  DEPMOD  4.18.0-rocky8_10_rebuild-6f9106f46020+
[TIMER]{MODULES}: 15s
Making Install
sh ./arch/x86/boot/install.sh 4.18.0-rocky8_10_rebuild-6f9106f46020+ arch/x86/boot/bzImage \
	System.map "/boot"
[TIMER]{INSTALL}: 21s
Checking kABI
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-4.18.0-rocky8_10_rebuild-6f9106f46020+ and Index to 4
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 0s
[TIMER]{BUILD}: 1971s
[TIMER]{MODULES}: 15s
[TIMER]{INSTALL}: 21s
[TIMER]{TOTAL} 2013s
Rebooting in 10 seconds

KSelfTests

[jmaple@devbox code]$ ls kselftest.4.18.0-rocky8_10_rebuild-32f87806bbd4+.log kselftest.4.18.0-rocky8_10_rebuild-6f9106f46020+.log | while read line; do echo $line; grep '^ok ' $line | wc -l; done
kselftest.4.18.0-rocky8_10_rebuild-32f87806bbd4+.log
206
kselftest.4.18.0-rocky8_10_rebuild-6f9106f46020+.log
205

PlaidCat added 3 commits June 2, 2025 17:25
jira NONE_AUTOMATION
cve CVE-2024-43842
Rebuild_History Non-Buildable kernel-4.18.0-553.54.1.el8_10
commit-author Aleksandr Mishin <[email protected]>
commit 85099c7

In rtw89_sta_info_get_iter() 'status->he_gi' is compared to array size.
But then 'rate->he_gi' is used as array index instead of 'status->he_gi'.
This can lead to go beyond array boundaries in case of 'rate->he_gi' is
not equal to 'status->he_gi' and is bigger than array size. Looks like
"copy-paste" mistake.

Fix this mistake by replacing 'rate->he_gi' with 'status->he_gi'.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: e3ec701 ("rtw89: add Realtek 802.11ax driver")
	Signed-off-by: Aleksandr Mishin <[email protected]>
	Signed-off-by: Ping-Ke Shih <[email protected]>
Link: https://patch.msgid.link/[email protected]
(cherry picked from commit 85099c7)
	Signed-off-by: Jonathan Maple <[email protected]>
jira NONE_AUTOMATION
Rebuild_History Non-Buildable kernel-4.18.0-553.54.1.el8_10
commit-author Przemek Kitszel <[email protected]>
commit 257310e

Simplify stats accumulation logic to fix the case where we don't take
previous stat value into account, we should always respect it.

Main netdev stats of our PF (Tx/Rx packets/bytes) were reported orders of
magnitude too big during OpenStack reconfiguration events, possibly other
reconfiguration cases too.

The regression was reported to be between 6.1 and 6.2, so I was almost
certain that on of the two "preserve stats over reset" commits were the
culprit. While reading the code, it was found that in some cases we will
increase the stats by arbitrarily large number (thanks to ignoring "-prev"
part of condition, after zeroing it).

Note that this fixes also the case where we were around limits of u64, but
that was not the regression reported.

Full disclosure: I remember suggesting this particular piece of code to
Ben a few years ago, so blame on me.

Fixes: 2fd5e43 ("ice: Accumulate HW and Netdev statistics over reset")
	Reported-by: Nebojsa Stevanovic <[email protected]>
Link: https://lore.kernel.org/intel-wired-lan/VI1PR02MB439744DEDAA7B59B9A2833FE912EA@VI1PR02MB4397.eurprd02.prod.outlook.com
	Reported-by: Christian Rohmann <[email protected]>
Link: https://lore.kernel.org/intel-wired-lan/[email protected]
	Reviewed-by: Jacob Keller <[email protected]>
	Signed-off-by: Przemek Kitszel <[email protected]>
	Reviewed-by: Simon Horman <[email protected]>
	Tested-by: Pucha Himasekhar Reddy <[email protected]> (A Contingent worker at Intel)
	Signed-off-by: Tony Nguyen <[email protected]>
(cherry picked from commit 257310e)
	Signed-off-by: Jonathan Maple <[email protected]>
Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v4.18~1..kernel-mainline: 540031
Number of commits in rpm: 9
Number of commits matched with upstream: 2 (22.22%)
Number of commits in upstream but not in rpm: 540029
Number of commits NOT found in upstream: 7 (77.78%)

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

Full Details Located here:
ciq/ciq_backports/kernel-4.18.0-553.54.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 Jun 2, 2025
@PlaidCat PlaidCat changed the title [rocky8_10] History rebuild for _kernel-4.18.0-553.54.1.el8_10 [rocky8_10] History rebuild for kernel-4.18.0-553.54.1.el8_10 Jun 2, 2025
Copy link

@thefossguy-ciq thefossguy-ciq left a comment

Choose a reason for hiding this comment

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

🚤

@jdieter
Copy link

jdieter commented Jun 3, 2025

@PlaidCat, It looks like we're deleting the configs again. Is that expected?

@thefossguy-ciq
Copy link

The CI passes because we do have config files. I think we are removing files with the version suffix. I don't know why. Maple can answer that.

Copy link
Collaborator

@bmastbergen bmastbergen left a comment

Choose a reason for hiding this comment

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

🥌

@PlaidCat
Copy link
Collaborator Author

PlaidCat commented Jun 3, 2025

@PlaidCat, It looks like we're deleting the configs again. Is that expected?

The CI passes because we do have config files. I think we are removing files with the version suffix. I don't know why. Maple can answer that.

The non-versioned ones are the actual ones we need, there are a lot of git actions that are done in the automation which still have yet to be cleaned up.

You as @thefossguy-ciq said the configs are there that we want because the CI ran, but the versioned configs come from the SOURCES/ but the non-versioned ones are the ones that actually ran through make olddef with the cross compiler settings (removes per machine / architecture make olddefconfig issues)
https://github.com/ctrliq/kernel-src-tree/tree/rocky8_10_rebuild/configs

Additionally this program has only had slight updates since the initial "CoPilot and redbull`

@PlaidCat PlaidCat merged commit 6f9106f into rocky8_10 Jun 3, 2025
2 checks passed
@PlaidCat PlaidCat deleted the rocky8_10_rebuild branch June 3, 2025 19:32
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.

4 participants