sched_ext: Validate cid override before updating tables
Subsystems (3)
PATCH 1/1 sched_ext: Validate cid override before updating tables
scx_bpf_cid_override() currently updates the cid lookup tables as it walks the user supplied mapping. If validation fails midway, earlier entries may remain installed.
Split validation and table updates so a failed override leaves the existing mapping unchanged.
--- kernel/sched/ext/cid.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/sched/ext/cid.c +5 -0
@@ -329,6 +329,11 @@ __bpf_kfunc void scx_bpf_cid_override(const s32 *cpu_to_cid, u32 cpu_to_cid__sz,scx_error (sch,"cid %d assigned to multiple cpus" , c);return ; } + } + +for_each_possible_cpu (cpu) { +s32 c = cpu_to_cid[cpu]; + scx_cpu_to_cid_tbl[cpu] = c; scx_cid_to_cpu_tbl[c] = cpu; }
Signature · 1 line
2.43.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] Splitting the `cpu_to_cid` array validation and update into two loops introduces a critical…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] Splitting the cpu_to_cid array validation and update into two loops introduces a critical double-fetch TOCTOU vulnerability, allowing an out-of-bounds kernel memory write. --
--- Patch [1]: [PATCH] sched_ext: Validate cid override before updating tables --- commit 3a1a6d6109297fa0a7f1d91d2dccc68df1527d12
Author: zhidao su (Xiaomi) <[email protected]>
sched_ext: Validate cid override before updating tables
This patch splits the validation and table updates in scx_bpf_cid_override() into separate loops. This prevents partial table updates if the validation fails midway through the user-supplied mapping.
Quoted 6 lines
kernel/sched/ext/cid.c +0
-0@@ -329,6 +329,11 @@ __bpf_kfunc void scx_bpf_cid_override(const s32 *cpu_to_cid, u32 cpu_to_cid__sz,scx_error (sch,"cid %d assigned to multiple cpus" , c);
kernel/sched/ext/cid.c __bpf_kfunc void scx_bpf_cid_override(const s32 *cpu_to_cid, u32 cpu_to_cid__sz, · line 339
Quoted 10 lines
kernel/sched/ext/cid.c +5
-0return ; } + } + +for_each_possible_cpu (cpu) { +s32 c = cpu_to_cid[cpu]; + scx_cpu_to_cid_tbl[cpu] = c; scx_cid_to_cpu_tbl[c] = cpu; }
[Severity: High]
Can the contents of cpu_to_cid change concurrently between these two loops in scx_bpf_cid_override()?
If cpu_to_cid points to shared memory, such as a BPF map, could another thread or BPF program modify cpu_to_cid[cpu] after it passes the validation in the first loop?
If this happens, the second loop would fetch the unvalidated value and use it as an index for scx_cid_to_cpu_tbl[c], potentially resulting in an out-of-bounds write.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Thanks for the review.
The current in-tree caller passes a BPF .bss array populated by userspacebefore SCX_OPS_LOAD, and doesn't modify it afterwards. The kfunc is alsoonly callable from the root scheduler's ops.init(), so the mapping isexpected to stay stable for the duration of the call. If we later allow a different input source or concurrent mutation duringthe call, we'd need to cache the validated values before updating thetables. I don't think that's needed for the current contract,
Quoted 47 lines
2026年7月14日 10:55,[email protected] 写道:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] Splitting thecpu_to_cidarray validation and update into two loops introduces a critical double-fetch TOCTOU vulnerability, allowing an out-of-bounds kernel memory write. ----- Patch [1]: [PATCH]
sched_ext: Validate cid override before updating tables --- commit3a1a6d6109297fa0a7f1d91d2dccc68df1527d12
Author: zhidao su (Xiaomi) <[email protected]>
sched_ext: Validate cid override before updating tablesThis patch splits the validation and table updates in
scx_bpf_cid_override()into separate loops. This prevents partial table updates if the validation fails midway through the user-supplied mapping.Quoted 6 lines
kernel/sched/ext/cid.c +0
-0@@ -329,6 +329,11 @@ __bpf_kfunc void scx_bpf_cid_override(const s32 *cpu_to_cid, u32 cpu_to_cid__sz,scx_error (sch,"cid %d assigned to multiple cpus" , c);kernel/sched/ext/cid.c __bpf_kfunc void scx_bpf_cid_override(const s32 *cpu_to_cid, u32 cpu_to_cid__sz, · line 339
Quoted 10 lines
kernel/sched/ext/cid.c +5
-0return ; } + } + +for_each_possible_cpu (cpu) { +s32 c = cpu_to_cid[cpu]; + scx_cpu_to_cid_tbl[cpu] = c; scx_cid_to_cpu_tbl[c] = cpu; }[Severity: High]
Can the contents ofcpu_to_cidchange concurrently between these two loops inscx_bpf_cid_override()?If
cpu_to_cidpoints to shared memory, such as a BPF map, could another thread or BPF program modify cpu_to_cid[cpu] after it passes the validation in the first loop?If this happens, the second loop would fetch the unvalidated value and use it as an index for scx_cid_to_cpu_tbl[c], potentially resulting in an out-of-bounds write.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Tejun Heo
reviewerHello.
for-7.3 already does this. scx_bpf_cid_override() validates the whole mapping first (cid_valid() and the duplicate check) and only writes scx_cpu_to_cid_tbl/scx_cid_to_cpu_tbl in a second pass, so a failed override leaves the tables untouched. It also kmemdup()s the input up front to avoid a concurrent-mutation race.
The patch is against an older cid.c and no longer applies, so no respin is needed.
Thanks.
Signature · 1 line
tejun