From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAF3AC2D0A3 for ; Tue, 3 Nov 2020 21:18:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 79324206B5 for ; Tue, 3 Nov 2020 21:18:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604438327; bh=ACCQKB0WI3QQDH1LpYwUo8Ei2lz8ycZmkcMhQYgGSxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=a2khGfO9LkytyntAKKQ3R3SjiwXiDE9aqyEYYgWeO3QRpVRezwbPpB1P7prDY+rmU vAI9VChoD51H9LHOCnSAELSu4krxl6Rr4LVb/605gfruT03z9NgTVJBpL2tv9OzEH/ YhpCsjKumOyXF101XnMwxIxx6+4dCwbpeeKlmpp0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730091AbgKCVSq (ORCPT ); Tue, 3 Nov 2020 16:18:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:48960 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387910AbgKCVJH (ORCPT ); Tue, 3 Nov 2020 16:09:07 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3D5A8205ED; Tue, 3 Nov 2020 21:09:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437746; bh=ACCQKB0WI3QQDH1LpYwUo8Ei2lz8ycZmkcMhQYgGSxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b0q47ttzTmY3AghbW06SIpjQkfHcEKMo3vKSvd0ijefIq0ykpIRRsPHAsFuLVCIFK Tuyx8BOyCXwcpGC9dZikoN4YGX0+59s/Muz0mEhaaQmzpcXHED68tGCFFYfrhGjXG3 2NLcNdUDmgQ3u5sO6pLpchj8x6oNXFHgKkCbiquY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mateusz Nosek , Thomas Gleixner , Sasha Levin Subject: [PATCH 4.14 016/125] futex: Fix incorrect should_fail_futex() handling Date: Tue, 3 Nov 2020 21:36:33 +0100 Message-Id: <20201103203159.107223146@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203156.372184213@linuxfoundation.org> References: <20201103203156.372184213@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mateusz Nosek [ Upstream commit 921c7ebd1337d1a46783d7e15a850e12aed2eaa0 ] If should_futex_fail() returns true in futex_wake_pi(), then the 'ret' variable is set to -EFAULT and then immediately overwritten. So the failure injection is non-functional. Fix it by actually leaving the function and returning -EFAULT. The Fixes tag is kinda blury because the initial commit which introduced failure injection was already sloppy, but the below mentioned commit broke it completely. [ tglx: Massaged changelog ] Fixes: 6b4f4bc9cb22 ("locking/futex: Allow low-level atomic operations to return -EAGAIN") Signed-off-by: Mateusz Nosek Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20200927000858.24219-1-mateusznosek0@gmail.com Signed-off-by: Sasha Levin --- kernel/futex.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/futex.c b/kernel/futex.c index 2921ebaa14676..8f0e62c59a55b 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1595,8 +1595,10 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_pi_state *pi_ */ newval = FUTEX_WAITERS | task_pid_vnr(new_owner); - if (unlikely(should_fail_futex(true))) + if (unlikely(should_fail_futex(true))) { ret = -EFAULT; + goto out_unlock; + } ret = cmpxchg_futex_value_locked(&curval, uaddr, uval, newval); if (!ret && (curval != uval)) { -- 2.27.0