From b428878b0d17f25c85e82ee9079fbee55a4e91c3 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 4 Feb 2021 17:25:31 +0800 Subject: [PATCH] futex: Use pi_state_update_owner() in put_pi_state() stable inclusion from linux-4.19.172 commit 9d5dbf57d66f410d35da822a115dfd57531950dc CVE: CVE-2021-3347 -------------------------------- commit 6ccc84f917d33312eb2846bd7b567639f585ad6d upstream No point in open coding it. This way it gains the extra sanity checks. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Yang Yingliang Reviewed-by: Xiu Jianfeng Reviewed-by: Wei Li Signed-off-by: Yang Yingliang --- kernel/futex.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/kernel/futex.c b/kernel/futex.c index edd6023e91b6..ac252985af06 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -883,15 +883,9 @@ static void put_pi_state(struct futex_pi_state *pi_state) * and has cleaned up the pi_state already */ if (pi_state->owner) { - struct task_struct *owner; raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock); - owner = pi_state->owner; - if (owner) { - raw_spin_lock(&owner->pi_lock); - list_del_init(&pi_state->list); - raw_spin_unlock(&owner->pi_lock); - } + pi_state_update_owner(pi_state, NULL); rt_mutex_proxy_unlock(&pi_state->pi_mutex); raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock); } -- GitLab