Skip to content

[ciq-6.18.y] Multiple patches tested (2 commits) #1433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ciq-kernel-automation wants to merge 2 commits into
base: ciq-6.18.y
Choose a base branch
from
Open

[ciq-6.18.y] Multiple patches tested (2 commits) #1433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e6a39b
futex/requeue: Revert "Prevent NULL pointer dereference in remove_wai…
bmastbergen Jul 10, 2026
b1a607d
[CIQ] ciq_kernel-6.18.38-2 - updated spec
bmastbergen Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ciq/SPECS/kernel-clk6.18.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Summary: The Linux kernel
%define kernel_patch 38
%define buildid .1
%define specversion %{kernel_major_minor}.%{kernel_patch}
%define pkgrelease 1%{?buildid}
%define pkgrelease 2%{?buildid}
%define kversion %{lua:print((rpm.expand("%{kernel_major_minor}"):match("^(%d+)")))}

%define tarfile_release %{specversion}-%{pkgrelease}.el%{el_version}
Expand Down Expand Up @@ -4575,6 +4575,10 @@ fi\
#
#
%changelog
* Fri Jul 10 2026 Brett Mastbergen <bmastbergen@ciq.com> - 6.18.38-2.1.el9
-- futex/requeue: Revert "Prevent NULL pointer dereference in remove_waiter() on self-deadlock"" (Brett Mastbergen)
-- Add x86_64 minimal kernel variant to spec (Brett Mastbergen)

* Sun Jul 05 2026 github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> - 6.18.38-1.1.el9
-- Rebased changes for Linux 6.18.38 (https://github.com/ctrliq/kernel-src-tree/releases/tag/ciq_kernel-6.18.38-1)
-- [CIQ] v6.18.36 - updated spec (Brett Mastbergen)
Expand Down
6 changes: 0 additions & 6 deletions kernel/futex/requeue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,12 +643,6 @@ int futex_requeue(u32 __user *uaddr1, unsigned int flags1,
continue;
}

/* Self-deadlock: non-top waiter already owns the PI futex. */
if (rt_mutex_owner(&pi_state->pi_mutex) == this->task) {
ret = -EDEADLK;
break;
}

ret = rt_mutex_start_proxy_lock(&pi_state->pi_mutex,
this->rt_waiter,
this->task);
Expand Down
Loading