]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
blk-cgroup: fix UAF in __blkcg_rstat_flush()
authorMichal Koutný <mkoutny@suse.com>
Thu, 5 Feb 2026 15:54:23 +0000 (23:54 +0800)
committerJens Axboe <axboe@kernel.dk>
Mon, 22 Jun 2026 21:58:41 +0000 (15:58 -0600)
commit0ab5ee5a1badb58cbb2242617cb01a4972b1f2a2
tree1533af7cafafd1e0df5840802c6ba57d2f71a065
parent17b2d950a3c0328ed749476e6118ca869b3ca8b5
blk-cgroup: fix UAF in __blkcg_rstat_flush()

When multiple blkgs in the same blkcg are released concurrently,
a use-after-free can occur. The race happens when one blkg's
__blkcg_rstat_flush() removes another blkg's iostat entries via
llist_del_all(). The second blkg sees an empty list and proceeds
to free itself while the first is still iterating over its entries.

Move the flush from __blkg_release() (RCU callback) to blkg_release()
(before call_rcu). This ensures the RCU grace period waits for any
concurrent flush's rcu_read_lock() section to complete before freeing.

Cc: stable@vger.kernel.org
Cc: Jay Shin <jaeshin@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Waiman Long <longman@redhat.com>
Fixes: 20cb1c2fb756 ("blk-cgroup: Flush stats before releasing blkcg_gq")
Reported-by: coregee2000@gmail.com
Closes: https://lore.kernel.org/linux-block/CAHPqNmwT9oRpem3J3erS_W0uSQND47LGGSBsNxP8E6uSUish1w@mail.gmail.com/
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Tested-by: Jose Fernandez (Anthropic) <jose.fernandez@linux.dev>
Link: https://patch.msgid.link/20260205155425.342084-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-cgroup.c