diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-22 16:28:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-22 16:28:47 -0700 |
| commit | de37e502a315677138009d2965f87e2c0721e76f (patch) | |
| tree | 0012bea881280a202ccb1a3c6620ed1493a0e202 /block | |
| parent | 4a5860ea6098bc6c0a966bb415d5dfe96adb4a86 (diff) | |
| parent | 22572dbcd3486e6c4dced877125bbf50e4e24edf (diff) | |
| download | ath-de37e502a315677138009d2965f87e2c0721e76f.tar.gz | |
Merge tag 'cgroup-for-7.1-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fixes from Tejun Heo:
"Two rstat fixes:
- Out-of-bounds access in the css_rstat_updated() BPF kfunc when
called with an unchecked user-supplied cpu
- Over-strict NMI guard after the recent switch to try_cmpxchg left
sparc and ppc64 unable to queue rstat updates from NMI"
* tag 'cgroup-for-7.1-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: rstat: relax NMI guard after switch to try_cmpxchg
cgroup/rstat: validate cpu before css_rstat_cpu() access
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 554c87bb4a865..bc63bd220865d 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -2241,7 +2241,7 @@ void blk_cgroup_bio_start(struct bio *bio) } u64_stats_update_end_irqrestore(&bis->sync, flags); - css_rstat_updated(&blkcg->css, cpu); + __css_rstat_updated(&blkcg->css, cpu); put_cpu(); } |