From owner-svn-src-all@freebsd.org  Thu Apr  7 07:41:08 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 2516CB072DF;
 Thu,  7 Apr 2016 07:41:08 +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 EAFF9134F;
 Thu,  7 Apr 2016 07:41:07 +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 u377f7ER079599;
 Thu, 7 Apr 2016 07:41:07 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u377f7FO079598;
 Thu, 7 Apr 2016 07:41:07 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201604070741.u377f7FO079598@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: Thu, 7 Apr 2016 07:41:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r297655 - stable/10/sys/contrib/rdma/krping
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Apr 2016 07:41:08 -0000

Author: hselasky
Date: Thu Apr  7 07:41:06 2016
New Revision: 297655
URL: https://svnweb.freebsd.org/changeset/base/297655

Log:
  MFC r296934:
  Fix crash in krping when run as a client due to NULL pointer access.
  Initialize pointer in question which is used only when fast registers
  mode is selected.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/10/sys/contrib/rdma/krping/krping.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/contrib/rdma/krping/krping.c
==============================================================================
--- stable/10/sys/contrib/rdma/krping/krping.c	Thu Apr  7 07:39:55 2016	(r297654)
+++ stable/10/sys/contrib/rdma/krping/krping.c	Thu Apr  7 07:41:06 2016	(r297655)
@@ -259,6 +259,7 @@ static int krping_cma_event_handler(stru
 
 	case RDMA_CM_EVENT_ROUTE_RESOLVED:
 		cb->state = ROUTE_RESOLVED;
+		cb->child_cm_id = cma_id;
 		wake_up_interruptible(&cb->sem);
 		break;