Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp455672pxb; Wed, 18 Aug 2021 06:21:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPoKgoXsUXc1XbbaRURQkHPYwcZcnxzigap3/wTXxwPeKqEh5yvbciFYSMZLvIUAyj6lEg X-Received: by 2002:a5d:974f:: with SMTP id c15mr6831021ioo.190.1629292909474; Wed, 18 Aug 2021 06:21:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629292909; cv=none; d=google.com; s=arc-20160816; b=DuRGwIdBekgaD5idSoRhY17/AohgVZVwAKK3MzbOrO7Y3w1kqH5ypafPbxzQ1hnP8g y3DLhwtTbVXX8vhNOn5ihrFpBma3DSpl7Hw5APkM/Zm4kFNFcRJLe+sux5Jz8pZuXpUG 7kByPqP3TO9Dfs/mDYKAhfNhsuNRi9ctgGEn3Stn98xzKBFvmEPZBP8JFYWNzkthNhDw uvDqZG/IwYmmUGKWlQWmQIvw3dRLni5fnx10efuKVshXO+PJx9JkshTZMz8BwOppYJFE UEOnVcD4jm7s4xwZ2HuINoyuv8UVposOoLOryhIedpJK911rI9MitdWMA3hdGMikW6kX z8uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=KCyLAuo8HtLXKU1YHXXydapUWUMTiSslZXAgKBUTZwI=; b=PUhYtvLeybnxheyzK8zEUVH5q/sOT1OONgZGOWdB43ssDxhspBQhCyPc3ZAX4Lnexe B/J0lVq/OWu10U+vW9irYH+gp5t4Gm951eubzYsiZ6J62ifVrcQUEdrKsjnyqxOrqQBz cmTBbtCt+mEY6FoRwsrK8FUjvstQVfhMLfeEkTyrcep48xU9Wml/ZJy+LP9w4UGAyxDs 93N4rkdrrqNQPtqE66XK52FanLVjGYfRkuWOHX8EX23Nqe0yWZP/LIJpgwy870MEi9WG hWyuwZUQGt3aHeKYeMOseLEyRH+gZaT2OdE8SlbFA7vyHfHXBFse5q0cVzeZlgT5wIUb 5QSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=BScUvlRg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w17si5204485ioc.46.2021.08.18.06.21.33; Wed, 18 Aug 2021 06:21:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=BScUvlRg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236817AbhHRNTS (ORCPT + 99 others); Wed, 18 Aug 2021 09:19:18 -0400 Received: from smtp-relay-canonical-1.canonical.com ([185.125.188.121]:46354 "EHLO smtp-relay-canonical-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236705AbhHRNTQ (ORCPT ); Wed, 18 Aug 2021 09:19:16 -0400 Received: from localhost (1.general.cking.uk.vpn [10.172.193.212]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id E16C1412AF; Wed, 18 Aug 2021 13:18:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1629292721; bh=KCyLAuo8HtLXKU1YHXXydapUWUMTiSslZXAgKBUTZwI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=BScUvlRgWK1BCt2qB8IVte4thG+lTiB4LiSQ4nTMdaQJGhY1JWzJnuZjZBnhSFyG5 gkbbX02rpvoXctDli99v3x/8Fw4H1zlCXex9VGX+j/yrgh7DodfQFF85yTTqFzNA7u oER6/yIITWtab09DPrFI3sFA/TfyDDJ//7rCPuXZ8sTo0UBa9Y7tFcf6/Jk/jr/ytI J0yQI4re20KqKGqAMp4ZK18JVmGBrOsTcRjL43sOZ3zHoOm+L7ra1zx3Fhh+6wR7Fp qZa3h/ESUr60NdwN/KrAh0JEmji/qCLkD7P8Iqb1S+ck3ZXpU++MSwy+LU9ffNUjOL vT88htE+h8Mcg== From: Colin King To: Thomas Gleixner , Ingo Molnar , Peter Zijlstra , Darren Hart , Davidlohr Bueso Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH][next] futex: fix assigned ret variable that is never read Date: Wed, 18 Aug 2021 14:18:40 +0100 Message-Id: <20210818131840.34262-1-colin.king@canonical.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King Currently the check on the rt_waiter and top_waiter->pi_state is assigning an error return code to ret but this later gets re-assigned, hence the check is currently ineffective. I believe the original intent was to return -EINVAL rather than assign it to ret. Fix this. Addresses-Coverity: ("Unused value") Fixes: dc7109aaa233 ("futex: Validate waiter correctly in futex_proxy_trylock_atomic()") Signed-off-by: Colin Ian King --- kernel/futex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/futex.c b/kernel/futex.c index e7b4c6121da4..30e7daebaec8 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2025,7 +2025,7 @@ futex_proxy_trylock_atomic(u32 __user *pifutex, struct futex_hash_bucket *hb1, * and waiting on the 'waitqueue' futex which is always !PI. */ if (!top_waiter->rt_waiter || top_waiter->pi_state) - ret = -EINVAL; + return -EINVAL; /* Ensure we requeue to the expected futex. */ if (!match_futex(top_waiter->requeue_pi_key, key2)) -- 2.32.0