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 B0E2BC2BBC7 for ; Sat, 11 Apr 2020 23:17:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7BB3B20769 for ; Sat, 11 Apr 2020 23:17:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586647069; bh=v7GZfSNZgRButau43HQda17K+nXP11i/BnAXWtvacyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mN1vkYgChexSto0ZD8eTkETJ03QLOM/LdQBQ15jekWvwUWMxYj00sU68GJ/C1qc7N JtEwIE7pmc1luOpg/PIkQ5Cgsyz2/0NT3cnxNG19cXqBT3/qPnYkWw7GIeCTAfeWnd 3QeYi3q9vKXwDqFR8j+E9ZbojkOurzE6kkI7nA5s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730756AbgDKXOZ (ORCPT ); Sat, 11 Apr 2020 19:14:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:55988 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730719AbgDKXOT (ORCPT ); Sat, 11 Apr 2020 19:14:19 -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 24AA820708; Sat, 11 Apr 2020 23:14:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646859; bh=v7GZfSNZgRButau43HQda17K+nXP11i/BnAXWtvacyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fau8rUEEWukBQ3E9PSeXLSr7GxMMIxLASX+5NTfAPAPB57xFn/ixTdEiJKp5ZlZeX qUdAsxcjCqVesOEd6Fv1P/uDSdECWEDuV4KkRXCzObQpIQTwmHIY4QSl3/gSu66dhW SlbGu3d3lWPkSwxSGZu+DNleVY56tzGRjlo7/9ds= 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 4.9 05/26] RDMA/cm: Add missing locking around id.state in cm_dup_req_handler Date: Sat, 11 Apr 2020 19:13:52 -0400 Message-Id: <20200411231413.26911-5-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411231413.26911-1-sashal@kernel.org> References: <20200411231413.26911-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 304429fd04ddb..c764a29c11323 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -1544,8 +1544,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