From owner-svn-src-projects@freebsd.org  Mon Jul  3 08:29:51 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 312BC9E1139
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon,  3 Jul 2017 08:29:51 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 001852EE6;
 Mon,  3 Jul 2017 08:29:50 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v638Toth086768;
 Mon, 3 Jul 2017 08:29:50 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v638ToW7086767;
 Mon, 3 Jul 2017 08:29:50 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201707030829.v638ToW7086767@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Mon, 3 Jul 2017 08:29:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r320590 -
 projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core
X-SVN-Group: projects
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core
X-SVN-Commit-Revision: 320590
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Jul 2017 08:29:51 -0000

Author: hselasky
Date: Mon Jul  3 08:29:49 2017
New Revision: 320590
URL: https://svnweb.freebsd.org/changeset/base/320590

Log:
  ibcore: Fix for accessing invalid network device.
  
  Sponsored by:	Mellanox Technologies

Modified:
  projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cache.c

Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cache.c
==============================================================================
--- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cache.c	Mon Jul  3 08:28:35 2017	(r320589)
+++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_cache.c	Mon Jul  3 08:29:49 2017	(r320590)
@@ -455,8 +455,13 @@ static int __ib_cache_gid_get(struct ib_device *ib_dev
 	memcpy(gid, &table->data_vec[index].gid, sizeof(*gid));
 	if (attr) {
 		memcpy(attr, &table->data_vec[index].attr, sizeof(*attr));
-		if (attr->ndev)
+		/* make sure network device is valid and attached */
+		if (attr->ndev != NULL &&
+		    (attr->ndev->if_flags & IFF_DYING) == 0 &&
+		    attr->ndev->if_addr != NULL)
 			dev_hold(attr->ndev);
+		else
+			attr->ndev = NULL;
 	}
 
 	return 0;