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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 95D86C2BB86 for ; Sat, 11 Apr 2020 23:10:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6453020757 for ; Sat, 11 Apr 2020 23:10:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646608; bh=LA4NasPLEH07jBaTOyAUcxp3FfacFWcVB0VMW+UNloE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=l0joaEksbBdZ3u+qxETCKMV8Cs4VttuSenYnxImGWQH3bBb5Uzf5dUNZChWvWIjSi QnqzOot/PbegBf9uViW5F4jcrUh9oX5aOtH+rlZ1/Zbca2QtNku8aYB366GelByY3b pyBlqxQmgR7MjjlZApE3JzVUVo7zthqKk0n9MS2Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729428AbgDKXKH (ORCPT ); Sat, 11 Apr 2020 19:10:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:48044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728940AbgDKXKB (ORCPT ); Sat, 11 Apr 2020 19:10:01 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6DEA920757; Sat, 11 Apr 2020 23:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646601; bh=LA4NasPLEH07jBaTOyAUcxp3FfacFWcVB0VMW+UNloE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dD2ITDVtu7PXpN0zfzHPhlgMMQFMirNFxomgho1iu/QDlMnIT7NhcoCHl6SaigD7G cE8pTsGQPTbX74tOI+fm6WLVChfd+EhPCPBSqGvC9cH139n0kz4iX6PbIuRVlh/4dT ea4YPMSXQQMkfCXQPTI3/8VuTA9DzXxrVSFiau4Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jason Gunthorpe , Leon Romanovsky , Sasha Levin , linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 014/108] RDMA/cm: Add missing locking around id.state in cm_dup_req_handler Date: Sat, 11 Apr 2020 19:08:09 -0400 Message-Id: <20200411230943.24951-14-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411230943.24951-1-sashal@kernel.org> References: <20200411230943.24951-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jason Gunthorpe [ Upstream commit d1de9a88074b66482443f0cd91618d7b51a7c9b6 ] All accesses to id.state must be done under the spinlock. Fixes: a977049dacde ("[PATCH] IB: Add the kernel CM implementation") Link: https://lore.kernel.org/r/20200310092545.251365-10-leon@kernel.org Signed-off-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/core/cm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 319e4b4ae6398..2c4d925041d09 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -1809,8 +1809,12 @@ static void cm_dup_req_handler(struct cm_work *work, counter[CM_REQ_COUNTER]); /* Quick state check to discard duplicate REQs. */ - if (cm_id_priv->id.state == IB_CM_REQ_RCVD) + spin_lock_irq(&cm_id_priv->lock); + if (cm_id_priv->id.state == IB_CM_REQ_RCVD) { + spin_unlock_irq(&cm_id_priv->lock); return; + } + spin_unlock_irq(&cm_id_priv->lock); ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg); if (ret) -- 2.20.1