BACKPORT: psi: Fix uaf issue when psi trigger is destroyed while being polled
commit a06247c6804f1a7c86a2e5398a4c1f1db1471848 upstream.
With write operation on psi files replacing old trigger with a new one,
the lifetime of its waitqueue is totally arbitrary. Overwriting an
existing trigger causes its waitqueue to be freed and pending poll()
will stumble on trigger->event_wait which was destroyed.
Fix this by disallowing to redefine an existing psi trigger. If a write
operation is used on a file descriptor with an already existing psi
trigger, the operation will fail with EBUSY error.
Also bypass a check for psi_disabled in the psi_trigger_destroy as the
flag can be flipped after the trigger is created, leading to a memory
leak.
Fixes: 0e94682b73bf ("psi: introduce psi monitor")
Reported-by:
<syzbot+cdb5dd11c97cc532efad@syzkaller.appspotmail.com>
Suggested-by:
Linus Torvalds <torvalds@linux-foundation.org>
Analyzed-by:
Eric Biggers <ebiggers@kernel.org>
Signed-off-by:
Suren Baghdasaryan <surenb@google.com>
Signed-off-by:
Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by:
Eric Biggers <ebiggers@google.com>
Acked-by:
Johannes Weiner <hannes@cmpxchg.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220111232309.1786347-1-surenb@google.com
[surenb: backported to 5.10 kernel]
CC: stable@vger.kernel.org # 5.10
Signed-off-by:
Suren Baghdasaryan <surenb@google.com>
Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Conflicts:
include/linux/psi.h
kernel/cgroup/cgroup.c
kernel/sched/psi.c
1. Resolved trivial merge conflicts.
Bug: 233410456
Signed-off-by:
Suren Baghdasaryan <surenb@google.com>
Change-Id: I7143fef51b874c2df8d792808b6a9b666eec2c7b
Loading
Please register or sign in to comment