From patchwork Wed Oct 11 17:49:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 10000217 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 34D8A6037F for ; Wed, 11 Oct 2017 17:50:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FDEA28B05 for ; Wed, 11 Oct 2017 17:50:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14DA228B06; Wed, 11 Oct 2017 17:50:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD49928B05 for ; Wed, 11 Oct 2017 17:50:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757371AbdJKRus (ORCPT ); Wed, 11 Oct 2017 13:50:48 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:33454 "EHLO esa3.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752220AbdJKRt4 (ORCPT ); Wed, 11 Oct 2017 13:49:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1507744196; x=1539280196; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=OBeHRUtnXfnAIhtltbBgR6fEeLdAMpjdmfuH2jiqVyk=; b=m4oaGjT1zEj9Q8M205WQaOgMrJz+5neOEnVtIn4eXx8l1ArY6Y1Yg8mC nGkjVCqXpYy59IUgbJyfSHBALzjTJBgZimHDi9+0yWO5MnUlHYQqUsFAW NquIpv4ciPdmjOzoVL0vP1bCXOrUjNjFe3G8Xsaub5KD8vw0DTwt/iUZz m0B5/mJtElhbm2Tfe3QtSzbOKfbwLSqze9v1ZfN3gqhQxLO0yFWJYYngd ELqzXFsL4kZBpL4RyDzAgAudRQk6aX5kpUgcjCuFNj9i9obZJvo9BmAHI K/5TuDgdgthN7sCggWUNdbReoX+NFwBZGYQZfzjIuL1cQ2KxTK+hbvbCD g==; X-IronPort-AV: E=Sophos;i="5.43,362,1503331200"; d="scan'208";a="57687626" Received: from sjappemgw11.hgst.com (HELO sjappemgw12.hgst.com) ([199.255.44.62]) by ob1.hgst.iphmx.com with ESMTP; 12 Oct 2017 01:49:45 +0800 Received: from thinkpad-bart.sdcorp.global.sandisk.com (HELO thinkpad-bart.int.fusionio.com) ([10.11.172.152]) by sjappemgw12.hgst.com with ESMTP; 11 Oct 2017 10:49:29 -0700 From: Bart Van Assche To: Doug Ledford Cc: linux-rdma@vger.kernel.org, Bart Van Assche , Faisal Latif Subject: [PATCH v2 30/45] IB/nes: Fix a race condition in nes_inetaddr_event() Date: Wed, 11 Oct 2017 10:49:12 -0700 Message-Id: <20171011174927.25113-31-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171011174927.25113-1-bart.vanassche@wdc.com> References: <20171011174927.25113-1-bart.vanassche@wdc.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch has been compile-tested only. Signed-off-by: Bart Van Assche Cc: Faisal Latif Acked-by: Faisal Latif --- drivers/infiniband/hw/nes/nes.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c index ff58dfa071b8..42b68aa999fc 100644 --- a/drivers/infiniband/hw/nes/nes.c +++ b/drivers/infiniband/hw/nes/nes.c @@ -178,11 +178,16 @@ static int nes_inetaddr_event(struct notifier_block *notifier, /* fall through */ case NETDEV_CHANGEADDR: /* Add the address to the IP table */ - if (upper_dev) - nesvnic->local_ipaddr = - ((struct in_device *)upper_dev->ip_ptr)->ifa_list->ifa_address; - else + if (upper_dev) { + struct in_device *in; + + rcu_read_lock(); + in = __in_dev_get_rcu(upper_dev); + nesvnic->local_ipaddr = in->ifa_list->ifa_address; + rcu_read_unlock(); + } else { nesvnic->local_ipaddr = ifa->ifa_address; + } nes_write_indexed(nesdev, NES_IDX_DST_IP_ADDR+(0x10*PCI_FUNC(nesdev->pcidev->devfn)),