summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSuren Baghdasaryan <surenb@google.com>2022-01-11 15:23:09 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-02-05 12:37:55 +0100
commitd4e4e61d4a5b87bfc9953c306a11d35d869417fd (patch)
tree55da4678067b5c22a812bec3d3f279574b73517b /arch
parent080dbe7e9b86a0392d8dffc00d9971792afc121f (diff)
downloadlinux-stable-d4e4e61d4a5b87bfc9953c306a11d35d869417fd.tar.gz
linux-stable-d4e4e61d4a5b87bfc9953c306a11d35d869417fd.tar.bz2
linux-stable-d4e4e61d4a5b87bfc9953c306a11d35d869417fd.zip
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>
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions